Juju Charms Collection
quantum-gateway package

Merge lp:~james-page/charms/trusty/quantum-gateway/l2pop-upgrade-break into lp:~openstack-charmers/charms/trusty/quantum-gateway/next

  1. Trusty Tahr (14.04)
  2. l2pop-upgrade-break
  3. Merge into next
Proposed by James Page
Status: Merged
Merged at revision: 71
Proposed branch: lp:~james-page/charms/trusty/quantum-gateway/l2pop-upgrade-break
Merge into: lp:~openstack-charmers/charms/trusty/quantum-gateway/next
Diff against target: 48 lines (+9/-9)
2 files modified
hooks/quantum_contexts.py (+1/-1)
unit_tests/test_quantum_contexts.py (+8/-8)
To merge this branch: bzr merge lp:~james-page/charms/trusty/quantum-gateway/l2pop-upgrade-break
Reviewer Review Type Date Requested Status
Edward Hope-Morley Approve
OpenStack Charmers Pending
Review via email: mp+237792@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Edward Hope-Morley (hopem) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/quantum_contexts.py'
2--- hooks/quantum_contexts.py 2014-10-09 14:00:36 +0000
3+++ hooks/quantum_contexts.py 2014-10-09 14:17:04 +0000
4@@ -106,7 +106,7 @@
5 defaults if it is not present
6 '''
7 neutron_settings = {
8- 'l2_population': True,
9+ 'l2_population': False,
10 'overlay_network_type': 'gre',
11
12 }
13
14=== modified file 'unit_tests/test_quantum_contexts.py'
15--- unit_tests/test_quantum_contexts.py 2014-10-03 11:24:24 +0000
16+++ unit_tests/test_quantum_contexts.py 2014-10-09 14:17:04 +0000
17@@ -232,7 +232,7 @@
18 'plugin': 'ovs',
19 'debug': False,
20 'verbose': True,
21- 'l2_population': True,
22+ 'l2_population': False,
23 'overlay_network_type': 'gre',
24 })
25
26@@ -368,15 +368,15 @@
27 def test_neutron_api_settings2(self):
28 self.relation_ids.return_value = ['foo']
29 self.related_units.return_value = ['bar']
30- self.test_relation.set({'l2-population': False,
31+ self.test_relation.set({'l2-population': True,
32 'overlay-network-type': 'gre', })
33 self.relation_get.side_effect = self.test_relation.get
34 self.assertEquals(quantum_contexts._neutron_api_settings(),
35+ {'l2_population': True,
36+ 'overlay_network_type': 'gre'})
37+
38+ def test_neutron_api_settings_no_apiplugin(self):
39+ self.relation_ids.return_value = []
40+ self.assertEquals(quantum_contexts._neutron_api_settings(),
41 {'l2_population': False,
42- 'overlay_network_type': 'gre'})
43-
44- def test_neutron_api_settings_no_apiplugin(self):
45- self.relation_ids.return_value = []
46- self.assertEquals(quantum_contexts._neutron_api_settings(),
47- {'l2_population': True,
48 'overlay_network_type': 'gre', })

Subscribers

People subscribed via source and target branches