Merge lp:~1chb1n/charms/trusty/neutron-api/next1507-amulet-cleanup into lp:~openstack-charmers-archive/charms/trusty/neutron-api/next

[Ryan Beisner]

Consume the neutron-gateway/next charm instead of q-g/next in amulet tests; Remove unsupported releases from amulet tests.

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

charm_lint_check #7182 neutron-api-next for 1chb1n mp266279
    LINT OK: passed

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

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

charm_unit_test #6646 neutron-api-next for 1chb1n mp266279
    UNIT OK: passed

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

[Billy Olsen (billy-olsen)]

LGTM. Approved.

review: Approve

=== removed file 'tests/018-basic-utopic-juno'
--- tests/018-basic-utopic-juno	2015-04-16 21:36:14 +0000
+++ tests/018-basic-utopic-juno	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#!/usr/bin/python
-
-"""Amulet tests on a basic neutron-api deployment on utopic-juno."""
-
-from basic_deployment import NeutronAPIBasicDeployment
-
-if __name__ == '__main__':
-    deployment = NeutronAPIBasicDeployment(series='utopic')
-    deployment.run_tests()

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-07-13 16:07:29 +0000
+++ tests/basic_deployment.py	2015-07-29 17:35:12 +0000
@@ -81,7 +81,7 @@
                           {'name': 'rabbitmq-server'}, {'name': 'keystone'},
                           {'name': 'neutron-openvswitch'},
                           {'name': 'nova-cloud-controller'},
-                          {'name': 'quantum-gateway'},
+                          {'name': 'neutron-gateway'},
                           {'name': 'nova-compute'}]
         super(NeutronAPIBasicDeployment, self)._add_services(this_service,
                                                              other_services)
@@ -92,7 +92,7 @@
             'neutron-api:shared-db': 'mysql:shared-db',
             'neutron-api:amqp': 'rabbitmq-server:amqp',
             'neutron-api:neutron-api': 'nova-cloud-controller:neutron-api',
-            'neutron-api:neutron-plugin-api': 'quantum-gateway:'
+            'neutron-api:neutron-plugin-api': 'neutron-gateway:'
                                               'neutron-plugin-api',
             'neutron-api:neutron-plugin-api': 'neutron-openvswitch:'
                                               'neutron-plugin-api',
@@ -171,7 +171,7 @@
         self.keystone_sentry = self.d.sentry.unit['keystone/0']
         self.rabbitmq_sentry = self.d.sentry.unit['rabbitmq-server/0']
         self.nova_cc_sentry = self.d.sentry.unit['nova-cloud-controller/0']
-        self.quantum_gateway_sentry = self.d.sentry.unit['quantum-gateway/0']
+        self.neutron_gateway_sentry = self.d.sentry.unit['neutron-gateway/0']
         self.neutron_api_sentry = self.d.sentry.unit['neutron-api/0']
         self.nova_compute_sentry = self.d.sentry.unit['nova-compute/0']
         u.log.debug('openstack release val: {}'.format(
@@ -212,7 +212,7 @@
             self.mysql_sentry: ['status mysql'],
             self.keystone_sentry: ['status keystone'],
             self.nova_cc_sentry: nova_cc_services,
-            self.quantum_gateway_sentry: neutron_services,
+            self.neutron_gateway_sentry: neutron_services,
             self.neutron_api_sentry: neutron_api_services,
         }