openstack
/
nova
Code Issues Proposed changes

remove extension param and usage 

as extension info is not needed and used at all, we can
just remove the extension param and usage

Change-Id: I5c8e3859407fe9489255a82747ff85b27172ba69
This commit is contained in:
jichenjc 2017-07-06 10:55:25 +08:00
parent fa3f2e4796
commit 29bdffc8e8
13 changed files with 22 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/api/openstack/compute/servers.py
View File

@ -127,9 +127,6 @@ class ServersController(wsgi.Controller):
return robj
def __init__(self, **kwargs):
# TODO(alex_xu): Remove this line when 'extension_info' won't be passed
# in when creating controller.
kwargs.pop('extension_info', None)
super(ServersController, self).__init__(**kwargs)
self.compute_api = compute.API()

5
nova/tests/unit/api/openstack/compute/test_access_ips.py
View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from nova.api.openstack.compute import extension_info
from nova.api.openstack.compute import servers as servers_v21
from nova import exception
from nova import test
@ -46,9 +45,7 @@ class AccessIPsAPIValidationTestV21(test.TestCase):
self.req = fakes.HTTPRequest.blank('')
def _set_up_controller(self):
ext_info = extension_info.LoadedExtensionInfo()
self.controller = servers_v21.ServersController(
extension_info=ext_info)
self.controller = servers_v21.ServersController()
def _verify_update_access_ip(self, res_dict, params):
for key, value in params.items():

5
nova/tests/unit/api/openstack/compute/test_availability_zone.py
View File

@ -19,7 +19,6 @@ import mock
from oslo_config import cfg
from nova.api.openstack.compute import availability_zone as az_v21
from nova.api.openstack.compute import extension_info
from nova.api.openstack.compute import servers as servers_v21
from nova import availability_zones
from nova.compute import api as compute_api
@ -184,9 +183,7 @@ class ServersControllerCreateTestV21(test.TestCase):
self.req = fakes.HTTPRequest.blank('')
def _set_up_controller(self):
ext_info = extension_info.LoadedExtensionInfo()
self.controller = servers_v21.ServersController(
extension_info=ext_info)
self.controller = servers_v21.ServersController()
def _create_instance_with_availability_zone(self, zone_name):
def create(*args, **kwargs):

5
nova/tests/unit/api/openstack/compute/test_block_device_mapping.py
View File

@ -20,7 +20,6 @@ from six.moves import range
from webob import exc
from nova.api.openstack.compute import block_device_mapping
from nova.api.openstack.compute import extension_info
from nova.api.openstack.compute import servers as servers_v21
from nova import block_device
from nova.compute import api as compute_api
@ -37,9 +36,7 @@ class BlockDeviceMappingTestV21(test.TestCase):
validation_error = exception.ValidationError
def _setup_controller(self):
ext_info = extension_info.LoadedExtensionInfo()
self.controller = servers_v21.ServersController(
extension_info=ext_info)
self.controller = servers_v21.ServersController()
def setUp(self):
super(BlockDeviceMappingTestV21, self).setUp()

5
nova/tests/unit/api/openstack/compute/test_block_device_mapping_v1.py
View File

@ -18,7 +18,6 @@ from oslo_config import cfg
from oslo_serialization import jsonutils
from webob import exc
from nova.api.openstack.compute import extension_info
from nova.api.openstack.compute import servers as servers_v21
from nova.compute import api as compute_api
from nova import db
@ -36,9 +35,7 @@ class BlockDeviceMappingTestV21(test.TestCase):
validation_error = exception.ValidationError
def _setup_controller(self):
ext_info = extension_info.LoadedExtensionInfo()
self.controller = servers_v21.ServersController(
extension_info=ext_info)
self.controller = servers_v21.ServersController()
def setUp(self):
super(BlockDeviceMappingTestV21, self).setUp()

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

@ -17,7 +17,6 @@ import mock
from oslo_config import cfg
from oslo_serialization import jsonutils
from nova.api.openstack.compute import extension_info
from nova.api.openstack.compute import servers as servers_v21
from nova.compute import api as compute_api
from nova import exception
@ -82,9 +81,7 @@ class ServersControllerCreateTestV21(test.TestCase):
bad_request = exception.ValidationError
def _set_up_controller(self):
ext_info = extension_info.LoadedExtensionInfo()
self.controller = servers_v21.ServersController(
extension_info=ext_info)
self.controller = servers_v21.ServersController()
def _verify_config_drive(self, **kwargs):
self.assertNotIn('config_drive', kwargs)

5
nova/tests/unit/api/openstack/compute/test_multiple_create.py
View File

