openstack/charm-neutron-api
Code Issues Proposed changes

rename quantum to neutron in amulet tests

Browse Source
This commit is contained in:
Ryan Beisner 2015-07-29 17:23:43 +00:00
parent 4e41fcb505
commit fdaa26dfe9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/basic_deployment.py
View File

@ -81,7 +81,7 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
{'name': 'rabbitmq-server'}, {'name': 'keystone'}, {'name': 'rabbitmq-server'}, {'name': 'keystone'},
{'name': 'neutron-openvswitch'}, {'name': 'neutron-openvswitch'},
{'name': 'nova-cloud-controller'}, {'name': 'nova-cloud-controller'},
{'name': 'quantum-gateway'}, {'name': 'neutron-gateway'},
{'name': 'nova-compute'}] {'name': 'nova-compute'}]
super(NeutronAPIBasicDeployment, self)._add_services(this_service, super(NeutronAPIBasicDeployment, self)._add_services(this_service,
other_services) other_services)
@ -92,7 +92,7 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
'neutron-api:shared-db': 'mysql:shared-db', 'neutron-api:shared-db': 'mysql:shared-db',
'neutron-api:amqp': 'rabbitmq-server:amqp', 'neutron-api:amqp': 'rabbitmq-server:amqp',
'neutron-api:neutron-api': 'nova-cloud-controller:neutron-api', '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-plugin-api',
'neutron-api:neutron-plugin-api': 'neutron-openvswitch:' 'neutron-api:neutron-plugin-api': 'neutron-openvswitch:'
'neutron-plugin-api', 'neutron-plugin-api',
@ -171,7 +171,7 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
self.keystone_sentry = self.d.sentry.unit['keystone/0'] self.keystone_sentry = self.d.sentry.unit['keystone/0']
self.rabbitmq_sentry = self.d.sentry.unit['rabbitmq-server/0'] self.rabbitmq_sentry = self.d.sentry.unit['rabbitmq-server/0']
self.nova_cc_sentry = self.d.sentry.unit['nova-cloud-controller/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.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 release val: {}'.format( u.log.debug('openstack release val: {}'.format(
@ -212,7 +212,7 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
self.mysql_sentry: ['status mysql'], self.mysql_sentry: ['status mysql'],
self.keystone_sentry: ['status keystone'], self.keystone_sentry: ['status keystone'],
self.nova_cc_sentry: nova_cc_services, 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, self.neutron_api_sentry: neutron_api_services,
} }