openstack
/
ovsdbapp
Code Issues Proposed changes

Merge "Use "api.lookup" to search for a "Logical_Switch""

This commit is contained in:
Zuul 2022-01-14 18:08:04 +00:00 committed by Gerrit Code Review
parent 2c6b6c9c8e 6fdacf8528
commit 08dab4465d
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ovsdbapp/schema/ovn_northbound/commands.py
View File

@ -410,8 +410,7 @@ class QoSDelExtIdCommand(cmd.BaseCommand):
def run_idl(self, txn):
try:
lswitch = idlutils.row_by_value(self.api.idl, 'Logical_Switch',
'name', self.lswitch)
lswitch = self.api.lookup('Logical_Switch', self.lswitch)
except idlutils.RowNotFound as e:
if self.if_exists:
return

11
ovsdbapp/tests/functional/schema/ovn_northbound/test_impl_idl.py
View File

@ -349,7 +349,7 @@ class TestQoSOps(OvnNorthboundTest):
def setUp(self):
super(TestQoSOps, self).setUp()
self.switch = self.useFixture(
fixtures.LogicalSwitchFixture(self.api)).obj
fixtures.LogicalSwitchFixture(self.api, name='LS_for_QoS')).obj
def _qos_add(self, *args, **kwargs):
cmd = self.api.qos_add(self.switch.uuid, *args, **kwargs)
@ -463,6 +463,9 @@ class TestQoSOps(OvnNorthboundTest):
dscp=10)
def test_qos_delete_external_ids(self):
# NOTE(ralonsoh): the deletion method uses the LS name (first) and the
# UUID (second), in order to check that api.lookup() is working with
# both.
self._create_fip_qoses()
self.api.qos_del_ext_ids(self.switch.name,
{'key1': 'value1'}).execute(check_error=True)
@ -471,7 +474,7 @@ class TestQoSOps(OvnNorthboundTest):
self.assertCountEqual([self.qos_2, self.qos_3], qos_rules)
self.api.qos_del_ext_ids(
self.switch.name,
self.switch.uuid,
{'key3': 'value3', 'key4': 'value4'}).execute(check_error=True)
qos_rules = self.api.qos_list(
self.switch.uuid).execute(check_error=True)
@ -485,14 +488,14 @@ class TestQoSOps(OvnNorthboundTest):
self.switch.uuid).execute(check_error=True)
self.assertCountEqual([self.qos_1, self.qos_2, self.qos_3], qos_rules)
self.api.qos_del_ext_ids(self.switch.name,
self.api.qos_del_ext_ids(self.switch.uuid,
{'key1': 'value_z'}).execute(check_error=True)
qos_rules = self.api.qos_list(
self.switch.uuid).execute(check_error=True)
self.assertCountEqual([self.qos_1, self.qos_2, self.qos_3], qos_rules)
self.api.qos_del_ext_ids(
self.switch.name,
self.switch.uuid,
{'key3': 'value3', 'key4': 'value_z'}).execute(check_error=True)
qos_rules = self.api.qos_list(
self.switch.uuid).execute(check_error=True)