Browse code
Update aggregates test for aggregates bp
Instead of implementing availability zones in the service table,
availability zones will be implemented using general aggregate metadata.
So when an aggregate is created it will already have metadata.
Part of blueprint aggregate-based-availability-zones
Change-Id: I0fd22399b99a14087fef63fc91d0baef746efbed
Joe Gordon authored on 2012/12/12 21:03:19Showing 1 changed files
| ... | ... |
@@ -99,8 +99,8 @@ META_DATA_1_KEY=asdf |
| 99 | 99 |
META_DATA_2_KEY=foo |
| 100 | 100 |
META_DATA_3_KEY=bar |
| 101 | 101 |
|
| 102 |
-#ensure no metadata is set |
|
| 103 |
-nova aggregate-details $AGGREGATE_ID | grep {}
|
|
| 102 |
+#ensure no additional metadata is set |
|
| 103 |
+nova aggregate-details $AGGREGATE_ID | egrep "{u'availability_zone': u'$AGGREGATE_A_ZONE'}|{}"
|
|
| 104 | 104 |
|
| 105 | 105 |
nova aggregate-set-metadata $AGGREGATE_ID ${META_DATA_1_KEY}=123
|
| 106 | 106 |
nova aggregate-details $AGGREGATE_ID | grep $META_DATA_1_KEY |
| ... | ... |
@@ -117,7 +117,7 @@ nova aggregate-details $AGGREGATE_ID | grep $META_DATA_3_KEY |
| 117 | 117 |
nova aggregate-details $AGGREGATE_ID | grep $META_DATA_2_KEY && die "ERROR metadata was not cleared" |
| 118 | 118 |
|
| 119 | 119 |
nova aggregate-set-metadata $AGGREGATE_ID $META_DATA_3_KEY $META_DATA_1_KEY |
| 120 |
-nova aggregate-details $AGGREGATE_ID | grep {}
|
|
| 120 |
+nova aggregate-details $AGGREGATE_ID | egrep "{u'availability_zone': u'$AGGREGATE_A_ZONE'}|{}"
|
|
| 121 | 121 |
|
| 122 | 122 |
|
| 123 | 123 |
# Test aggregate-add/remove-host |