@ -17,7 +17,6 @@ import webob
from nova.api.openstack.compute import block_device_mapping \
as block_device_mapping_v21
from nova.api.openstack.compute import extension_info
from nova.api.openstack.compute import multiple_create as multiple_create_v21
from nova.api.openstack.compute import servers as servers_v21
from nova.compute import api as compute_api
@ -49,9 +48,7 @@ class MultiCreateExtensionTestV21(test.TestCase):
# Network API needs to be stubbed out before creating the controllers.
fakes.stub_out_nw_api(self)
ext_info = extension_info.LoadedExtensionInfo()
self.controller = servers_v21.ServersController(
extension_info=ext_info)
self.controller = servers_v21.ServersController()
def instance_get(context, instance_id):
"""Stub for compute/api create() pulling in instance after

9
nova/tests/unit/api/openstack/compute/test_quota_classes.py
View File

@ -15,7 +15,6 @@
import copy
import webob
from nova.api.openstack.compute import extension_info
from nova.api.openstack.compute import quota_classes \
as quota_classes_v21
from nova import exception
@ -46,9 +45,7 @@ class QuotaClassSetsTestV21(test.TestCase):
self._setup()
def _setup(self):
ext_info = extension_info.LoadedExtensionInfo()
self.controller = quota_classes_v21.QuotaClassSetsController(
extension_info=ext_info)
self.controller = quota_classes_v21.QuotaClassSetsController()
def _check_filtered_extended_quota(self, quota_set):
self.assertNotIn('server_groups', quota_set)
@ -161,9 +158,7 @@ class QuotaClassesPolicyEnforcementV21(test.NoDBTestCase):
def setUp(self):
super(QuotaClassesPolicyEnforcementV21, self).setUp()
ext_info = extension_info.LoadedExtensionInfo()
self.controller = quota_classes_v21.QuotaClassSetsController(
extension_info=ext_info)
self.controller = quota_classes_v21.QuotaClassSetsController()
self.req = fakes.HTTPRequest.blank('')
def test_show_policy_failed(self):

4
nova/tests/unit/api/openstack/compute/test_server_actions.py
View File

@ -17,7 +17,6 @@ import mock
from oslo_utils import uuidutils
import webob
from nova.api.openstack.compute import extension_info
from nova.api.openstack.compute import servers as servers_v21
from nova.compute import api as compute_api
from nova.compute import task_states
@ -97,8 +96,7 @@ class ServerActionsControllerTestV21(test.TestCase):
self.context = self.req.environ['nova.context']
def _get_controller(self):
ext_info = extension_info.LoadedExtensionInfo()
return self.servers.ServersController(extension_info=ext_info)
return self.servers.ServersController()
def _set_fake_extension(self):
pass

9
nova/tests/unit/api/openstack/compute/test_server_start_stop.py
View File

@ -17,7 +17,6 @@ from oslo_policy import policy as oslo_policy
import six
import webob
from nova.api.openstack.compute import extension_info
from nova.api.openstack.compute import servers \
as server_v21
from nova.compute import api as compute_api
@ -41,9 +40,7 @@ class ServerStartStopTestV21(test.TestCase):
fakes.fake_instance_get())
def _setup_controller(self):
ext_info = extension_info.LoadedExtensionInfo()
self.controller = server_v21.ServersController(
extension_info=ext_info)
self.controller = server_v21.ServersController()
@mock.patch.object(compute_api.API, 'start')
def test_start(self, start_mock):
@ -130,9 +127,7 @@ class ServerStartStopPolicyEnforcementV21(test.TestCase):
def setUp(self):
super(ServerStartStopPolicyEnforcementV21, self).setUp()
ext_info = extension_info.LoadedExtensionInfo()
self.controller = server_v21.ServersController(
extension_info=ext_info)
self.controller = server_v21.ServersController()
self.req = fakes.HTTPRequest.blank('')
self.useFixture(nova_fixtures.SingleCellSimple())
self.stub_out(

4
nova/tests/unit/api/openstack/compute/test_server_tags.py
View File

@ -13,7 +13,6 @@
import mock
from webob import exc
from nova.api.openstack.compute import extension_info
from nova.api.openstack.compute import server_tags
from nova.api.openstack.compute import servers
from nova.compute import vm_states
@ -298,8 +297,7 @@ class ServerTagsTest(test.TestCase):
def test_show_with_details_information_non_existing_instance(self):
req = self._get_request(
'/v2/fake/servers/%s' % NON_EXISTING_UUID, 'GET')
ext_info = extension_info.LoadedExtensionInfo()
servers_controller = servers.ServersController(extension_info=ext_info)
servers_controller = servers.ServersController()
self.assertRaises(exc.HTTPNotFound, servers_controller.show, req,
NON_EXISTING_UUID)

29
nova/tests/unit/api/openstack/compute/test_serversV21.py
View File

@ -37,7 +37,6 @@ import webob
from nova.api.openstack import api_version_request
from nova.api.openstack import common
from nova.api.openstack import compute
from nova.api.openstack.compute import extension_info
from nova.api.openstack.compute import ips
from nova.api.openstack.compute import servers
from nova.api.openstack.compute import views
@ -174,8 +173,7 @@ class ControllerTest(test.TestCase):
instance_update_and_get_original)
self.flags(group='glance', api_servers=['http://localhost:9292'])
ext_info = extension_info.LoadedExtensionInfo()
self.controller = servers.ServersController(extension_info=ext_info)
self.controller = servers.ServersController()
self.ips_controller = ips.IPsController()
policy.reset()
policy.init()
@ -2459,8 +2457,7 @@ class ServerStatusTest(test.TestCase):
super(ServerStatusTest, self).setUp()
fakes.stub_out_nw_api(self)
ext_info = extension_info.LoadedExtensionInfo()
self.controller = servers.ServersController(extension_info=ext_info)
self.controller = servers.ServersController()
def _get_with_state(self, vm_state, task_state=None):
self.stub_out('nova.db.instance_get_by_uuid',
@ -2569,8 +2566,7 @@ class ServersControllerCreateTest(test.TestCase):
fakes.stub_out_nw_api(self)
ext_info = extension_info.LoadedExtensionInfo()
self.controller = servers.ServersController(extension_info=ext_info)
self.controller = servers.ServersController()
def instance_create(context, inst):
inst_type = flavors.get_flavor_by_flavor_id(3)
@ -3674,8 +3670,7 @@ class ServersControllerCreateTestV232(test.NoDBTestCase):
super(ServersControllerCreateTestV232, self).setUp()
self.flags(use_neutron=True)
ext_info = extension_info.LoadedExtensionInfo()
self.controller = servers.ServersController(extension_info=ext_info)
self.controller = servers.ServersController()
self.body = {
'server': {
@ -3771,8 +3766,7 @@ class ServersControllerCreateTestV237(test.NoDBTestCase):
# Set the use_neutron flag to process requested networks.
self.flags(use_neutron=True)
# Create the server controller.
ext_info = extension_info.LoadedExtensionInfo()
self.controller = servers.ServersController(extension_info=ext_info)
self.controller = servers.ServersController()
# Define a basic server create request body which tests can customize.
self.body = {
'server': {
@ -3948,8 +3942,7 @@ class ServersControllerCreateTestWithMock(test.TestCase):
self.instance_cache_by_id = {}
self.instance_cache_by_uuid = {}
ext_info = extension_info.LoadedExtensionInfo()
self.controller = servers.ServersController(extension_info=ext_info)
self.controller = servers.ServersController()
self.body = {
'server': {
@ -4596,8 +4589,7 @@ class ServersInvalidRequestTestCase(test.TestCase):
def setUp(self):
super(ServersInvalidRequestTestCase, self).setUp()
ext_info = extension_info.LoadedExtensionInfo()
self.controller = servers.ServersController(extension_info=ext_info)
self.controller = servers.ServersController()
def _invalid_server_create(self, body):
req = fakes.HTTPRequestV21.blank('/fake/servers')
@ -4672,9 +4664,7 @@ class ServersPolicyEnforcementV21(test.NoDBTestCase):
def setUp(self):
super(ServersPolicyEnforcementV21, self).setUp()
self.useFixture(nova_fixtures.AllServicesCurrent())
ext_info = extension_info.LoadedExtensionInfo()
ext_info.extensions.update({'os-networks': 'fake'})
self.controller = servers.ServersController(extension_info=ext_info)
self.controller = servers.ServersController()
self.req = fakes.HTTPRequest.blank('')
self.image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
@ -5156,8 +5146,7 @@ class ServersActionsJsonTestV239(test.NoDBTestCase):
def setUp(self):
super(ServersActionsJsonTestV239, self).setUp()
ext_info = extension_info.LoadedExtensionInfo()
self.controller = servers.ServersController(extension_info=ext_info)
self.controller = servers.ServersController()
self.req = fakes.HTTPRequest.blank('', version='2.39')
@mock.patch.object(common, 'check_img_metadata_properties_quota')

4
nova/tests/unit/api/openstack/compute/test_user_data.py
View File

@ -22,7 +22,6 @@ from oslo_config import cfg
from oslo_serialization import base64
from oslo_serialization import jsonutils
from nova.api.openstack.compute import extension_info
from nova.api.openstack.compute import servers
from nova.api.openstack.compute import user_data
from nova.compute import flavors
@ -60,8 +59,7 @@ class ServersControllerCreateTest(test.TestCase):
# Network API needs to be stubbed out before creating the controllers.
fakes.stub_out_nw_api(self)
ext_info = extension_info.LoadedExtensionInfo()
self.controller = servers.ServersController(extension_info=ext_info)
self.controller = servers.ServersController()
def instance_create(context, inst):
inst_type = flavors.get_flavor_by_flavor_id(3)