Merge lp:~thedac/charms/trusty/neutron-api/neutron-openvswitch-agent into lp:~openstack-charmers-archive/charms/trusty/neutron-api/next

[David Ames]

Mitaka renamed neutron-plugin-openvswitch-agent to neutron-openvswitch-agent
Update amulet test to reflect this.

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

charm_lint_check #1554 neutron-api-next for thedac mp287355
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1554/

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

charm_unit_test #1302 neutron-api-next for thedac mp287355
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1302/

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

charm_amulet_test #551 neutron-api-next for thedac mp287355
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/551/

[James Page (james-page)]

review: Approve

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2016-02-25 11:25:32 +0000
+++ tests/basic_deployment.py	2016-02-26 19:12:32 +0000
@@ -177,11 +177,18 @@
            service units."""
         u.log.debug('Checking status of system services...')
         neutron_api_services = ['neutron-server']
-        neutron_services = ['neutron-dhcp-agent',
-                            'neutron-lbaas-agent',
-                            'neutron-metadata-agent',
-                            'neutron-plugin-openvswitch-agent',
-                            'neutron-ovs-cleanup']
+        if self._get_openstack_release() >= self.trusty_mitaka:
+            neutron_services = ['neutron-dhcp-agent',
+                                'neutron-lbaas-agent',
+                                'neutron-metadata-agent',
+                                'neutron-openvswitch-agent',
+                                'neutron-ovs-cleanup']
+        else:
+            neutron_services = ['neutron-dhcp-agent',
+                                'neutron-lbaas-agent',
+                                'neutron-metadata-agent',
+                                'neutron-plugin-openvswitch-agent',
+                                'neutron-ovs-cleanup']
 
         if self._get_openstack_release() <= self.trusty_juno:
             neutron_services.append('neutron-vpn-agent')