diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2013-01-07 17:19:09 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2013-01-10 10:25:30 +0000 |
| commit | 567bbd18616a457fac748d0ee67660092beabdea (patch) | |
| tree | 3a3ea38f6d03f52c4d2b165061e8297af5bbb404 | |
| parent | 8143021bdb5ec10ea60a6613e29bdc9347701a04 (diff) | |
| download | nova-567bbd18616a457fac748d0ee67660092beabdea.tar.gz nova-567bbd18616a457fac748d0ee67660092beabdea.tar.xz nova-567bbd18616a457fac748d0ee67660092beabdea.zip | |
Remove bogus 'unplug' calls from libvirt VIF test
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>
| -rw-r--r-- | nova/tests/test_libvirt_vif.py | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/nova/tests/test_libvirt_vif.py b/nova/tests/test_libvirt_vif.py index c8b766f39..aeebb5742 100644 --- a/nova/tests/test_libvirt_vif.py +++ b/nova/tests/test_libvirt_vif.py @@ -137,8 +137,6 @@ class LibvirtVifTestCase(test.TestCase): ret = node.findall("driver") self.assertEqual(len(ret), 0) - d.unplug(None, (self.net, self.mapping)) - def test_model_kvm(self): self.flags(libvirt_use_virtio_for_bridges=True, libvirt_type='kvm') @@ -156,8 +154,6 @@ class LibvirtVifTestCase(test.TestCase): ret = node.findall("driver") self.assertEqual(len(ret), 0) - d.unplug(None, (self.net, self.mapping)) - def test_model_qemu(self): self.flags(libvirt_use_virtio_for_bridges=True, libvirt_type='qemu') @@ -175,8 +171,6 @@ class LibvirtVifTestCase(test.TestCase): driver = node.find("driver").get("name") self.assertEqual(driver, "qemu") - d.unplug(None, (self.net, self.mapping)) - def test_model_xen(self): self.flags(libvirt_use_virtio_for_bridges=True, libvirt_type='xen') @@ -194,8 +188,6 @@ class LibvirtVifTestCase(test.TestCase): ret = node.findall("driver") self.assertEqual(len(ret), 0) - d.unplug(None, (self.net, self.mapping)) - def test_bridge_driver(self): d = vif.LibvirtBridgeDriver() xml = self._get_instance_xml(d) @@ -210,8 +202,6 @@ class LibvirtVifTestCase(test.TestCase): mac = node.find("mac").get("address") self.assertEqual(mac, self.mapping['mac']) - d.unplug(None, (self.net, self.mapping)) - def test_ovs_ethernet_driver(self): d = vif.LibvirtOpenVswitchDriver() xml = self._get_instance_xml(d) @@ -228,8 +218,6 @@ class LibvirtVifTestCase(test.TestCase): script = node.find("script").get("path") self.assertEquals(script, "") - d.unplug(None, (self.net, self.mapping)) - def test_ovs_virtualport_driver(self): d = vif.LibvirtOpenVswitchVirtualPortDriver() xml = self._get_instance_xml(d) @@ -254,7 +242,6 @@ class LibvirtVifTestCase(test.TestCase): iface_id_found = True self.assertTrue(iface_id_found) - d.unplug(None, (self.net, self.mapping)) def test_quantum_bridge_ethernet_driver(self): d = vif.QuantumLinuxBridgeVIFDriver() @@ -272,8 +259,6 @@ class LibvirtVifTestCase(test.TestCase): br_name = node.find("source").get("bridge") self.assertTrue(br_name.startswith("brq")) - d.unplug(None, (self.net, self.mapping)) - def test_quantum_hybrid_driver(self): d = vif.LibvirtHybridOVSBridgeDriver() xml = self._get_instance_xml(d) @@ -287,5 +272,3 @@ class LibvirtVifTestCase(test.TestCase): self.assertEqual(br_name, self.net['bridge']) mac = node.find("mac").get("address") self.assertEqual(mac, self.mapping['mac']) - - d.unplug(None, (self.net, self.mapping)) |