Merge lp:~1chb1n/charms/trusty/neutron-gateway/next-amulet-mitaka-1601 into lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next

[Ryan Beisner]

Enable Mitaka amulet tests. Wait for unit status instead of sleeping. Update test (failing after last wk's quantum->nova move).

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

charm_lint_check #17458 neutron-gateway-next for 1chb1n mp282836
    LINT OK: passed

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

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

charm_unit_test #16310 neutron-gateway-next for 1chb1n mp282836
    UNIT OK: passed

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

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

charm_amulet_test #8820 neutron-gateway-next for 1chb1n mp282836
    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/14515289/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8820/

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

charm_lint_check #17687 neutron-gateway-next for 1chb1n mp282836
    LINT OK: passed

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

[lp:~1chb1n/charms/trusty/neutron-gateway/next-amulet-mitaka-1601]

162. By Ryan Beisner on 2016-01-20

rebase

163. By Ryan Beisner on 2016-01-20

update test for neutron catalog names (lp1535410)

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

charm_lint_check #17785 neutron-gateway-next for 1chb1n mp282836
    LINT OK: passed

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

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

charm_amulet_test #8918 neutron-gateway-next for 1chb1n mp282836
    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/14586969/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8918/

[lp:~1chb1n/charms/trusty/neutron-gateway/next-amulet-mitaka-1601]

164. By Ryan Beisner on 2016-01-22

really wait for unit status instead of sleeping before amulet tests

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

charm_lint_check #17933 neutron-gateway-next for 1chb1n mp282836
    LINT OK: passed

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

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

charm_unit_test #16758 neutron-gateway-next for 1chb1n mp282836
    UNIT OK: passed

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

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

charm_amulet_test #8951 neutron-gateway-next for 1chb1n mp282836
    AMULET OK: passed

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

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

charm_amulet_test #8956 neutron-gateway-next for 1chb1n mp282836
    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/14596474/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8956/

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

charm_amulet_test #8962 neutron-gateway-next for 1chb1n mp282836
    AMULET OK: passed

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

[Ryan Beisner (1chb1n)]

#8956 failure was an undercloud timeout.

[David Ames (thedac)]

Looks good. Merging.

review: Approve

=== modified file 'tests/019-basic-trusty-mitaka' (properties changed: -x to +x)
=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-10-20 08:50:45 +0000
+++ tests/basic_deployment.py	2016-01-22 04:36:56 +0000
@@ -1,6 +1,5 @@
 import amulet
 import os
-import time
 import yaml
 
 from neutronclient.v2_0 import client as neutronclient
@@ -32,6 +31,11 @@
         self._add_relations()
         self._configure_services()
         self._deploy()
+
+        u.log.info('Waiting on extended status checks...')
+        exclude_services = ['mysql']
+        self._auto_wait_for_status(exclude_services=exclude_services)
+
         self._initialize_tests()
 
     def _add_services(self):
@@ -154,9 +158,6 @@
         self.neutron_gateway_sentry = self.d.sentry.unit['neutron-gateway/0']
         self.neutron_api_sentry = self.d.sentry.unit['neutron-api/0']
 
-        # Let things settle a bit before moving forward
-        time.sleep(30)
-
         # Authenticate admin with keystone
         self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
                                                       user='admin',
@@ -253,7 +254,7 @@
              'tenantId': u.not_null,
              'id': u.not_null,
              'email': 'juju@localhost'},
-            {'name': 'quantum',
+            {'name': 'neutron',
              'enabled': True,
              'tenantId': u.not_null,
              'id': u.not_null,
@@ -485,11 +486,11 @@
         api_endpoint = 'http://{}:9696'.format(api_ip)
         expected = {
             'private-address': u.valid_ip,
-            'quantum_region': 'RegionOne',
-            'quantum_service': 'quantum',
-            'quantum_admin_url': api_endpoint,
-            'quantum_internal_url': api_endpoint,
-            'quantum_public_url': api_endpoint,
+            'neutron_region': 'RegionOne',
+            'neutron_service': 'neutron',
+            'neutron_admin_url': api_endpoint,
+            'neutron_internal_url': api_endpoint,
+            'neutron_public_url': api_endpoint,
         }
 
         ret = u.validate_relation_data(unit, relation, expected)