Merge "Randomize port name in "BaseOVSTestCase"" into stable/victoria

This commit is contained in:
Zuul 2021-01-15 08:20:18 +00:00 committed by Gerrit Code Review
commit 337779de2e
1 changed files with 5 additions and 4 deletions

View File

@ -110,7 +110,8 @@ class BaseOVSTestCase(base.BaseSudoTestCase):
self.elements_to_clean['bridges'].append(self.br_name)
def _create_port(self, port_name):
self.ovs.ovsdb.add_port(self.br_name, port_name).execute()
self.ovs.ovsdb.add_port(self.br_name, port_name).execute(
check_error=True)
def _find_port_uuid(self, port_name):
return self.ovs.ovsdb.db_get('Port', port_name, '_uuid').execute()
@ -283,7 +284,7 @@ class BaseOVSTestCase(base.BaseSudoTestCase):
self._check_value((qos_id, queues), self.ovs._find_qos)
def test__set_port_qos(self):
port_name = 'test_port'
port_name = ('port-' + uuidutils.generate_uuid())[:8]
self._create_bridge()
self._create_port(port_name)
self._check_value([], self._find_port_qos, port_name)
@ -325,7 +326,7 @@ class BaseOVSTestCase(base.BaseSudoTestCase):
self.assertNotIn(expected, flows)
def test_update_minimum_bandwidth_queue(self):
port_name = 'test_output_port_1'
port_name = ('port-' + uuidutils.generate_uuid())[:8]
self._create_bridge()
self._create_port(port_name)
queue_num = 1
@ -348,7 +349,7 @@ class BaseOVSTestCase(base.BaseSudoTestCase):
self._check_value(expected, self._list_queues, queue_id)
def test_update_minimum_bandwidth_queue_no_qos_no_queue(self):
port_name = 'test_output_port_2'
port_name = ('port-' + uuidutils.generate_uuid())[:8]
self._create_bridge()
self._create_port(port_name)
queue_num = 1