Browse Source

Merge "[OVN] Fix test_add_interface_in_use negative test"

changes/50/752350/1
Zuul 1 week ago
committed by Gerrit Code Review
parent
commit
be008e873d
4 changed files with 41 additions and 6 deletions
  1. +3
    -2
      neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/maintenance.py
  2. +3
    -1
      neutron/services/ovn_l3/plugin.py
  3. +32
    -0
      neutron/tests/unit/extensions/test_l3.py
  4. +3
    -3
      neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_maintenance.py

+ 3
- 2
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/maintenance.py View File

@@ -397,8 +397,9 @@ class DBInconsistenciesPeriodics(SchemaAwarePeriodicsBase):

def _create_lrouter_port(self, context, port):
router_id = port['device_id']
self._ovn_client._l3_plugin.add_router_interface(
context, router_id, {'port_id': port['id']})
iface_info = self._ovn_client._l3_plugin._add_neutron_router_interface(
context, router_id, {'port_id': port['id']}, may_exist=True)
self._ovn_client.create_router_port(context, router_id, iface_info)

def _check_subnet_global_dhcp_opts(self):
inconsistent_subnets = []


+ 3
- 1
neutron/services/ovn_l3/plugin.py View File

@@ -177,12 +177,14 @@ class OVNL3RouterPlugin(service_base.ServicePluginBase,
context, {'router': original_router})

def _add_neutron_router_interface(self, context, router_id,
interface_info):
interface_info, may_exist=False):
try:
router_interface_info = (
super(OVNL3RouterPlugin, self).add_router_interface(
context, router_id, interface_info))
except n_exc.PortInUse:
if not may_exist:
raise
# NOTE(lucasagomes): If the port is already being used it means
# the interface has been created already, let's just fetch it from
# the database. Perhaps the code below should live in Neutron


+ 32
- 0
neutron/tests/unit/extensions/test_l3.py View File

@@ -1457,6 +1457,38 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
exc.HTTPBadRequest.code)
self.assertFalse(plugin.get_ports(context.get_admin_context()))

def test_router_add_interface_dup_port(self):
'''This tests that if multiple routers add one port as their
interfaces. Only the first router's interface would be added
to this port. All the later requests would return exceptions.
'''
with self.router() as r1, self.router() as r2, self.network() as n:
with self.subnet(network=n) as s:
with self.port(subnet=s) as p:
self._router_interface_action('add',
r1['router']['id'],
None,
p['port']['id'])
# mock out the sequential check
plugin = 'neutron.db.l3_db.L3_NAT_dbonly_mixin'
check_p = mock.patch(plugin + '._check_router_port',
port_id=p['port']['id'],
device_id=r2['router']['id'],
return_value=p['port'])
checkport = check_p.start()
# do regular checkport after first skip
checkport.side_effect = check_p.stop()
self._router_interface_action('add',
r2['router']['id'],
None,
p['port']['id'],
exc.HTTPConflict.code)
# clean-up
self._router_interface_action('remove',
r1['router']['id'],
None,
p['port']['id'])

def test_update_router_interface_port_ipv6_subnet_ext_ra(self):
use_cases = [{'msg': 'IPv6 Subnet Modes (none, slaac)',
'ra_mode': None,


+ 3
- 3
neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_maintenance.py View File

@@ -262,9 +262,9 @@ class TestDBInconsistenciesPeriodics(testlib_api.SqlTestCaseLight,
port = {'id': 'port-id',
'device_id': 'router-id'}
self.periodic._create_lrouter_port(self.ctx, port)
l3_mock = self.periodic._ovn_client._l3_plugin
l3_mock.add_router_interface.assert_called_once_with(
self.ctx, port['device_id'], {'port_id': port['id']})
ovn_client_mock = self.periodic._ovn_client
ovn_client_mock.create_router_port.assert_called_once_with(
self.ctx, port['device_id'], mock.ANY)

@mock.patch.object(maintenance.LOG, 'debug')
def test__log_maintenance_inconsistencies(self, mock_log):


Loading…
Cancel
Save