openstack
/
neutron
Code Issues Proposed changes

Add debugging exception messages in ``test_ovs_and_ovs_events`` 

This patch also changes the ``fake_ovn_agent_extension`` events to
catch both create and update events.

Closes-Bug: #2006612
Change-Id: I7229be21f392a08fb3ee3313b3cd8ab413fcde7e
This commit is contained in:
Rodolfo Alonso Hernandez 2023-02-08 16:42:40 +01:00
parent f8121ee981
commit 24152f2019
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
neutron/tests/functional/agent/ovn/agent/fake_ovn_agent_extension.py
View File

@ -22,34 +22,34 @@ class OVSInterfaceEvent(row_event.RowEvent):
def __init__(self, ovn_agent):
self.ovn_agent = ovn_agent
events = (self.ROW_CREATE, )
events = (self.ROW_CREATE, self.ROW_UPDATE)
table = 'Interface'
super().__init__(events, table, None)
def run(self, event, row, old):
self.ovn_agent.test_ovs_idl = row.name
self.ovn_agent.test_ovs_idl.append(row.name)
class OVNSBChassisEvent(row_event.RowEvent):
def __init__(self, ovn_agent):
self.ovn_agent = ovn_agent
events = (self.ROW_CREATE, )
events = (self.ROW_CREATE, self.ROW_UPDATE)
table = 'Chassis'
super().__init__(events, table, None)
def run(self, event, row, old):
self.ovn_agent.test_ovn_sb_idl = row.name
self.ovn_agent.test_ovn_sb_idl.append(row.name)
class OVNNBLogicalSwitchEvent(row_event.RowEvent):
def __init__(self, ovn_agent):
self.ovn_agent = ovn_agent
events = (self.ROW_CREATE, )
events = (self.ROW_CREATE, self.ROW_UPDATE)
table = 'Logical_Switch'
super().__init__(events, table, None)
def run(self, event, row, old):
self.ovn_agent.test_ovn_nb_idl = row.name
self.ovn_agent.test_ovn_nb_idl.append(row.name)
class FakeOVNAgentExtension(ext_mgr.OVNAgentExtension):

24
neutron/tests/functional/agent/ovn/agent/test_ovn_neutron_agent.py
View File

@ -43,11 +43,18 @@ class TestOVNNeutronAgent(base.TestOVNFunctionalBase):
conf.set_override('ovn_nb_connection', ovn_nb_db, group='ovn')
ovn_sb_db = self.ovsdb_server_mgr.get_ovsdb_connection_path('sb')
conf.set_override('ovn_sb_connection', ovn_sb_db, group='ovn')
self.chassis_name = self.add_fake_chassis(self.FAKE_CHASSIS_HOST)
self.chassis_name = uuidutils.generate_uuid()
self.mock_chassis_name.return_value = self.chassis_name
agt = ovn_neutron_agent.OVNNeutronAgent(conf)
agt.test_ovs_idl = []
agt.test_ovn_sb_idl = []
agt.test_ovn_nb_idl = []
agt.start()
self.add_fake_chassis(self.FAKE_CHASSIS_HOST, name=self.chassis_name)
self.addCleanup(agt.ext_manager_api.ovs_idl.ovsdb_connection.stop)
if agt.ext_manager_api.sb_idl:
self.addCleanup(agt.ext_manager_api.sb_idl.ovsdb_connection.stop)
@ -58,20 +65,25 @@ class TestOVNNeutronAgent(base.TestOVNFunctionalBase):
def test_ovs_and_ovs_events(self):
# Test the OVS IDL is attending the provided events.
bridge = self.useFixture(net_helpers.OVSBridgeFixture()).bridge
exc = Exception('Bridge %s not added or not detected by '
'OVSInterfaceEvent' % bridge)
n_utils.wait_until_true(
lambda: bridge.br_name == self.ovn_agent.test_ovs_idl,
timeout=10)
lambda: bridge.br_name in self.ovn_agent.test_ovs_idl,
timeout=10, exception=exc)
# Test the OVN SB IDL is attending the provided events. The chassis is
# created before the OVN SB IDL connection is created but the creation
# event is received during the subscription.
exc = Exception('Chassis %s not added or not detected by '
'OVNSBChassisEvent' % self.chassis_name)
n_utils.wait_until_true(
lambda: self.chassis_name == self.ovn_agent.test_ovn_sb_idl,
timeout=10)
lambda: self.chassis_name in self.ovn_agent.test_ovn_sb_idl,
timeout=10, exception=exc)
# Test the OVN SN IDL is attending the provided events.
lswitch_name = 'ovn-' + uuidutils.generate_uuid()
self.nb_api.ls_add(lswitch_name).execute(check_error=True)
exc = Exception('Logical Switch %s not added or not detected by ')
n_utils.wait_until_true(
lambda: lswitch_name == self.ovn_agent.test_ovn_nb_idl,
lambda: lswitch_name in self.ovn_agent.test_ovn_nb_idl,
timeout=10)