openstack/charm-neutron-api
Code Issues Proposed changes

amulet test - only check for neutron-vpn-agent <= trusty_juno; add openstack release version announce when in debug.

Browse Source
This commit is contained in:
Ryan Beisner 2015-04-19 03:50:13 +00:00
parent 10cd59bd7e
commit 765e894a08
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/basic_deployment.py
View File

@ -106,6 +106,7 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
self.quantum_gateway_sentry = self.d.sentry.unit['quantum-gateway/0'] self.quantum_gateway_sentry = self.d.sentry.unit['quantum-gateway/0']
self.neutron_api_sentry = self.d.sentry.unit['neutron-api/0'] self.neutron_api_sentry = self.d.sentry.unit['neutron-api/0']
self.nova_compute_sentry = self.d.sentry.unit['nova-compute/0'] self.nova_compute_sentry = self.d.sentry.unit['nova-compute/0']
u.log.debug('openstack rel: {}'.format(self._get_openstack_release()))
def test_neutron_api_shared_db_relation(self): def test_neutron_api_shared_db_relation(self):
"""Verify the neutron-api to mysql shared-db relation data""" """Verify the neutron-api to mysql shared-db relation data"""
@ -382,10 +383,12 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
'status neutron-lbaas-agent', 'status neutron-lbaas-agent',
'status neutron-metadata-agent', 'status neutron-metadata-agent',
'status neutron-plugin-openvswitch-agent', 'status neutron-plugin-openvswitch-agent',
'status neutron-vpn-agent',
'status neutron-metering-agent', 'status neutron-metering-agent',
'status neutron-ovs-cleanup'] 'status neutron-ovs-cleanup']
if self._get_openstack_release() <= self.trusty_juno:
neutron_services.append('status neutron-vpn-agent')
nova_cc_services = ['status nova-api-ec2', nova_cc_services = ['status nova-api-ec2',
'status nova-api-os-compute', 'status nova-api-os-compute',
'status nova-objectstore', 'status nova-objectstore',