Juju Charms Collection
neutron-gateway package

Merge lp:~1chb1n/charms/trusty/neutron-gateway/next-amulet-update-rename into lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next

  1. Trusty Tahr (14.04)
  2. next-amulet-update-rename
  3. Merge into next
Proposed by Ryan Beisner on 2015-06-25
Status: Merged
Merged at revision: 120
Proposed branch: lp:~1chb1n/charms/trusty/neutron-gateway/next-amulet-update-rename
Merge into: lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next
Diff against target: 566 lines (+89/-92)
11 files modified
Makefile (+8/-9)
metadata.yaml (+1/-1)
tests/014-basic-precise-icehouse (+2/-2)
tests/015-basic-trusty-icehouse (+2/-2)
tests/016-basic-trusty-juno (+2/-2)
tests/017-basic-trusty-kilo (+2/-2)
tests/018-basic-utopic-juno (+2/-2)
tests/019-basic-vivid-kilo (+2/-2)
tests/050-basic-trusty-icehouse-git (+2/-2)
tests/051-basic-trusty-juno-git (+2/-2)
tests/basic_deployment.py (+64/-66)
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/neutron-gateway/next-amulet-update-rename
Reviewer Review Type Date Requested Status
Corey Bryant 2015-06-25 Approve on 2015-06-25
Review via email: mp+263006@code.launchpad.net

Description of the Change

Update amulet tests re: quantum-gateway rename

To post a comment you must log in.
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #5603 neutron-gateway-next for 1chb1n mp263006
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/5603/

uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #5235 neutron-gateway-next for 1chb1n mp263006
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/5235/

uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #4772 neutron-gateway-next for 1chb1n mp263006
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/11774449/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4772/

lp:~1chb1n/charms/trusty/neutron-gateway/next-amulet-update-rename updated on 2015-06-25
120. By Ryan Beisner on 2015-06-25

update amulet test re: quantum-gateway rename

uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #5604 neutron-gateway-next for 1chb1n mp263006
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/5604/

uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #5236 neutron-gateway-next for 1chb1n mp263006
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/5236/

uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #4773 neutron-gateway-next for 1chb1n mp263006
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/4773/

uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #4776 neutron-gateway-next for 1chb1n mp263006
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/4776/

Corey Bryant (corey.bryant) wrote :

Hi Ryan, one comment below.

Corey Bryant (corey.bryant) wrote :

Nevermind the comment, not an issue. Looks good!

review: Approve
Ryan Beisner (1chb1n) wrote :

