From 7a15e60dbcc740fa008c48d5afdb6a52ab30e5d1 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Wed, 2 Dec 2015 10:30:35 +0000 Subject: [PATCH] Workaround odl creating duplicate controller entries in amulet tests --- tests/basic_deployment.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 8b25e4c..343f447 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -217,16 +217,18 @@ class OVSODLBasicDeployment(OpenStackAmuletDeployment): msg="Missing bridge {} from gateway unit".format(bridge) ) cmd = 'ovs-vsctl get-controller {}'.format(bridge) - br_controller, _ = self.gateway_sentry.run(cmd) - br_controller = br_controller.strip() - if br_controller != controller_url: + br_controllers, _ = self.gateway_sentry.run(cmd) + # Beware of duplicate entries: + # https://bugs.opendaylight.org/show_bug.cgi?id=960 + br_controllers = list(set(br_controllers.split('\n'))) + if len(br_controllers) != 1 or br_controllers[0] != controller_url: status, _ = self.gateway_sentry.run('ovs-vsctl show') amulet.raise_status( amulet.FAIL, msg="Controller configuration on bridge" " {} incorrect: {} != {}\n" "{}".format(bridge, - br_controller, + br_controllers, controller_url, status) )