Skip to content

Commit 23ef72b

Browse files
ralonsohkarelyatin
authored andcommitted
[FT] Randomize OVS test bridges and pre-delete them
Now the test creates random name bridges and, before executing the test, it tries to delete them if exist. Closes-Bug: #2114909 Signed-off-by: Rodolfo Alonso Hernandez <[email protected]> Change-Id: I2bcf6c264dcec4ceaadebf14dbd20cd13750e20f (cherry picked from commit f315b9a)
1 parent e11a326 commit 23ef72b

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

neutron/tests/functional/agent/ovsdb/native/test_connection.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import threading
1717

18+
from oslo_utils import uuidutils
1819
from ovsdbapp import event
1920

2021
from neutron.agent.common import ovs_lib
@@ -52,9 +53,17 @@ def _delete_bridges(self, bridges):
5253
self.ovs.delete_bridge(bridge)
5354

5455
def test_create_bridges(self):
55-
bridges_to_monitor = ['br01', 'br02', 'br03']
56-
bridges_to_create = ['br01', 'br02', 'br03', 'br04', 'br05']
56+
bridges_to_create = [
57+
'br_' + uuidutils.generate_uuid()[:12],
58+
'br_' + uuidutils.generate_uuid()[:12],
59+
'br_' + uuidutils.generate_uuid()[:12],
60+
'br_' + uuidutils.generate_uuid()[:12],
61+
'br_' + uuidutils.generate_uuid()[:12],
62+
]
63+
bridges_to_monitor = bridges_to_create[:3]
5764
self.ovs = ovs_lib.BaseOVS()
65+
self._delete_bridges(bridges_to_create)
66+
5867
self.ovs.ovsdb.idl_monitor.start_bridge_monitor(bridges_to_monitor)
5968
self.addCleanup(self._delete_bridges, bridges_to_create)
6069
event = WaitForBridgesEvent(bridges_to_monitor)

0 commit comments

Comments
 (0)