openstack
/
charm-neutron-api
Code Issues Proposed changes

Tidy lint

This commit is contained in:
James Page 2014-06-27 13:57:36 +01:00
parent b082dcf12f
commit 71cf2bff11
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hooks/neutron_api_hooks.py
View File

@ -158,21 +158,20 @@ def identity_joined(rid=None):
unit_get('public-address')
)),
api_port('neutron-server'))
admin_url = '{}:{}'.format(canonical_url(CONFIGS,
address=get_address_in_network(
config('os-admin-network'),
unit_get('private-address')
)),
config('os-admin-network'),
unit_get('private-address')
)),
api_port('neutron-server'))
internal_url = '{}:{}'.format(canonical_url(CONFIGS,
address=get_address_in_network(
config('os-internal-network'),
unit_get('private-address')
)),
api_port('neutron-server'))
internal_url = '{}:{}'.format(
canonical_url(CONFIGS,
address=get_address_in_network(
config('os-internal-network'),
unit_get('private-address')
)),
api_port('neutron-server')
)
endpoints = {
'quantum_service': 'quantum',
'quantum_region': config('region'),

2
unit_tests/test_neutron_api_hooks.py
View File

@ -171,7 +171,7 @@ class NeutronAPIHooksTests(CharmTestCase):
def test_identity_joined(self):
self.canonical_url.return_value = 'http://127.0.0.1'
self.api_port.return_value = '9696'
self.test_config.set('region','region1')
self.test_config.set('region', 'region1')
_neutron_url = 'http://127.0.0.1:9696'
_endpoints = {
'quantum_service': 'quantum',