openstack/devstack
Code Issues Proposed changes

Merge "Fix aggregates test with multi host setup"

Browse Source
This commit is contained in:
Jenkins 2012-09-05 18:15:24 +00:00 committed by Gerrit Code Review
commit 6a1c849773
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
exercises/aggregates.sh
View File

@ -125,16 +125,16 @@ nova aggregate-details $AGGREGATE_ID | grep {}
if [ "$VIRT_DRIVER" == "xenserver" ]; then if [ "$VIRT_DRIVER" == "xenserver" ]; then
echo "TODO(johngarbutt) add tests for add/remove host from pool aggregate" echo "TODO(johngarbutt) add tests for add/remove host from pool aggregate"
fi fi
HOST=`nova host-list | grep compute | get_field 1` FIRST_HOST=`nova host-list | grep compute | get_field 1 | head -1`
# Make sure can add two aggregates to same host # Make sure can add two aggregates to same host
nova aggregate-add-host $AGGREGATE_ID $HOST nova aggregate-add-host $AGGREGATE_ID $FIRST_HOST
nova aggregate-add-host $AGGREGATE2_ID $HOST nova aggregate-add-host $AGGREGATE2_ID $FIRST_HOST
if nova aggregate-add-host $AGGREGATE2_ID $HOST; then if nova aggregate-add-host $AGGREGATE2_ID $FIRST_HOST; then
echo "ERROR could add duplicate host to single aggregate" echo "ERROR could add duplicate host to single aggregate"
exit -1 exit -1
fi fi
nova aggregate-remove-host $AGGREGATE2_ID $HOST nova aggregate-remove-host $AGGREGATE2_ID $FIRST_HOST
nova aggregate-remove-host $AGGREGATE_ID $HOST nova aggregate-remove-host $AGGREGATE_ID $FIRST_HOST
# Test aggregate-delete # Test aggregate-delete
# ===================== # =====================