Merge lp:~gnuoy/charms/trusty/neutron-gateway/lp1506046 into lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next

[Liam Young]

[lp:~gnuoy/charms/trusty/neutron-gateway/lp1506046]

153. By Liam Young on 2015-10-14

Remove debug comment

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

charm_lint_check #11897 neutron-gateway-next for gnuoy mp274417
    LINT OK: passed

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

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

charm_unit_test #11064 neutron-gateway-next for gnuoy mp274417
    UNIT OK: passed

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

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

charm_amulet_test #7337 neutron-gateway-next for gnuoy mp274417
    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/12782562/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7337/

[Ryan Beisner (1chb1n)]

Hi @gnuoy

FYI re: amulet fail

This is failure message is indicative of tests executing before the deployment, hooks and relations were really ready:

00:17:08.897 unexpected relation data in mysql shared-db - allowed_units:neutron-api/0

I have a WIP helper to leverage extended status messages to confirm readiness before amulet tests proceed ... which I will be working like mad to squeeze into the next charm tests before the 15.10 push.

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

charm_amulet_test #7373 neutron-gateway-next for gnuoy mp274417
    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/12796301/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7373/

[lp:~gnuoy/charms/trusty/neutron-gateway/lp1506046]

154. By Liam Young on 2015-10-19

Reuqest new test run from osci

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

charm_lint_check #12156 neutron-gateway-next for gnuoy mp274417
    LINT OK: passed

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

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

charm_unit_test #11286 neutron-gateway-next for gnuoy mp274417
    UNIT OK: passed

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

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

charm_amulet_test #7425 neutron-gateway-next for gnuoy mp274417
    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/12858196/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7425/

[lp:~gnuoy/charms/trusty/neutron-gateway/lp1506046]

155. By Liam Young on 2015-10-19

Fix unrelated amulet test

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

charm_lint_check #12157 neutron-gateway-next for gnuoy mp274417
    LINT OK: passed

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

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

charm_unit_test #11288 neutron-gateway-next for gnuoy mp274417
    UNIT OK: passed

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

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

charm_amulet_test #7427 neutron-gateway-next for gnuoy mp274417
    AMULET OK: passed

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

[James Page (james-page)]

review: Approve

=== modified file 'hooks/neutron_utils.py'
--- hooks/neutron_utils.py	2015-10-08 19:12:34 +0000
+++ hooks/neutron_utils.py	2015-10-19 09:32:22 +0000
@@ -747,6 +747,7 @@
                 fatal=True, dist=True)
     apt_install(get_early_packages(), fatal=True)
     apt_install(get_packages(), fatal=True)
+    configs.set_release(openstack_release=new_os_rel)
     configs.write_all()
 
 

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-10-01 23:12:00 +0000
+++ tests/basic_deployment.py	2015-10-19 09:32:22 +0000
@@ -421,20 +421,19 @@
         expected = {
             'db_host': u.valid_ip,
             'private-address': u.valid_ip,
-            'password': u.not_null
+            'password': u.not_null,
+            'allowed_units': u.not_null,
         }
 
-        if self._get_openstack_release() == self.precise_icehouse:
-            # Precise
-            expected['allowed_units'] = 'nova-cloud-controller/0 neutron-api/0'
-        else:
-            # Not Precise
-            expected['allowed_units'] = 'neutron-api/0'
-
         ret = u.validate_relation_data(unit, relation, expected)
         if ret:
             message = u.relation_error('mysql shared-db', ret)
             amulet.raise_status(amulet.FAIL, msg=message)
+        relation_data = unit.relation(relation[0], relation[1])
+        allowed_units = relation_data['allowed_units'].split()
+        if 'neutron-api/0' not in allowed_units:
+            message = 'neutron-api/0 not found in allowed_units'
+            amulet.raise_status(amulet.FAIL, msg=message)
 
     def test_208_neutron_api_amqp_relation(self):
         """Verify the neutron-api to rabbitmq-server amqp relation data"""