Merge "Fix test tautology for DVR"
This commit is contained in:
commit
56967bd950
|
@ -159,15 +159,16 @@ class L3DvrTestCase(testlib_api.SqlTestCase):
|
||||||
with mock.patch.object(manager.NeutronManager, 'get_plugin') as gp:
|
with mock.patch.object(manager.NeutronManager, 'get_plugin') as gp:
|
||||||
plugin = mock.Mock()
|
plugin = mock.Mock()
|
||||||
gp.return_value = plugin
|
gp.return_value = plugin
|
||||||
plugin.get_ports.return_value = [port]
|
plugin._get_port.return_value = port
|
||||||
plugin.assertRaises(l3.L3PortInUse,
|
self.assertRaises(l3.L3PortInUse,
|
||||||
plugin.delete_port,
|
self.mixin.prevent_l3_port_deletion,
|
||||||
self.ctx,
|
self.ctx,
|
||||||
'my_port_id')
|
port['id'])
|
||||||
|
|
||||||
def test_prevent_delete_floatingip_agent_gateway_port(self):
|
def test_prevent_delete_floatingip_agent_gateway_port(self):
|
||||||
port = {
|
port = {
|
||||||
'id': 'my_port_id',
|
'id': 'my_port_id',
|
||||||
|
'fixed_ips': mock.ANY,
|
||||||
'device_owner': l3_const.DEVICE_OWNER_AGENT_GW
|
'device_owner': l3_const.DEVICE_OWNER_AGENT_GW
|
||||||
}
|
}
|
||||||
self._test_prepare_direct_delete_dvr_internal_ports(port)
|
self._test_prepare_direct_delete_dvr_internal_ports(port)
|
||||||
|
@ -175,6 +176,7 @@ class L3DvrTestCase(testlib_api.SqlTestCase):
|
||||||
def test_prevent_delete_csnat_port(self):
|
def test_prevent_delete_csnat_port(self):
|
||||||
port = {
|
port = {
|
||||||
'id': 'my_port_id',
|
'id': 'my_port_id',
|
||||||
|
'fixed_ips': mock.ANY,
|
||||||
'device_owner': l3_const.DEVICE_OWNER_ROUTER_SNAT
|
'device_owner': l3_const.DEVICE_OWNER_ROUTER_SNAT
|
||||||
}
|
}
|
||||||
self._test_prepare_direct_delete_dvr_internal_ports(port)
|
self._test_prepare_direct_delete_dvr_internal_ports(port)
|
||||||
|
|
Loading…
Reference in New Issue