Merge "Update aggregates test for aggregates bp"

This commit is contained in:
Jenkins 2012-12-18 12:52:52 +00:00 committed by Gerrit Code Review
commit 2a255d9922

View File

@ -99,8 +99,8 @@ META_DATA_1_KEY=asdf
META_DATA_2_KEY=foo META_DATA_2_KEY=foo
META_DATA_3_KEY=bar META_DATA_3_KEY=bar
#ensure no metadata is set #ensure no additional metadata is set
nova aggregate-details $AGGREGATE_ID | grep {} nova aggregate-details $AGGREGATE_ID | egrep "{u'availability_zone': u'$AGGREGATE_A_ZONE'}|{}"
nova aggregate-set-metadata $AGGREGATE_ID ${META_DATA_1_KEY}=123 nova aggregate-set-metadata $AGGREGATE_ID ${META_DATA_1_KEY}=123
nova aggregate-details $AGGREGATE_ID | grep $META_DATA_1_KEY nova aggregate-details $AGGREGATE_ID | grep $META_DATA_1_KEY
@ -117,7 +117,7 @@ nova aggregate-details $AGGREGATE_ID | grep $META_DATA_3_KEY
nova aggregate-details $AGGREGATE_ID | grep $META_DATA_2_KEY && die "ERROR metadata was not cleared" nova aggregate-details $AGGREGATE_ID | grep $META_DATA_2_KEY && die "ERROR metadata was not cleared"
nova aggregate-set-metadata $AGGREGATE_ID $META_DATA_3_KEY $META_DATA_1_KEY nova aggregate-set-metadata $AGGREGATE_ID $META_DATA_3_KEY $META_DATA_1_KEY
nova aggregate-details $AGGREGATE_ID | grep {} nova aggregate-details $AGGREGATE_ID | egrep "{u'availability_zone': u'$AGGREGATE_A_ZONE'}|{}"
# Test aggregate-add/remove-host # Test aggregate-add/remove-host