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

Proposed by David Ames
Status: Merged
Merged at revision: 180
Proposed branch: lp:~thedac/charms/trusty/neutron-api/neutron-openvswitch-agent
Merge into: lp:~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 27 lines (+12/-5)
1 file modified
tests/basic_deployment.py (+12/-5)
To merge this branch: bzr merge lp:~thedac/charms/trusty/neutron-api/neutron-openvswitch-agent
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+287355@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/basic_deployment.py'
2--- tests/basic_deployment.py 2016-02-25 11:25:32 +0000
3+++ tests/basic_deployment.py 2016-02-26 19:12:32 +0000
4@@ -177,11 +177,18 @@
5 service units."""
6 u.log.debug('Checking status of system services...')
7 neutron_api_services = ['neutron-server']
8- neutron_services = ['neutron-dhcp-agent',
9- 'neutron-lbaas-agent',
10- 'neutron-metadata-agent',
11- 'neutron-plugin-openvswitch-agent',
12- 'neutron-ovs-cleanup']
13+ if self._get_openstack_release() >= self.trusty_mitaka:
14+ neutron_services = ['neutron-dhcp-agent',
15+ 'neutron-lbaas-agent',
16+ 'neutron-metadata-agent',
17+ 'neutron-openvswitch-agent',
18+ 'neutron-ovs-cleanup']
19+ else:
20+ neutron_services = ['neutron-dhcp-agent',
21+ 'neutron-lbaas-agent',
22+ 'neutron-metadata-agent',
23+ 'neutron-plugin-openvswitch-agent',
24+ 'neutron-ovs-cleanup']
25
26 if self._get_openstack_release() <= self.trusty_juno:
27 neutron_services.append('neutron-vpn-agent')

Subscribers

People subscribed via source and target branches