From 5c1bedd1edcd04c749721d55710c629bc3d91d12 Mon Sep 17 00:00:00 2001
From: Joe Gordon <jogo@cloudscaling.com>
Date: Wed, 12 Dec 2012 12:03:19 +0000
Subject: [PATCH] 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
---
 exercises/aggregates.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/exercises/aggregates.sh b/exercises/aggregates.sh
index adc3393bb6..deb1a038fd 100755
--- a/exercises/aggregates.sh
+++ b/exercises/aggregates.sh
@@ -99,8 +99,8 @@ META_DATA_1_KEY=asdf
 META_DATA_2_KEY=foo
 META_DATA_3_KEY=bar
 
-#ensure no metadata is set
-nova aggregate-details $AGGREGATE_ID | grep {}
+#ensure no additional metadata is set
+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-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-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