Merge "Remove all remaining references to Quantum"

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)

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()
 

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'

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):

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)

nova/virt/driver.py

@@ -1303,7 +1303,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: