openstack/nova
Code Issues Proposed changes

Merge "Update class/function name for test_extended_availability_zone.py"

Browse Source
This commit is contained in:
Jenkins
2014-01-27 21:48:47 +00:00
committed by Gerrit Code Review
parent 9e3a5826c2 1414ce19d1
commit 2c48e7f2b8
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nova/tests/api/openstack/compute/contrib/test_extended_availability_zone.py
View File

@@ -73,12 +73,12 @@ def fake_get_no_host_availability_zone(context, host):
return None
class ExtendedServerAttributesTest(test.TestCase):
class ExtendedAvailabilityZoneTest(test.TestCase):
content_type = 'application/json'
prefix = 'OS-EXT-AZ:'
def setUp(self):
super(ExtendedServerAttributesTest, self).setUp()
super(ExtendedAvailabilityZoneTest, self).setUp()
availability_zones.reset_cache()
fakes.stub_out_nw_api(self.stubs)
self.stubs.Set(compute.api.API, 'get', fake_compute_get)
@@ -105,7 +105,7 @@ class ExtendedServerAttributesTest(test.TestCase):
def _get_servers(self, body):
return jsonutils.loads(body).get('servers')
def assertServerAttributes(self, server, az):
def assertAvailabilityZone(self, server, az):
self.assertEqual(server.get('%savailability_zone' % self.prefix),
az)
@@ -118,7 +118,7 @@ class ExtendedServerAttributesTest(test.TestCase):
res = self._make_request(url)
self.assertEqual(res.status_int, 200)
self.assertServerAttributes(self._get_server(res.body), 'fakeaz')
self.assertAvailabilityZone(self._get_server(res.body), 'fakeaz')
def test_show_empty_host_az(self):
self.stubs.Set(compute.api.API, 'get', fake_compute_get_empty)
@@ -129,14 +129,14 @@ class ExtendedServerAttributesTest(test.TestCase):
res = self._make_request(url)
self.assertEqual(res.status_int, 200)
self.assertServerAttributes(self._get_server(res.body), 'fakeaz')
self.assertAvailabilityZone(self._get_server(res.body), 'fakeaz')
def test_show(self):
url = '/v2/fake/servers/%s' % UUID3
res = self._make_request(url)
self.assertEqual(res.status_int, 200)
self.assertServerAttributes(self._get_server(res.body), 'get-host')
self.assertAvailabilityZone(self._get_server(res.body), 'get-host')
def test_detail(self):
url = '/v2/fake/servers/detail'
@@ -144,7 +144,7 @@ class ExtendedServerAttributesTest(test.TestCase):
self.assertEqual(res.status_int, 200)
for i, server in enumerate(self._get_servers(res.body)):
self.assertServerAttributes(server, 'all-host')
self.assertAvailabilityZone(server, 'all-host')
def test_no_instance_passthrough_404(self):
@@ -158,7 +158,7 @@ class ExtendedServerAttributesTest(test.TestCase):
self.assertEqual(res.status_int, 404)
class ExtendedServerAttributesXmlTest(ExtendedServerAttributesTest):
class ExtendedAvailabilityZoneXmlTest(ExtendedAvailabilityZoneTest):
content_type = 'application/xml'
prefix = '{%s}' % extended_availability_zone.\
Extended_availability_zone.namespace

16
nova/tests/api/openstack/compute/plugins/v3/test_extended_availability_zone.py
View File

@@ -73,12 +73,12 @@ def fake_get_no_host_availability_zone(context, host):
return None
class ExtendedServerAttributesTest(test.TestCase):
class ExtendedAvailabilityZoneTest(test.TestCase):
content_type = 'application/json'
prefix = '%s:' % extended_availability_zone.ExtendedAvailabilityZone.alias
def setUp(self):
super(ExtendedServerAttributesTest, self).setUp()
super(ExtendedAvailabilityZoneTest, self).setUp()
availability_zones.reset_cache()
fakes.stub_out_nw_api(self.stubs)
self.stubs.Set(compute.api.API, 'get', fake_compute_get)
@@ -102,7 +102,7 @@ class ExtendedServerAttributesTest(test.TestCase):
def _get_servers(self, body):
return jsonutils.loads(body).get('servers')
def assertServerAttributes(self, server, az):
def assertAvailabilityZone(self, server, az):
self.assertEqual(server.get('%savailability_zone' % self.prefix),
az)
@@ -115,7 +115,7 @@ class ExtendedServerAttributesTest(test.TestCase):
res = self._make_request(url)
self.assertEqual(res.status_int, 200)
self.assertServerAttributes(self._get_server(res.body), 'fakeaz')
self.assertAvailabilityZone(self._get_server(res.body), 'fakeaz')
def test_show_empty_host_az(self):
self.stubs.Set(compute.api.API, 'get', fake_compute_get_empty)
@@ -126,14 +126,14 @@ class ExtendedServerAttributesTest(test.TestCase):
res = self._make_request(url)
self.assertEqual(res.status_int, 200)
self.assertServerAttributes(self._get_server(res.body), 'fakeaz')
self.assertAvailabilityZone(self._get_server(res.body), 'fakeaz')
def test_show(self):
url = '/v3/servers/%s' % UUID3
res = self._make_request(url)
self.assertEqual(res.status_int, 200)
self.assertServerAttributes(self._get_server(res.body), 'get-host')
self.assertAvailabilityZone(self._get_server(res.body), 'get-host')
def test_detail(self):
url = '/v3/servers/detail'
@@ -141,7 +141,7 @@ class ExtendedServerAttributesTest(test.TestCase):
self.assertEqual(res.status_int, 200)
for i, server in enumerate(self._get_servers(res.body)):
self.assertServerAttributes(server, 'all-host')
self.assertAvailabilityZone(server, 'all-host')
def test_no_instance_passthrough_404(self):
@@ -155,7 +155,7 @@ class ExtendedServerAttributesTest(test.TestCase):
self.assertEqual(res.status_int, 404)
class ExtendedServerAttributesXmlTest(ExtendedServerAttributesTest):
class ExtendedAvailabilityZoneXmlTest(ExtendedAvailabilityZoneTest):
content_type = 'application/xml'
prefix = ('{%s}' %
extended_availability_zone.ExtendedAvailabilityZone.namespace)