From 9c0a704281a07d05b73251652adf43d88bc09e80 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Mon, 17 Dec 2012 20:27:50 +0000 Subject: [PATCH] Merge Libvirt....VirtualPortDriver class into LibvirtGenericVIFDriver The LibvirtOpenVswitchVirtualPortDriver VIF driver and the LibvirtOpenVswitchDriver VIF driver both support OpenVswitch based guest configs. The only difference is that the former uses libvirt's modern with vport profile specified, while the latter uses and does all openvswitch setup itself. The reason for the latter is to support running against libvirt versions older than 0.9.11 Rather than require the host admin to figure this out themselves, the right behaviour can be choosen automatically based on the libvirt connection's version number. The LibvirtGenericVIFDriver class can use the 'vif_type' mapping field to determine whether an OVS network configuration is required. In combination with a check against the libvirt version number, a dedicated driver for OVS bridge setup is no longer required. The LibvirtOpenVswitchVirtualPortDriver class functionality is merged into LibvirtGenericVIFDriver. For backwards compatibility with the Folsom release, the existing LibvirtOpenVswitchVirtualPortDriver class is made to inherit from LibvirtGenericVIFDriver and directly call the bridge specific setup APIs. This eases migration to the new VIF impl during the Grizzly deployment lifecycle, with an expectation that the LibvirtOpenVswitchVirtualPortDriver stub will be deleted after the Havana release. Blueprint: libvirt-vif-driver Change-Id: I292c2fd7aa0c32b1c91d737152ed8e54ea2cf6ac Signed-off-by: Daniel P. Berrange --- nova/tests/fakelibvirt.py | 8 +-- nova/tests/test_libvirt_vif.py | 93 +++++++++++++++++++++++++++------- 2 files changed, 80 insertions(+), 21 deletions(-) diff --git a/nova/tests/fakelibvirt.py b/nova/tests/fakelibvirt.py index 259d192c..6abe7771 100644 --- a/nova/tests/fakelibvirt.py +++ b/nova/tests/fakelibvirt.py @@ -481,7 +481,7 @@ class DomainSnapshot(object): class Connection(object): - def __init__(self, uri, readonly): + def __init__(self, uri, readonly, version=9007): if not uri or uri == '': if allow_default_uri_connection: uri = 'qemu:///session' @@ -506,6 +506,8 @@ class Connection(object): self._running_vms = {} self._id_counter = 1 # libvirt reserves 0 for the hypervisor. self._nwfilters = {} + self.fakeLibVersion = version + self.fakeVersion = version def _add_filter(self, nwfilter): self._nwfilters[nwfilter._name] = nwfilter @@ -576,10 +578,10 @@ class Connection(object): return 'QEMU' def getLibVersion(self): - return 9007 + return self.fakeLibVersion def getVersion(self): - return 14000 + return self.fakeVersion def getHostname(self): return 'compute1' diff --git a/nova/tests/test_libvirt_vif.py b/nova/tests/test_libvirt_vif.py index 6a353058..5c3d148b 100644 --- a/nova/tests/test_libvirt_vif.py +++ b/nova/tests/test_libvirt_vif.py @@ -20,6 +20,7 @@ from nova import exception from nova.network import model as network_model from nova.openstack.common import cfg from nova import test +from nova.tests import fakelibvirt from nova import utils from nova.virt.libvirt import config as vconfig from nova.virt.libvirt import vif @@ -193,7 +194,10 @@ class LibvirtVifTestCase(test.TestCase): self.flags(libvirt_use_virtio_for_bridges=False, libvirt_type='kvm') - d = vif.LibvirtGenericVIFDriver() + def get_connection(): + return fakelibvirt.Connection("qemu:///session", + False) + d = vif.LibvirtGenericVIFDriver(get_connection) xml = self._get_instance_xml(d, self.net_bridge, self.mapping_bridge) @@ -212,7 +216,10 @@ class LibvirtVifTestCase(test.TestCase): self.flags(libvirt_use_virtio_for_bridges=True, libvirt_type='kvm') - d = vif.LibvirtGenericVIFDriver() + def get_connection(): + return fakelibvirt.Connection("qemu:///session", + False) + d = vif.LibvirtGenericVIFDriver(get_connection) xml = self._get_instance_xml(d, self.net_bridge, self.mapping_bridge) @@ -231,7 +238,10 @@ class LibvirtVifTestCase(test.TestCase): self.flags(libvirt_use_virtio_for_bridges=True, libvirt_type='qemu') - d = vif.LibvirtGenericVIFDriver() + def get_connection(): + return fakelibvirt.Connection("qemu:///session", + False) + d = vif.LibvirtGenericVIFDriver(get_connection) xml = self._get_instance_xml(d, self.net_bridge, self.mapping_bridge) @@ -250,7 +260,10 @@ class LibvirtVifTestCase(test.TestCase): self.flags(libvirt_use_virtio_for_bridges=True, libvirt_type='xen') - d = vif.LibvirtGenericVIFDriver() + def get_connection(): + return fakelibvirt.Connection("xen:///system", + False) + d = vif.LibvirtGenericVIFDriver(get_connection) xml = self._get_instance_xml(d, self.net_bridge, self.mapping_bridge) @@ -266,7 +279,10 @@ class LibvirtVifTestCase(test.TestCase): self.assertEqual(len(ret), 0) def test_generic_driver_none(self): - d = vif.LibvirtGenericVIFDriver() + def get_connection(): + return fakelibvirt.Connection("qemu:///session", + False) + d = vif.LibvirtGenericVIFDriver(get_connection) self.assertRaises(exception.NovaException, self._get_instance_xml, d, @@ -287,23 +303,32 @@ class LibvirtVifTestCase(test.TestCase): self.assertEqual(mac, self.mapping_bridge['mac']) def test_bridge_driver(self): - d = vif.LibvirtBridgeDriver() + def get_connection(): + return fakelibvirt.Connection("qemu:///session", + False) + d = vif.LibvirtBridgeDriver(get_connection) self._check_bridge_driver(d, self.net_bridge, self.mapping_bridge, self.net_bridge['bridge']) def test_generic_driver_bridge(self): - d = vif.LibvirtGenericVIFDriver() + def get_connection(): + return fakelibvirt.Connection("qemu:///session", + False) + d = vif.LibvirtGenericVIFDriver(get_connection) self._check_bridge_driver(d, self.net_bridge, self.mapping_bridge, self.net_bridge['bridge']) def test_quantum_bridge_driver(self): + def get_connection(): + return fakelibvirt.Connection("qemu:///session", + False) + d = vif.QuantumLinuxBridgeVIFDriver(get_connection) br_want = 'brq' + self.net_bridge_quantum['id'] br_want = br_want[:network_model.NIC_NAME_LEN] - d = vif.QuantumLinuxBridgeVIFDriver() self._check_bridge_driver(d, self.net_bridge_quantum, self.mapping_bridge_quantum, @@ -325,22 +350,28 @@ class LibvirtVifTestCase(test.TestCase): self.assertEquals(script, "") def test_ovs_ethernet_driver(self): + def get_connection(): + return fakelibvirt.Connection("qemu:///session", + False, + 9010) + d = vif.LibvirtOpenVswitchDriver(get_connection) d = vif.LibvirtOpenVswitchDriver() self._check_ovs_ethernet_driver(d, self.net_ovs, self.mapping_ovs_legacy) def test_ovs_ethernet_driver(self): - d = vif.LibvirtGenericVIFDriver() + def get_connection(): + return fakelibvirt.Connection("qemu:///session", + False, + 9010) + d = vif.LibvirtGenericVIFDriver(get_connection) self._check_ovs_ethernet_driver(d, self.net_ovs, self.mapping_ovs) - def test_ovs_virtualport_driver(self): - d = vif.LibvirtOpenVswitchVirtualPortDriver() - xml = self._get_instance_xml(d, - self.net_ovs, - self.mapping_ovs) + def _check_ovs_virtualport_driver(self, d, net, mapping, want_iface_id): + xml = self._get_instance_xml(d, net, mapping) doc = etree.fromstring(xml) ret = doc.findall('./devices/interface') @@ -351,21 +382,47 @@ class LibvirtVifTestCase(test.TestCase): br_name = node.find("source").get("bridge") self.assertEqual(br_name, "br0") mac = node.find("mac").get("address") - self.assertEqual(mac, self.mapping_ovs['mac']) + self.assertEqual(mac, mapping['mac']) vp = node.find("virtualport") self.assertEqual(vp.get("type"), "openvswitch") iface_id_found = False for p_elem in vp.findall("parameters"): iface_id = p_elem.get("interfaceid", None) if iface_id: - self.assertEqual(iface_id, - self.mapping_ovs['ovs_interfaceid']) + self.assertEqual(iface_id, want_iface_id) iface_id_found = True self.assertTrue(iface_id_found) + def test_ovs_virtualport_driver(self): + def get_connection(): + return fakelibvirt.Connection("qemu:///session", + False, + 9011) + d = vif.LibvirtOpenVswitchVirtualPortDriver(get_connection) + want_iface_id = 'vif-xxx-yyy-zzz' + self._check_ovs_virtualport_driver(d, + self.net_ovs, + self.mapping_ovs_legacy, + want_iface_id) + + def test_generic_ovs_virtualport_driver(self): + def get_connection(): + return fakelibvirt.Connection("qemu:///session", + False, + 9011) + d = vif.LibvirtGenericVIFDriver(get_connection) + want_iface_id = self.mapping_ovs['ovs_interfaceid'] + self._check_ovs_virtualport_driver(d, + self.net_ovs, + self.mapping_ovs, + want_iface_id) + def test_quantum_hybrid_driver(self): - d = vif.LibvirtHybridOVSBridgeDriver() + def get_connection(): + return fakelibvirt.Connection("qemu:///session", + False) + d = vif.LibvirtHybridOVSBridgeDriver(get_connection) xml = self._get_instance_xml(d, self.net_ovs, self.mapping_ovs)