openstack/charm-neutron-openvswitch
Code Issues Proposed changes

Update amulet tests for mitaka

Browse Source
This commit is contained in:
James Page 2016-02-23 14:38:10 +00:00
parent fb8c6021b3
commit b2354bca25
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/basic_deployment.py
View File

@ -9,7 +9,7 @@ from charmhelpers.contrib.openstack.amulet.deployment import (
OpenStackAmuletDeployment OpenStackAmuletDeployment
) )
# This file needs de-linted. The (mis)use of n-o q-a below causes all lint # This file needs de-linted. The (mis)use of n-o q-a below causes all lint
# to go undetected. Remove that & fixme. # to go undetected. Remove that & fixme.
from charmhelpers.contrib.openstack.amulet.utils import ( from charmhelpers.contrib.openstack.amulet.utils import (
OpenStackAmuletUtils, OpenStackAmuletUtils,
@ -67,7 +67,7 @@ class NeutronOVSBasicDeployment(OpenStackAmuletDeployment):
def _add_relations(self): def _add_relations(self):
"""Add all of the relations for the services.""" """Add all of the relations for the services."""
relations = { relations = {
'neutron-openvswitch:amqp': 'rabbitmq-server:amqp', 'neutron-openvswitch:amqp': 'rabbitmq-server:amqp',
'neutron-openvswitch:neutron-plugin': 'neutron-openvswitch:neutron-plugin':
'nova-compute:neutron-plugin', 'nova-compute:neutron-plugin',
'neutron-openvswitch:neutron-plugin-api': 'neutron-openvswitch:neutron-plugin-api':
@ -160,6 +160,12 @@ class NeutronOVSBasicDeployment(OpenStackAmuletDeployment):
self.neutron_api_sentry: ['neutron-server'], self.neutron_api_sentry: ['neutron-server'],
} }
if self._get_openstack_release() >= self.trusty_mitaka:
services[self.compute_sentry] = [
'nova-compute',
'neutron-openvswitch-agent'
]
ret = u.validate_services_by_name(services) ret = u.validate_services_by_name(services)
if ret: if ret:
amulet.raise_status(amulet.FAIL, msg=ret) amulet.raise_status(amulet.FAIL, msg=ret)
@ -218,7 +224,10 @@ class NeutronOVSBasicDeployment(OpenStackAmuletDeployment):
# Needs love - test actions not clear in log # Needs love - test actions not clear in log
unit = self.compute_sentry unit = self.compute_sentry
conf = "/etc/neutron/plugins/ml2/ml2_conf.ini" if self._get_openstack_release() >= self.trusty_mitaka:
conf = "/etc/neutron/plugins/ml2/openvswitch_agent.ini"
else:
conf = "/etc/neutron/plugins/ml2/ml2_conf.ini"
for value in vpair: for value in vpair:
self.d.configure(service, {charm_key: value}) self.d.configure(service, {charm_key: value})
time.sleep(60) time.sleep(60)
@ -253,7 +262,10 @@ class NeutronOVSBasicDeployment(OpenStackAmuletDeployment):
# Needs love - not idempotent # Needs love - not idempotent
unit = self.compute_sentry unit = self.compute_sentry
conf = "/etc/neutron/plugins/ml2/ml2_conf.ini" if self._get_openstack_release() >= self.trusty_mitaka:
conf = "/etc/neutron/plugins/ml2/openvswitch_agent.ini"
else:
conf = "/etc/neutron/plugins/ml2/ml2_conf.ini"
self.d.configure('neutron-api', {'neutron-security-groups': 'True'}) self.d.configure('neutron-api', {'neutron-security-groups': 'True'})
self.d.configure('neutron-openvswitch', self.d.configure('neutron-openvswitch',
{'disable-security-groups': 'True'}) {'disable-security-groups': 'True'})