openstack
/
charm-openvswitch-odl
Code Issues Proposed changes

Workaround ODL creating duplicate controller entries in amulet tests.

This commit is contained in:
James Page 2015-12-08 12:19:40 +00:00
parent 1fdb3d691f 89821254ff
commit b6f82f6197
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,5 +1,7 @@
#!/usr/bin/make
PYTHON := /usr/bin/env python
CHARM_DIR := $(pwd)
export CHARM_DIR
lint:
@flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
@ -8,7 +10,7 @@ lint:
test:
@# Bundletester expects unit tests here.
@echo Starting tests...
@echo Starting unit tests...
@$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests
functional_test:

10
tests/basic_deployment.py
View File

@ -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)
)