Merge "tests: Remove useless test"
This commit is contained in:
commit
ce91f25fd0
|
@ -151,15 +151,6 @@ class LibvirtVifTestCase(test.NoDBTestCase):
|
|||
details={'port_filter': False},
|
||||
ovs_interfaceid='aaa-bbb-ccc')
|
||||
|
||||
vif_ovs_hybrid = network_model.VIF(id='vif-xxx-yyy-zzz',
|
||||
address='ca:fe:de:ad:be:ef',
|
||||
network=network_ovs,
|
||||
type=network_model.VIF_TYPE_OVS,
|
||||
details={'ovs_hybrid_plug': True,
|
||||
'port_filter': True},
|
||||
devname='tap-xxx-yyy-zzz',
|
||||
ovs_interfaceid='aaa-bbb-ccc')
|
||||
|
||||
vif_ovs_filter_cap = network_model.VIF(id='vif-xxx-yyy-zzz',
|
||||
address='ca:fe:de:ad:be:ef',
|
||||
network=network_ovs,
|
||||
|
@ -1189,16 +1180,6 @@ class LibvirtVifTestCase(test.NoDBTestCase):
|
|||
self._assertTypeAndMacEquals(node, "ethernet", "target", "dev",
|
||||
self.vif_ivs_filter_cap, br_want, 0)
|
||||
|
||||
def test_hybrid_plug_without_nova_firewall(self):
|
||||
d = vif.LibvirtGenericVIFDriver()
|
||||
br_want = "qbr" + self.vif_ovs_hybrid['id']
|
||||
br_want = br_want[:network_model.NIC_NAME_LEN]
|
||||
self.flags(firewall_driver="nova.virt.firewall.NoopFirewallDriver")
|
||||
xml = self._get_instance_xml(d, self.vif_ovs_hybrid)
|
||||
node = self._get_node(xml)
|
||||
self._assertTypeAndMacEquals(node, "bridge", "source", "bridge",
|
||||
self.vif_ovs_hybrid, br_want, 0)
|
||||
|
||||
def test_direct_plug_with_port_filter_cap_no_nova_firewall(self):
|
||||
d = vif.LibvirtGenericVIFDriver()
|
||||
br_want = self.vif_midonet['devname']
|
||||
|
|
Loading…
Reference in New Issue