Charm Helpers

Merge lp:~gnuoy/charm-helpers/rename-extensions into lp:charm-helpers

  1. rename-extensions
  2. Merge into devel
Proposed by Liam Young
Status: Merged
Merged at revision: 778
Proposed branch: lp:~gnuoy/charm-helpers/rename-extensions
Merge into: lp:charm-helpers
Diff against target: 54 lines (+8/-8)
2 files modified
charmhelpers/contrib/openstack/context.py (+2/-2)
tests/contrib/openstack/test_os_contexts.py (+6/-6)
To merge this branch: bzr merge lp:~gnuoy/charm-helpers/rename-extensions
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+328672@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/context.py'
2--- charmhelpers/contrib/openstack/context.py 2017-08-05 10:55:03 +0000
3+++ charmhelpers/contrib/openstack/context.py 2017-08-07 15:40:49 +0000
4@@ -1445,9 +1445,9 @@
5 ctxt.update(self.get_neutron_options(rdata))
6
7 if ctxt['enable_qos']:
8- ctxt['extensions'] = 'qos'
9+ ctxt['extension_drivers'] = 'qos'
10 else:
11- ctxt['extensions'] = ''
12+ ctxt['extension_drivers'] = ''
13
14 return ctxt
15
16
17=== modified file 'tests/contrib/openstack/test_os_contexts.py'
18--- tests/contrib/openstack/test_os_contexts.py 2017-08-05 10:55:03 +0000
19+++ tests/contrib/openstack/test_os_contexts.py 2017-08-07 15:40:49 +0000
20@@ -3212,28 +3212,28 @@
21 # the api service on the other end is sending data in a recent format.
22 self.relation_get.return_value = cfg
23
24- def test_neutronapicontext_extensions_qos_on(self):
25+ def test_neutronapicontext_extension_drivers_qos_on(self):
26 self.setup_neutron_api_context_relation({
27 'enable-qos': 'True',
28 'l2-population': 'True'})
29 api_ctxt = context.NeutronAPIContext()()
30 self.assertTrue(api_ctxt['enable_qos'])
31- self.assertEquals(api_ctxt['extensions'], 'qos')
32+ self.assertEquals(api_ctxt['extension_drivers'], 'qos')
33
34- def test_neutronapicontext_extensions_qos_off(self):
35+ def test_neutronapicontext_extension_drivers_qos_off(self):
36 self.setup_neutron_api_context_relation({
37 'enable-qos': 'False',
38 'l2-population': 'True'})
39 api_ctxt = context.NeutronAPIContext()()
40 self.assertFalse(api_ctxt['enable_qos'])
41- self.assertEquals(api_ctxt['extensions'], '')
42+ self.assertEquals(api_ctxt['extension_drivers'], '')
43
44- def test_neutronapicontext_extensions_qos_absent(self):
45+ def test_neutronapicontext_extension_drivers_qos_absent(self):
46 self.setup_neutron_api_context_relation({
47 'l2-population': 'True'})
48 api_ctxt = context.NeutronAPIContext()()
49 self.assertFalse(api_ctxt['enable_qos'])
50- self.assertEquals(api_ctxt['extensions'], '')
51+ self.assertEquals(api_ctxt['extension_drivers'], '')
52
53 def test_neutronapicontext_string_converted(self):
54 self.setup_neutron_api_context_relation({

Subscribers

People subscribed via source and target branches