x/python-ganttclient
Code Issues Proposed changes

Remove bogus 'unplug' calls from libvirt VIF test

Browse Source 
Since the 'get_config' method was introduced to the libvirt
VIF class, separate from the 'plug' method, there is no need
to call the 'unplug' method in the test suite

Blueprint: libvirt-vif-driver
Change-Id: I1c3d055e258117c2657cd72386472dff2e0e08b8
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange
2013-01-07 17:19:09 +00:00
parent b2d9b99aaf
commit 3dca180e08
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
nova/tests/test_libvirt_vif.py
View File

@@ -137,8 +137,6 @@ class LibvirtVifTestCase(test.TestCase):
ret = node.findall("driver") ret = node.findall("driver")
self.assertEqual(len(ret), 0) self.assertEqual(len(ret), 0)
d.unplug(None, (self.net, self.mapping))
def test_model_kvm(self): def test_model_kvm(self):
self.flags(libvirt_use_virtio_for_bridges=True, self.flags(libvirt_use_virtio_for_bridges=True,
libvirt_type='kvm') libvirt_type='kvm')
@@ -156,8 +154,6 @@ class LibvirtVifTestCase(test.TestCase):
ret = node.findall("driver") ret = node.findall("driver")
self.assertEqual(len(ret), 0) self.assertEqual(len(ret), 0)
d.unplug(None, (self.net, self.mapping))
def test_model_qemu(self): def test_model_qemu(self):
self.flags(libvirt_use_virtio_for_bridges=True, self.flags(libvirt_use_virtio_for_bridges=True,
libvirt_type='qemu') libvirt_type='qemu')
@@ -175,8 +171,6 @@ class LibvirtVifTestCase(test.TestCase):
driver = node.find("driver").get("name") driver = node.find("driver").get("name")
self.assertEqual(driver, "qemu") self.assertEqual(driver, "qemu")
d.unplug(None, (self.net, self.mapping))
def test_model_xen(self): def test_model_xen(self):
self.flags(libvirt_use_virtio_for_bridges=True, self.flags(libvirt_use_virtio_for_bridges=True,
libvirt_type='xen') libvirt_type='xen')
@@ -194,8 +188,6 @@ class LibvirtVifTestCase(test.TestCase):
ret = node.findall("driver") ret = node.findall("driver")
self.assertEqual(len(ret), 0) self.assertEqual(len(ret), 0)
d.unplug(None, (self.net, self.mapping))
def test_bridge_driver(self): def test_bridge_driver(self):
d = vif.LibvirtBridgeDriver() d = vif.LibvirtBridgeDriver()
xml = self._get_instance_xml(d) xml = self._get_instance_xml(d)
@@ -210,8 +202,6 @@ class LibvirtVifTestCase(test.TestCase):
mac = node.find("mac").get("address") mac = node.find("mac").get("address")
self.assertEqual(mac, self.mapping['mac']) self.assertEqual(mac, self.mapping['mac'])
d.unplug(None, (self.net, self.mapping))
def test_ovs_ethernet_driver(self): def test_ovs_ethernet_driver(self):
d = vif.LibvirtOpenVswitchDriver() d = vif.LibvirtOpenVswitchDriver()
xml = self._get_instance_xml(d) xml = self._get_instance_xml(d)
@@ -228,8 +218,6 @@ class LibvirtVifTestCase(test.TestCase):
script = node.find("script").get("path") script = node.find("script").get("path")
self.assertEquals(script, "") self.assertEquals(script, "")
d.unplug(None, (self.net, self.mapping))
def test_ovs_virtualport_driver(self): def test_ovs_virtualport_driver(self):
d = vif.LibvirtOpenVswitchVirtualPortDriver() d = vif.LibvirtOpenVswitchVirtualPortDriver()
xml = self._get_instance_xml(d) xml = self._get_instance_xml(d)
@@ -254,7 +242,6 @@ class LibvirtVifTestCase(test.TestCase):
iface_id_found = True iface_id_found = True
self.assertTrue(iface_id_found) self.assertTrue(iface_id_found)
d.unplug(None, (self.net, self.mapping))
def test_quantum_bridge_ethernet_driver(self): def test_quantum_bridge_ethernet_driver(self):
d = vif.QuantumLinuxBridgeVIFDriver() d = vif.QuantumLinuxBridgeVIFDriver()
@@ -272,8 +259,6 @@ class LibvirtVifTestCase(test.TestCase):
br_name = node.find("source").get("bridge") br_name = node.find("source").get("bridge")
self.assertTrue(br_name.startswith("brq")) self.assertTrue(br_name.startswith("brq"))
d.unplug(None, (self.net, self.mapping))
def test_quantum_hybrid_driver(self): def test_quantum_hybrid_driver(self):
d = vif.LibvirtHybridOVSBridgeDriver() d = vif.LibvirtHybridOVSBridgeDriver()
xml = self._get_instance_xml(d) xml = self._get_instance_xml(d)
@@ -287,5 +272,3 @@ class LibvirtVifTestCase(test.TestCase):
self.assertEqual(br_name, self.net['bridge']) self.assertEqual(br_name, self.net['bridge'])
mac = node.find("mac").get("address") mac = node.find("mac").get("address")
self.assertEqual(mac, self.mapping['mac']) self.assertEqual(mac, self.mapping['mac'])
d.unplug(None, (self.net, self.mapping))