diff options
| author | Michael Still <mikal@stillhq.com> | 2012-08-23 16:28:35 +1000 |
|---|---|---|
| committer | Michael Still <mikal@stillhq.com> | 2012-08-23 18:04:54 +1000 |
| commit | 69401e4ea6fdae64f9f0bef3671a35858a5ae4ca (patch) | |
| tree | da8a02c721d5ef0164489676c7d85748462ae694 /nova/tests | |
| parent | 9fecad9e6f7803f3422e7769c01ba3b9076ed308 (diff) | |
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
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/ec2/test_cloud.py | 21 |
1 files changed, 21 insertions, 0 deletions
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, {}) |