openstack/nova
Code Issues Proposed changes

Remove the usage of extension black/white list opt in config drive

Browse Source 
The Nova API doesn't support the extension anymore. The API
unittest shouldn't disable any part of Nova API. This patch
removes the tests which disable part of API in config drive
unittests.

Partial-implement-blueprint api-no-more-extensions-pike

Change-Id: I91e10fa26f44d8932926c2258c41fb7ede48f5b5
This commit is contained in:
He Jie Xu 2017-03-28 20:46:00 +08:00
parent 698355bb9a
commit 17304e78d1
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nova/tests/unit/api/openstack/compute/test_config_drive.py
View File

@ -85,11 +85,6 @@ class ServersControllerCreateTestV21(test.TestCase):
ext_info = extension_info.LoadedExtensionInfo()
self.controller = servers_v21.ServersController(
extension_info=ext_info)
CONF.set_override('extensions_blacklist',
'os-config-drive',
'osapi_v21')
self.no_config_drive_controller = servers_v21.ServersController(
extension_info=ext_info)
def _verify_config_drive(self, **kwargs):
self.assertNotIn('config_drive', kwargs)
@ -115,7 +110,7 @@ class ServersControllerCreateTestV21(test.TestCase):
self.stub_out('nova.compute.api.API.create_db_entry_for_new_instance',
create_db_entry_for_new_instance)
def _test_create_extra(self, params, override_controller):
def _test_create_extra(self, params):
image_uuid = 'c905cedb-7281-47e4-8a62-f26bc5fc4c77'
server = dict(name='server_test', imageRef=image_uuid, flavorRef=2)
server.update(params)
@ -124,22 +119,7 @@ class ServersControllerCreateTestV21(test.TestCase):
req.method = 'POST'
req.body = jsonutils.dump_as_bytes(body)
req.headers["content-type"] = "application/json"
if override_controller is not None:
server = override_controller.create(req, body=body).obj['server']
else:
server = self.controller.create(req, body=body).obj['server']
def test_create_instance_with_config_drive_disabled(self):
params = {'config_drive': "False"}
old_create = compute_api.API.create
def create(*args, **kwargs):
self._verify_config_drive(**kwargs)
return old_create(*args, **kwargs)
self.stub_out('nova.compute.api.API.create', create)
self._test_create_extra(params,
override_controller=self.no_config_drive_controller)
server = self.controller.create(req, body=body).obj['server']
def _create_instance_body_of_config_drive(self, param):
self._initialize_extension()