From 32299f9fd5bb55998c4d513a8efdf411381d24c0 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Wed, 27 Jan 2016 14:14:33 +0000 Subject: [PATCH] Remove all remaining references to Quantum Quantum was renamed to Neutron back in the Havana release. Allowing 4 releases is more than enough time for users to change their config files to stop referring to Quantum class names. Change-Id: I83fc3c95ca8947019e0a9488679efdaed826dba7 --- nova/network/__init__.py | 2 -- nova/network/linux_net.py | 2 -- nova/network/security_group/openstack_driver.py | 2 +- nova/tests/unit/test_utils.py | 4 ---- nova/utils.py | 4 ---- nova/virt/driver.py | 2 +- 6 files changed, 2 insertions(+), 14 deletions(-) diff --git a/nova/network/__init__.py b/nova/network/__init__.py index 1c5baab6a050..27a0a802c2ce 100644 --- a/nova/network/__init__.py +++ b/nova/network/__init__.py @@ -29,7 +29,5 @@ oslo_config.cfg.CONF.register_opts(_network_opts) def API(skip_policy_check=False): network_api_class = oslo_config.cfg.CONF.network_api_class - if 'quantumv2' in network_api_class: - network_api_class = network_api_class.replace('quantumv2', 'neutronv2') cls = importutils.import_class(network_api_class) return cls(skip_policy_check=skip_policy_check) diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index d4b5b5ef581f..088948544db4 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -1963,8 +1963,6 @@ class NeutronLinuxBridgeInterfaceDriver(LinuxNetInterfaceDriver): bridge = self.BRIDGE_NAME_PREFIX + str(network['uuid'][0:11]) return bridge -# provide compatibility with existing configs -QuantumLinuxBridgeInterfaceDriver = NeutronLinuxBridgeInterfaceDriver iptables_manager = IptablesManager() diff --git a/nova/network/security_group/openstack_driver.py b/nova/network/security_group/openstack_driver.py index ac8a8359d486..e0e2f5c223b0 100644 --- a/nova/network/security_group/openstack_driver.py +++ b/nova/network/security_group/openstack_driver.py @@ -51,4 +51,4 @@ def get_openstack_security_group_driver(skip_policy_check=False): def is_neutron_security_groups(): - return CONF.security_group_api.lower() in ('neutron', 'quantum') + return CONF.security_group_api.lower() == 'neutron' diff --git a/nova/tests/unit/test_utils.py b/nova/tests/unit/test_utils.py index 59762633fd40..9d221be47468 100644 --- a/nova/tests/unit/test_utils.py +++ b/nova/tests/unit/test_utils.py @@ -971,10 +971,6 @@ class ValidateNeutronConfiguration(test.NoDBTestCase): self.flags(network_api_class='nova.network.neutronv2.api.API') self.assertTrue(utils.is_neutron()) - def test_quantum(self): - self.flags(network_api_class='nova.network.quantumv2.api.API') - self.assertTrue(utils.is_neutron()) - class AutoDiskConfigUtilTestCase(test.NoDBTestCase): def test_is_auto_disk_config_disabled(self): diff --git a/nova/utils.py b/nova/utils.py index 0cc9fb201dba..b869c35f2d1b 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -1201,11 +1201,7 @@ def is_neutron(): return _IS_NEUTRON try: - # compatibility with Folsom/Grizzly configs cls_name = CONF.network_api_class - if cls_name == 'nova.network.quantumv2.api.API': - cls_name = 'nova.network.neutronv2.api.API' - from nova.network.neutronv2 import api as neutron_api _IS_NEUTRON = issubclass(importutils.import_class(cls_name), neutron_api.API) diff --git a/nova/virt/driver.py b/nova/virt/driver.py index 5367e8631bb5..f2810773146a 100644 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -1320,7 +1320,7 @@ class ComputeDriver(object): This is called during spawn_instance by the compute manager. - Note that the format of the return value is specific to Quantum + Note that the format of the return value is specific to the Neutron client API. :return: None, or a set of DHCP options, eg: