Merge "libvirt: remove 'vif_driver' config parameter"

nova/tests/fake_network.py

@@ -33,7 +33,6 @@ from nova.pci import pci_device
 from nova.tests.objects import test_fixed_ip
 from nova.tests.objects import test_instance_info_cache
 from nova.tests.objects import test_pci_device
-from nova.virt.libvirt import config as libvirt_config
 
 
 HOST = "testhost"
@@ -41,42 +40,6 @@ CONF = cfg.CONF
 CONF.import_opt('use_ipv6', 'nova.netconf')
 
 
-class FakeIptablesFirewallDriver(object):
-    def __init__(self, **kwargs):
-        pass
-
-    def setattr(self, key, val):
-        self.__setattr__(key, val)
-
-    def apply_instance_filter(self, instance, network_info):
-        pass
-
-
-class FakeVIFDriver(object):
-
-    def __init__(self, *args, **kwargs):
-        pass
-
-    def setattr(self, key, val):
-        self.__setattr__(key, val)
-
-    def get_config(self, instance, vif, image_meta,
-                   inst_type, virt_type):
-        conf = libvirt_config.LibvirtConfigGuestInterface()
-
-        for attr, val in conf.__dict__.iteritems():
-            if val is None:
-                setattr(conf, attr, 'fake')
-
-        return conf
-
-    def plug(self, instance, vif):
-        pass
-
-    def unplug(self, instance, vif):
-        pass
-
-
 class FakeModel(dict):
     """Represent a model from the db."""
     def __init__(self, *args, **kwargs):

nova/tests/virt/libvirt/test_driver.py

@@ -542,9 +542,6 @@ class LibvirtConnTestCase(test.TestCase,
         for key, val in kwargs.items():
             fake.__setattr__(key, val)
 
-        self.flags(vif_driver="nova.tests.fake_network.FakeVIFDriver",
-                   group='libvirt')
-
         self.stubs.Set(libvirt_driver.LibvirtDriver, '_conn', fake)
 
     def fake_lookup(self, instance_name):
@@ -7941,8 +7938,6 @@ Active:          8381604 kB
 
     def _test_create_with_network_events(self, neutron_failure=None,
                                          power_on=True):
-        self.flags(vif_driver="nova.tests.fake_network.FakeVIFDriver",
-                   group='libvirt')
         generated_events = []
 
         def wait_timeout():

nova/virt/libvirt/driver.py

@@ -94,6 +94,7 @@ from nova.virt.libvirt import imagecache
 from nova.virt.libvirt import lvm
 from nova.virt.libvirt import rbd
 from nova.virt.libvirt import utils as libvirt_utils
+from nova.virt.libvirt import vif as libvirt_vif
 from nova.virt import netutils
 from nova.virt import watchdog_actions
 from nova import volume
@@ -161,11 +162,6 @@ libvirt_opts = [
                help='Snapshot image format (valid options are : '
                     'raw, qcow2, vmdk, vdi). '
                     'Defaults to same as source image'),
-    cfg.StrOpt('vif_driver',
-               default='nova.virt.libvirt.vif.LibvirtGenericVIFDriver',
-               help='DEPRECATED. The libvirt VIF driver to configure the VIFs.'
-                    'This option is deprecated and will be removed in the '
-                    'Juno release.'),
     cfg.ListOpt('volume_drivers',
                 default=[
                   'iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver',
@@ -342,8 +338,8 @@ class LibvirtDriver(driver.ComputeDriver):
             self.virtapi,
             get_connection=self._get_connection)
 
-        vif_class = importutils.import_class(CONF.libvirt.vif_driver)
-        self.vif_driver = vif_class(self._get_connection)
+        self.vif_driver = libvirt_vif.LibvirtGenericVIFDriver(
+            self._get_connection)
 
         self.volume_drivers = driver.driver_dict_from_config(
             CONF.libvirt.volume_drivers, self)