From 69401e4ea6fdae64f9f0bef3671a35858a5ae4ca Mon Sep 17 00:00:00 2001 From: Michael Still Date: Thu, 23 Aug 2012 16:28:35 +1000 Subject: Return actual availability zones Report on real availability zones, not a hard coded "nova" zone in the output of ec2 DescribeAvailabilityZones when the output is verbose. Resolves bug 1032890. Change-Id: Ie85cfa1c3638fc490f52f48c8238b3162732647d --- nova/tests/api/ec2/test_cloud.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'nova/tests') diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py index af78d823b..b085b9ab1 100644 --- a/nova/tests/api/ec2/test_cloud.py +++ b/nova/tests/api/ec2/test_cloud.py @@ -690,6 +690,27 @@ class CloudTestCase(test.TestCase): db.service_destroy(self.context, service1['id']) db.service_destroy(self.context, service2['id']) + def test_describe_availability_zones_verbose(self): + """Makes sure describe_availability_zones works and filters results.""" + service1 = db.service_create(self.context, {'host': 'host1_zones', + 'binary': "nova-compute", + 'topic': 'compute', + 'report_count': 0, + 'availability_zone': "zone1"}) + service2 = db.service_create(self.context, {'host': 'host2_zones', + 'binary': "nova-compute", + 'topic': 'compute', + 'report_count': 0, + 'availability_zone': "zone2"}) + + admin_ctxt = context.get_admin_context(read_deleted="no") + result = self.cloud.describe_availability_zones(admin_ctxt, + zone_name='verbose') + + self.assertEqual(len(result['availabilityZoneInfo']), 15) + db.service_destroy(self.context, service1['id']) + db.service_destroy(self.context, service2['id']) + def test_describe_snapshots(self): """Makes sure describe_snapshots works and filters results.""" vol = db.volume_create(self.context, {}) -- cgit