Merge lp:~gnuoy/charms/trusty/openvswitch-odl/duplicate-controllers into lp:~openstack-charmers-archive/charms/trusty/openvswitch-odl/next

[Liam Young]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #14752 openvswitch-odl-next for gnuoy mp279251
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/14752/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #13755 openvswitch-odl-next for gnuoy mp279251
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full unit test output: http://paste.ubuntu.com/13620528/
Build: http://10.245.162.77:8080/job/charm_unit_test/13755/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8072 openvswitch-odl-next for gnuoy mp279251
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/13620761/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8072/

[lp:~gnuoy/charms/trusty/openvswitch-odl/duplicate-controllers]

8. By Liam Young on 2015-12-04

Use tox for lint and unit test targets in Makefile

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #14874 openvswitch-odl-next for gnuoy mp279251
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 127
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/13665191/
Build: http://10.245.162.77:8080/job/charm_lint_check/14874/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #13871 openvswitch-odl-next for gnuoy mp279251
    UNIT FAIL: unit-test missing

UNIT Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full unit test output: http://paste.ubuntu.com/13665192/
Build: http://10.245.162.77:8080/job/charm_unit_test/13871/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8143 openvswitch-odl-next for gnuoy mp279251
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8143/

[lp:~gnuoy/charms/trusty/openvswitch-odl/duplicate-controllers]

9. By Liam Young on 2015-12-07

Tox is not available on osci atm so revert to using old method with CHARM_DIR set

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #15038 openvswitch-odl-next for gnuoy mp279251
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/15038/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #14026 openvswitch-odl-next for gnuoy mp279251
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/14026/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8201 openvswitch-odl-next for gnuoy mp279251
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8201/

=== modified file 'Makefile'
--- Makefile	2015-11-16 08:33:32 +0000
+++ Makefile	2015-12-07 07:37:57 +0000
@@ -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 @@
 
 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:

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-11-12 19:17:39 +0000
+++ tests/basic_deployment.py	2015-12-07 07:37:57 +0000
@@ -217,16 +217,18 @@
                     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)
                 )