openstack/nova
Code Issues Proposed changes

Merge "Switch api unit tests to use v2.1 API"

Browse Source
This commit is contained in:
Jenkins
2016-05-17 07:59:04 +00:00
committed by Gerrit Code Review
parent 2b538d9a6a 6a09c00cf1
commit 52a831e78e
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/tests/unit/api/openstack/compute/test_neutron_security_groups.py
View File

@@ -508,7 +508,11 @@ class TestNeutronSecurityGroupsOutputTest(TestNeutronSecurityGroupsTestCase):
req.body = encodeutils.safe_encode(self._encode_body(body)) req.body = encodeutils.safe_encode(self._encode_body(body))
req.content_type = self.content_type req.content_type = self.content_type
req.headers['Accept'] = self.content_type req.headers['Accept'] = self.content_type
res = req.get_response(fakes.wsgi_app(init_only=('servers',)))
# NOTE: This 'os-security-groups' is for enabling security_groups
# attribute on response body.
res = req.get_response(fakes.wsgi_app_v21(
init_only=('servers', 'os-security-groups')))
return res return res
def _encode_body(self, body): def _encode_body(self, body):

14
nova/tests/unit/api/openstack/compute/test_volumes.py
View File

@@ -170,9 +170,8 @@ class BootFromVolumeTest(test.TestCase):
name='test_server', imageRef=IMAGE_UUID, name='test_server', imageRef=IMAGE_UUID,
flavorRef=2, min_count=1, max_count=1, flavorRef=2, min_count=1, max_count=1,
block_device_mapping=[dict( block_device_mapping=[dict(
volume_id='1', volume_id='ca9fe3f5-cede-43cb-8050-1672acabe348',
device_name='/dev/vda', device_name='/dev/vda',
virtual='root',
delete_on_termination=False, delete_on_termination=False,
)] )]
)) ))
@@ -180,15 +179,16 @@ class BootFromVolumeTest(test.TestCase):
req.method = 'POST' req.method = 'POST'
req.body = jsonutils.dump_as_bytes(body) req.body = jsonutils.dump_as_bytes(body)
req.headers['content-type'] = 'application/json' req.headers['content-type'] = 'application/json'
res = req.get_response(fakes.wsgi_app( res = req.get_response(fakes.wsgi_app_v21(
init_only=('os-volumes_boot', 'servers'))) init_only=('os-volumes', 'servers')))
self.assertEqual(202, res.status_int) self.assertEqual(202, res.status_int)
server = jsonutils.loads(res.body)['server'] server = jsonutils.loads(res.body)['server']
self.assertEqual(FAKE_UUID, server['id']) self.assertEqual(FAKE_UUID, server['id'])
self.assertEqual(CONF.password_length, len(server['adminPass'])) self.assertEqual(CONF.password_length, len(server['adminPass']))
self.assertEqual(1, len(self._block_device_mapping_seen)) self.assertEqual(1, len(self._block_device_mapping_seen))
self.assertTrue(self._legacy_bdm_seen) self.assertTrue(self._legacy_bdm_seen)
self.assertEqual('1', self._block_device_mapping_seen[0]['volume_id']) self.assertEqual('ca9fe3f5-cede-43cb-8050-1672acabe348',
self._block_device_mapping_seen[0]['volume_id'])
self.assertEqual('/dev/vda', self.assertEqual('/dev/vda',
self._block_device_mapping_seen[0]['device_name']) self._block_device_mapping_seen[0]['device_name'])
@@ -208,8 +208,8 @@ class BootFromVolumeTest(test.TestCase):
req.method = 'POST' req.method = 'POST'
req.body = jsonutils.dump_as_bytes(body) req.body = jsonutils.dump_as_bytes(body)
req.headers['content-type'] = 'application/json' req.headers['content-type'] = 'application/json'
res = req.get_response(fakes.wsgi_app( res = req.get_response(fakes.wsgi_app_v21(
init_only=('os-volumes_boot', 'servers'))) init_only=('os-volumes', 'servers')))
self.assertEqual(202, res.status_int) self.assertEqual(202, res.status_int)
server = jsonutils.loads(res.body)['server'] server = jsonutils.loads(res.body)['server']
self.assertEqual(FAKE_UUID, server['id']) self.assertEqual(FAKE_UUID, server['id'])