Browse code
backport of aggregates compatibility fix
this is the aggregates compatibility fix for stable/grizzly (coming
from master). This should let stable/grizzly exercises pass which
will let us do grenade runs on stable/havana.
Change-Id: Iaa0cf13a287a206442c611b4f2805c2fb0c90e9f
Sean Dague authored on 2014/01/20 09:01:00Showing 1 changed files
| ... | ... |
@@ -98,7 +98,7 @@ META_DATA_2_KEY=foo |
| 98 | 98 |
META_DATA_3_KEY=bar |
| 99 | 99 |
|
| 100 | 100 |
#ensure no additional metadata is set |
| 101 |
-nova aggregate-details $AGGREGATE_ID | egrep "{u'availability_zone': u'$AGGREGATE_A_ZONE'}|{}"
|
|
| 101 |
+nova aggregate-details $AGGREGATE_ID | egrep "\|[{u ]*'availability_zone.+$AGGREGATE_A_ZONE'[ }]*\|"
|
|
| 102 | 102 |
|
| 103 | 103 |
nova aggregate-set-metadata $AGGREGATE_ID ${META_DATA_1_KEY}=123
|
| 104 | 104 |
nova aggregate-details $AGGREGATE_ID | grep $META_DATA_1_KEY |
| ... | ... |
@@ -115,7 +115,7 @@ nova aggregate-details $AGGREGATE_ID | grep $META_DATA_3_KEY |
| 115 | 115 |
nova aggregate-details $AGGREGATE_ID | grep $META_DATA_2_KEY && die $LINENO "ERROR metadata was not cleared" |
| 116 | 116 |
|
| 117 | 117 |
nova aggregate-set-metadata $AGGREGATE_ID $META_DATA_3_KEY $META_DATA_1_KEY |
| 118 |
-nova aggregate-details $AGGREGATE_ID | egrep "{u'availability_zone': u'$AGGREGATE_A_ZONE'}|{}"
|
|
| 118 |
+nova aggregate-details $AGGREGATE_ID | egrep "\|[{u ]*'availability_zone.+$AGGREGATE_A_ZONE'[ }]*\|"
|
|
| 119 | 119 |
|
| 120 | 120 |
|
| 121 | 121 |
# Test aggregate-add/remove-host |