AFAICT, the oldest supported release (precise-icehouse) has python-neutronclient in the cloud archive, looking at: http://ubuntu-cloud.archive.canonical.com/ubuntu/dists/precise-updates/icehouse/main/binary-amd64/Packages

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2015-05-07 09:27:07 +0000
3+++ Makefile 2015-06-25 17:58:24 +0000
4@@ -2,13 +2,19 @@
5 PYTHON := /usr/bin/env python
6
7 lint:
8- @flake8 --exclude hooks/charmhelpers actions hooks unit_tests tests
9+ @flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
10+ actions hooks unit_tests tests
11 @charm proof
12
13-unit_test:
14+test:
15+ @# Bundletester expects unit tests here.
16 @echo Starting unit tests...
17 @$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage unit_tests
18
19+functional_test:
20+ @echo Starting Amulet tests...
21+ @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
22+
23 bin/charm_helpers_sync.py:
24 @mkdir -p bin
25 @bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
26@@ -18,13 +24,6 @@
27 @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
28 @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
29
30-test:
31- @echo Starting Amulet tests...
32- # coreycb note: The -v should only be temporary until Amulet sends
33- # raise_status() messages to stderr:
34- # https://bugs.launchpad.net/amulet/+bug/1320357
35- @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
36-
37 publish: lint unit_test
38 bzr push lp:charms/neutron-gateway
39 bzr push lp:charms/trusty/neutron-gateway
40
41=== modified file 'metadata.yaml'
42--- metadata.yaml 2015-05-07 09:27:07 +0000
43+++ metadata.yaml 2015-06-25 17:58:24 +0000
44@@ -13,7 +13,7 @@
45 .
46 This charm provides central Neutron networking services as part
47 of a Neutron based Openstack deployment
48-categories:
49+tags:
50 - openstack
51 provides:
52 nrpe-external-master:
53
54=== modified file 'tests/014-basic-precise-icehouse'
55--- tests/014-basic-precise-icehouse 2015-04-16 21:36:05 +0000
56+++ tests/014-basic-precise-icehouse 2015-06-25 17:58:24 +0000
57@@ -2,10 +2,10 @@
58
59 """Amulet tests on a basic quantum-gateway deployment on precise-icehouse."""
60
61-from basic_deployment import QuantumGatewayBasicDeployment
62+from basic_deployment import NeutronGatewayBasicDeployment
63
64 if __name__ == '__main__':
65- deployment = QuantumGatewayBasicDeployment(series='precise',
66+ deployment = NeutronGatewayBasicDeployment(series='precise',
67 openstack='cloud:precise-icehouse',
68 source='cloud:precise-updates/icehouse')
69 deployment.run_tests()
70
71=== modified file 'tests/015-basic-trusty-icehouse'
72--- tests/015-basic-trusty-icehouse 2015-04-16 21:36:05 +0000
73+++ tests/015-basic-trusty-icehouse 2015-06-25 17:58:24 +0000
74@@ -2,8 +2,8 @@
75
76 """Amulet tests on a basic quantum-gateway deployment on trusty-icehouse."""
77
78-from basic_deployment import QuantumGatewayBasicDeployment
79+from basic_deployment import NeutronGatewayBasicDeployment
80
81 if __name__ == '__main__':
82- deployment = QuantumGatewayBasicDeployment(series='trusty')
83+ deployment = NeutronGatewayBasicDeployment(series='trusty')
84 deployment.run_tests()
85
86=== modified file 'tests/016-basic-trusty-juno'
87--- tests/016-basic-trusty-juno 2015-04-16 21:36:05 +0000
88+++ tests/016-basic-trusty-juno 2015-06-25 17:58:24 +0000
89@@ -2,10 +2,10 @@
90
91 """Amulet tests on a basic quantum-gateway deployment on trusty-juno."""
92
93-from basic_deployment import QuantumGatewayBasicDeployment
94+from basic_deployment import NeutronGatewayBasicDeployment
95
96 if __name__ == '__main__':
97- deployment = QuantumGatewayBasicDeployment(series='trusty',
98+ deployment = NeutronGatewayBasicDeployment(series='trusty',
99 openstack='cloud:trusty-juno',
100 source='cloud:trusty-updates/juno')
101 deployment.run_tests()
102
103=== modified file 'tests/017-basic-trusty-kilo'
104--- tests/017-basic-trusty-kilo 2015-04-22 19:29:36 +0000
105+++ tests/017-basic-trusty-kilo 2015-06-25 17:58:24 +0000
106@@ -2,10 +2,10 @@
107
108 """Amulet tests on a basic quantum-gateway deployment on trusty-kilo."""
109
110-from basic_deployment import QuantumGatewayBasicDeployment
111+from basic_deployment import NeutronGatewayBasicDeployment
112
113 if __name__ == '__main__':
114- deployment = QuantumGatewayBasicDeployment(series='trusty',
115+ deployment = NeutronGatewayBasicDeployment(series='trusty',
116 openstack='cloud:trusty-kilo',
117 source='cloud:trusty-updates/kilo')
118 deployment.run_tests()
119
120=== modified file 'tests/018-basic-utopic-juno'
121--- tests/018-basic-utopic-juno 2015-04-16 21:36:18 +0000
122+++ tests/018-basic-utopic-juno 2015-06-25 17:58:24 +0000
123@@ -2,8 +2,8 @@
124
125 """Amulet tests on a basic quantum-gateway deployment on utopic-juno."""
126
127-from basic_deployment import QuantumGatewayBasicDeployment
128+from basic_deployment import NeutronGatewayBasicDeployment
129
130 if __name__ == '__main__':
131- deployment = QuantumGatewayBasicDeployment(series='utopic')
132+ deployment = NeutronGatewayBasicDeployment(series='utopic')
133 deployment.run_tests()
134
135=== modified file 'tests/019-basic-vivid-kilo'
136--- tests/019-basic-vivid-kilo 2015-04-16 21:36:27 +0000
137+++ tests/019-basic-vivid-kilo 2015-06-25 17:58:24 +0000
138@@ -2,8 +2,8 @@
139
140 """Amulet tests on a basic quantum-gateway deployment on vivid-kilo."""
141
142-from basic_deployment import QuantumGatewayBasicDeployment
143+from basic_deployment import NeutronGatewayBasicDeployment
144
145 if __name__ == '__main__':
146- deployment = QuantumGatewayBasicDeployment(series='vivid')
147+ deployment = NeutronGatewayBasicDeployment(series='vivid')
148 deployment.run_tests()
149
150=== modified file 'tests/050-basic-trusty-icehouse-git'
151--- tests/050-basic-trusty-icehouse-git 2015-04-16 21:36:05 +0000
152+++ tests/050-basic-trusty-icehouse-git 2015-06-25 17:58:24 +0000
153@@ -2,8 +2,8 @@
154
155 """Amulet tests on a basic quantum-gateway git deployment on trusty-icehouse."""
156
157-from basic_deployment import QuantumGatewayBasicDeployment
158+from basic_deployment import NeutronGatewayBasicDeployment
159
160 if __name__ == '__main__':
161- deployment = QuantumGatewayBasicDeployment(series='trusty', git=True)
162+ deployment = NeutronGatewayBasicDeployment(series='trusty', git=True)
163 deployment.run_tests()
164
165=== modified file 'tests/051-basic-trusty-juno-git'
166--- tests/051-basic-trusty-juno-git 2015-04-16 21:36:05 +0000
167+++ tests/051-basic-trusty-juno-git 2015-06-25 17:58:24 +0000
168@@ -2,10 +2,10 @@
169
170 """Amulet tests on a basic quantum-gateway git deployment on trusty-juno."""
171
172-from basic_deployment import QuantumGatewayBasicDeployment
173+from basic_deployment import NeutronGatewayBasicDeployment
174
175 if __name__ == '__main__':
176- deployment = QuantumGatewayBasicDeployment(series='trusty',
177+ deployment = NeutronGatewayBasicDeployment(series='trusty',
178 openstack='cloud:trusty-juno',
179 source='cloud:trusty-updates/juno',
180 git=True)
181
182=== modified file 'tests/basic_deployment.py'
183--- tests/basic_deployment.py 2015-06-10 14:31:00 +0000
184+++ tests/basic_deployment.py 2015-06-25 17:58:24 +0000
185@@ -4,10 +4,8 @@
186 import os
187 import time
188 import yaml
189-try:
190- from quantumclient.v2_0 import client as neutronclient
191-except ImportError:
192- from neutronclient.v2_0 import client as neutronclient
193+
194+from neutronclient.v2_0 import client as neutronclient
195
196 from charmhelpers.contrib.openstack.amulet.deployment import (
197 OpenStackAmuletDeployment
198@@ -23,13 +21,13 @@
199 u = OpenStackAmuletUtils(DEBUG)
200
201
202-class QuantumGatewayBasicDeployment(OpenStackAmuletDeployment):
203- """Amulet tests on a basic quantum-gateway deployment."""
204+class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
205+ """Amulet tests on a basic neutron-gateway deployment."""
206
207 def __init__(self, series, openstack=None, source=None, git=False,
208 stable=True):
209 """Deploy the entire test environment."""
210- super(QuantumGatewayBasicDeployment, self).__init__(series, openstack,
211+ super(NeutronGatewayBasicDeployment, self).__init__(series, openstack,
212 source, stable)
213 self.git = git
214 self._add_services()
215@@ -41,34 +39,34 @@
216 def _add_services(self):
217 """Add services
218
219- Add the services that we're testing, where quantum-gateway is local,
220+ Add the services that we're testing, where neutron-gateway is local,
221 and the rest of the service are from lp branches that are
222 compatible with the local charm (e.g. stable or next).
223 """
224- this_service = {'name': 'quantum-gateway'}
225+ this_service = {'name': 'neutron-gateway'}
226 other_services = [{'name': 'mysql'},
227 {'name': 'rabbitmq-server'}, {'name': 'keystone'},
228 {'name': 'nova-cloud-controller'}]
229- super(QuantumGatewayBasicDeployment, self)._add_services(this_service,
230+ super(NeutronGatewayBasicDeployment, self)._add_services(this_service,
231 other_services)
232
233 def _add_relations(self):
234 """Add all of the relations for the services."""
235 relations = {
236 'keystone:shared-db': 'mysql:shared-db',
237- 'quantum-gateway:shared-db': 'mysql:shared-db',
238- 'quantum-gateway:amqp': 'rabbitmq-server:amqp',
239+ 'neutron-gateway:shared-db': 'mysql:shared-db',
240+ 'neutron-gateway:amqp': 'rabbitmq-server:amqp',
241 'nova-cloud-controller:quantum-network-service': \
242- 'quantum-gateway:quantum-network-service',
243+ 'neutron-gateway:quantum-network-service',
244 'nova-cloud-controller:shared-db': 'mysql:shared-db',
245 'nova-cloud-controller:identity-service': 'keystone:identity-service',
246 'nova-cloud-controller:amqp': 'rabbitmq-server:amqp'
247 }
248- super(QuantumGatewayBasicDeployment, self)._add_relations(relations)
249+ super(NeutronGatewayBasicDeployment, self)._add_relations(relations)
250
251 def _configure_services(self):
252 """Configure all of the services."""
253- quantum_gateway_config = {}
254+ neutron_gateway_config = {}
255 if self.git:
256 branch = 'stable/' + self._get_openstack_release_string()
257 amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
258@@ -85,15 +83,15 @@
259 'http_proxy': amulet_http_proxy,
260 'https_proxy': amulet_http_proxy,
261 }
262- quantum_gateway_config['openstack-origin-git'] = yaml.dump(openstack_origin_git)
263+ neutron_gateway_config['openstack-origin-git'] = yaml.dump(openstack_origin_git)
264 keystone_config = {'admin-password': 'openstack',
265 'admin-token': 'ubuntutesting'}
266 nova_cc_config = {'network-manager': 'Quantum',
267 'quantum-security-groups': 'yes'}
268- configs = {'quantum-gateway': quantum_gateway_config,
269+ configs = {'neutron-gateway': neutron_gateway_config,
270 'keystone': keystone_config,
271 'nova-cloud-controller': nova_cc_config}
272- super(QuantumGatewayBasicDeployment, self)._configure_services(configs)
273+ super(NeutronGatewayBasicDeployment, self)._configure_services(configs)
274
275 def _initialize_tests(self):
276 """Perform final initialization before tests get run."""
277@@ -102,7 +100,7 @@
278 self.keystone_sentry = self.d.sentry.unit['keystone/0']
279 self.rabbitmq_sentry = self.d.sentry.unit['rabbitmq-server/0']
280 self.nova_cc_sentry = self.d.sentry.unit['nova-cloud-controller/0']
281- self.quantum_gateway_sentry = self.d.sentry.unit['quantum-gateway/0']
282+ self.neutron_gateway_sentry = self.d.sentry.unit['neutron-gateway/0']
283
284 # Let things settle a bit before moving forward
285 time.sleep(30)
286@@ -148,16 +146,16 @@
287 self.mysql_sentry: ['status mysql'],
288 self.keystone_sentry: ['status keystone'],
289 self.nova_cc_sentry: nova_cc_services,
290- self.quantum_gateway_sentry: neutron_services
291+ self.neutron_gateway_sentry: neutron_services
292 }
293
294 ret = u.validate_services(commands)
295 if ret:
296 amulet.raise_status(amulet.FAIL, msg=ret)
297
298- def test_quantum_gateway_shared_db_relation(self):
299- """Verify the quantum-gateway to mysql shared-db relation data"""
300- unit = self.quantum_gateway_sentry
301+ def test_neutron_gateway_shared_db_relation(self):
302+ """Verify the neutron-gateway to mysql shared-db relation data"""
303+ unit = self.neutron_gateway_sentry
304 relation = ['shared-db', 'mysql:shared-db']
305 expected = {
306 'private-address': u.valid_ip,
307@@ -168,13 +166,13 @@
308
309 ret = u.validate_relation_data(unit, relation, expected)
310 if ret:
311- message = u.relation_error('quantum-gateway shared-db', ret)
312+ message = u.relation_error('neutron-gateway shared-db', ret)
313 amulet.raise_status(amulet.FAIL, msg=message)
314
315 def test_mysql_shared_db_relation(self):
316- """Verify the mysql to quantum-gateway shared-db relation data"""
317+ """Verify the mysql to neutron-gateway shared-db relation data"""
318 unit = self.mysql_sentry
319- relation = ['shared-db', 'quantum-gateway:shared-db']
320+ relation = ['shared-db', 'neutron-gateway:shared-db']
321 expected = {
322 'private-address': u.valid_ip,
323 'password': u.not_null,
324@@ -186,9 +184,9 @@
325 message = u.relation_error('mysql shared-db', ret)
326 amulet.raise_status(amulet.FAIL, msg=message)
327
328- def test_quantum_gateway_amqp_relation(self):
329- """Verify the quantum-gateway to rabbitmq-server amqp relation data"""
330- unit = self.quantum_gateway_sentry
331+ def test_neutron_gateway_amqp_relation(self):
332+ """Verify the neutron-gateway to rabbitmq-server amqp relation data"""
333+ unit = self.neutron_gateway_sentry
334 relation = ['amqp', 'rabbitmq-server:amqp']
335 expected = {
336 'username': 'neutron',
337@@ -198,13 +196,13 @@
338
339 ret = u.validate_relation_data(unit, relation, expected)
340 if ret:
341- message = u.relation_error('quantum-gateway amqp', ret)
342+ message = u.relation_error('neutron-gateway amqp', ret)
343 amulet.raise_status(amulet.FAIL, msg=message)
344
345 def test_rabbitmq_amqp_relation(self):
346- """Verify the rabbitmq-server to quantum-gateway amqp relation data"""
347+ """Verify the rabbitmq-server to neutron-gateway amqp relation data"""
348 unit = self.rabbitmq_sentry
349- relation = ['amqp', 'quantum-gateway:amqp']
350+ relation = ['amqp', 'neutron-gateway:amqp']
351 expected = {
352 'private-address': u.valid_ip,
353 'password': u.not_null,
354@@ -216,10 +214,10 @@
355 message = u.relation_error('rabbitmq amqp', ret)
356 amulet.raise_status(amulet.FAIL, msg=message)
357
358- def test_quantum_gateway_network_service_relation(self):
359- """Verify the quantum-gateway to nova-cc quantum-network-service
360+ def test_neutron_gateway_network_service_relation(self):
361+ """Verify the neutron-gateway to nova-cc quantum-network-service
362 relation data"""
363- unit = self.quantum_gateway_sentry
364+ unit = self.neutron_gateway_sentry
365 relation = ['quantum-network-service',
366 'nova-cloud-controller:quantum-network-service']
367 expected = {
368@@ -228,15 +226,15 @@
369
370 ret = u.validate_relation_data(unit, relation, expected)
371 if ret:
372- message = u.relation_error('quantum-gateway network-service', ret)
373+ message = u.relation_error('neutron-gateway network-service', ret)
374 amulet.raise_status(amulet.FAIL, msg=message)
375
376 def test_nova_cc_network_service_relation(self):
377- """Verify the nova-cc to quantum-gateway quantum-network-service
378+ """Verify the nova-cc to neutron-gateway quantum-network-service
379 relation data"""
380 unit = self.nova_cc_sentry
381 relation = ['quantum-network-service',
382- 'quantum-gateway:quantum-network-service']
383+ 'neutron-gateway:quantum-network-service']
384 expected = {
385 'service_protocol': 'http',
386 'service_tenant': 'services',
387@@ -280,26 +278,26 @@
388 if self._get_openstack_release() <= self.trusty_juno:
389 services.append('neutron-vpn-agent')
390
391- u.log.debug("Making config change on quantum-gateway...")
392- self.d.configure('quantum-gateway', {'debug': 'True'})
393+ u.log.debug("Making config change on neutron-gateway...")
394+ self.d.configure('neutron-gateway', {'debug': 'True'})
395
396 time = 60
397 for s in services:
398 u.log.debug("Checking that service restarted: {}".format(s))
399- if not u.service_restarted(self.quantum_gateway_sentry, s, conf,
400+ if not u.service_restarted(self.neutron_gateway_sentry, s, conf,
401 pgrep_full=True, sleep_time=time):
402- self.d.configure('quantum-gateway', {'debug': 'False'})
403+ self.d.configure('neutron-gateway', {'debug': 'False'})
404 msg = "service {} didn't restart after config change".format(s)
405 amulet.raise_status(amulet.FAIL, msg=msg)
406 time = 0
407
408- self.d.configure('quantum-gateway', {'debug': 'False'})
409+ self.d.configure('neutron-gateway', {'debug': 'False'})
410
411 def test_neutron_config(self):
412 """Verify the data in the neutron config file."""
413- unit = self.quantum_gateway_sentry
414+ unit = self.neutron_gateway_sentry
415 rabbitmq_relation = self.rabbitmq_sentry.relation('amqp',
416- 'quantum-gateway:amqp')
417+ 'neutron-gateway:amqp')
418
419 conf = '/etc/neutron/neutron.conf'
420 expected = {
421@@ -338,9 +336,9 @@
422 if self._get_openstack_release() < self.precise_icehouse:
423 return
424
425- unit = self.quantum_gateway_sentry
426+ unit = self.neutron_gateway_sentry
427 conf = '/etc/neutron/plugins/ml2/ml2_conf.ini'
428- quantum_gateway_relation = unit.relation('shared-db', 'mysql:shared-db')
429+ neutron_gateway_relation = unit.relation('shared-db', 'mysql:shared-db')
430 expected = {
431 'ml2': {
432 'type_drivers': 'gre,vxlan,vlan,flat',
433@@ -355,7 +353,7 @@
434 },
435 'ovs': {
436 'enable_tunneling': 'True',
437- 'local_ip': quantum_gateway_relation['private-address']
438+ 'local_ip': neutron_gateway_relation['private-address']
439 },
440 'agent': {
441 'tunnel_types': 'gre',
442@@ -375,7 +373,7 @@
443
444 def test_dhcp_agent_config(self):
445 """Verify the data in the dhcp agent config file."""
446- unit = self.quantum_gateway_sentry
447+ unit = self.neutron_gateway_sentry
448 conf = '/etc/neutron/dhcp_agent.ini'
449 expected = {
450 'state_path': '/var/lib/neutron',
451@@ -398,7 +396,7 @@
452 if self._get_openstack_release() < self.precise_havana:
453 return
454
455- unit = self.quantum_gateway_sentry
456+ unit = self.neutron_gateway_sentry
457 conf = '/etc/neutron/fwaas_driver.ini'
458 expected = {
459 'driver': 'neutron.services.firewall.drivers.linux.'
460@@ -413,10 +411,10 @@
461
462 def test_l3_agent_config(self):
463 """Verify the data in the l3 agent config file."""
464- unit = self.quantum_gateway_sentry
465+ unit = self.neutron_gateway_sentry
466 nova_cc_relation = self.nova_cc_sentry.relation(\
467 'quantum-network-service',
468- 'quantum-gateway:quantum-network-service')
469+ 'neutron-gateway:quantum-network-service')
470 ep = self.keystone.service_catalog.url_for(service_type='identity',
471 endpoint_type='publicURL')
472
473@@ -446,7 +444,7 @@
474 if self._get_openstack_release() < self.precise_havana:
475 return
476
477- unit = self.quantum_gateway_sentry
478+ unit = self.neutron_gateway_sentry
479 conf = '/etc/neutron/lbaas_agent.ini'
480 expected = {
481 'DEFAULT': {
482@@ -471,13 +469,13 @@
483
484 def test_metadata_agent_config(self):
485 """Verify the data in the metadata agent config file."""
486- unit = self.quantum_gateway_sentry
487+ unit = self.neutron_gateway_sentry
488 ep = self.keystone.service_catalog.url_for(service_type='identity',
489 endpoint_type='publicURL')
490- quantum_gateway_relation = unit.relation('shared-db', 'mysql:shared-db')
491+ neutron_gateway_relation = unit.relation('shared-db', 'mysql:shared-db')
492 nova_cc_relation = self.nova_cc_sentry.relation(\
493 'quantum-network-service',
494- 'quantum-gateway:quantum-network-service')
495+ 'neutron-gateway:quantum-network-service')
496
497 conf = '/etc/neutron/metadata_agent.ini'
498 expected = {
499@@ -489,7 +487,7 @@
500 'root_helper': 'sudo neutron-rootwrap '
501 '/etc/neutron/rootwrap.conf',
502 'state_path': '/var/lib/neutron',
503- 'nova_metadata_ip': quantum_gateway_relation['private-address'],
504+ 'nova_metadata_ip': neutron_gateway_relation['private-address'],
505 'nova_metadata_port': '8775'
506 }
507
508@@ -507,7 +505,7 @@
509 if self._get_openstack_release() < self.precise_havana:
510 return
511
512- unit = self.quantum_gateway_sentry
513+ unit = self.neutron_gateway_sentry
514 conf = '/etc/neutron/metering_agent.ini'
515 expected = {
516 'driver': 'neutron.services.metering.drivers.iptables.'
517@@ -525,19 +523,19 @@
518
519 def test_nova_config(self):
520 """Verify the data in the nova config file."""
521- unit = self.quantum_gateway_sentry
522+ unit = self.neutron_gateway_sentry
523 conf = '/etc/nova/nova.conf'
524 mysql_relation = self.mysql_sentry.relation('shared-db',
525- 'quantum-gateway:shared-db')
526+ 'neutron-gateway:shared-db')
527 db_uri = "mysql://{}:{}@{}/{}".format('nova',
528 mysql_relation['password'],
529 mysql_relation['db_host'],
530 'nova')
531 rabbitmq_relation = self.rabbitmq_sentry.relation('amqp',
532- 'quantum-gateway:amqp')
533+ 'neutron-gateway:amqp')
534 nova_cc_relation = self.nova_cc_sentry.relation(\
535 'quantum-network-service',
536- 'quantum-gateway:quantum-network-service')
537+ 'neutron-gateway:quantum-network-service')
538 ep = self.keystone.service_catalog.url_for(service_type='identity',
539 endpoint_type='publicURL')
540
541@@ -577,13 +575,13 @@
542 if self._get_openstack_release() >= self.precise_icehouse:
543 return
544
545- unit = self.quantum_gateway_sentry
546- quantum_gateway_relation = unit.relation('shared-db', 'mysql:shared-db')
547+ unit = self.neutron_gateway_sentry
548+ neutron_gateway_relation = unit.relation('shared-db', 'mysql:shared-db')
549
550 conf = '/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini'
551 expected = {
552 'ovs': {
553- 'local_ip': quantum_gateway_relation['private-address'],
554+ 'local_ip': neutron_gateway_relation['private-address'],
555 'tenant_network_type': 'gre',
556 'enable_tunneling': 'True',
557 'tunnel_id_ranges': '1:1000'
558@@ -607,7 +605,7 @@
559 if self._get_openstack_release() < self.precise_havana:
560 return
561
562- unit = self.quantum_gateway_sentry
563+ unit = self.neutron_gateway_sentry
564 conf = '/etc/neutron/vpn_agent.ini'
565 expected = {
566 'vpnagent': {

Subscribers

People subscribed via source and target branches