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

[James Page]

[Edward Hope-Morley (hopem)]

lgtm

review: Approve

=== modified file 'hooks/quantum_contexts.py'
--- hooks/quantum_contexts.py	2014-10-09 14:00:36 +0000
+++ hooks/quantum_contexts.py	2014-10-09 14:17:04 +0000
@@ -106,7 +106,7 @@
     defaults if it is not present
     '''
     neutron_settings = {
-        'l2_population': True,
+        'l2_population': False,
         'overlay_network_type': 'gre',
 
     }
 
=== modified file 'unit_tests/test_quantum_contexts.py'
--- unit_tests/test_quantum_contexts.py	2014-10-03 11:24:24 +0000
+++ unit_tests/test_quantum_contexts.py	2014-10-09 14:17:04 +0000
@@ -232,7 +232,7 @@
             'plugin': 'ovs',
             'debug': False,
             'verbose': True,
-            'l2_population': True,
+            'l2_population': False,
             'overlay_network_type': 'gre',
         })
 
@@ -368,15 +368,15 @@
     def test_neutron_api_settings2(self):
         self.relation_ids.return_value = ['foo']
         self.related_units.return_value = ['bar']
-        self.test_relation.set({'l2-population': False,
+        self.test_relation.set({'l2-population': True,
                                 'overlay-network-type': 'gre', })
         self.relation_get.side_effect = self.test_relation.get
         self.assertEquals(quantum_contexts._neutron_api_settings(),
+                          {'l2_population': True,
+                           'overlay_network_type': 'gre'})
+
+    def test_neutron_api_settings_no_apiplugin(self):
+        self.relation_ids.return_value = []
+        self.assertEquals(quantum_contexts._neutron_api_settings(),
                           {'l2_population': False,
-                           'overlay_network_type': 'gre'})
-
-    def test_neutron_api_settings_no_apiplugin(self):
-        self.relation_ids.return_value = []
-        self.assertEquals(quantum_contexts._neutron_api_settings(),
-                          {'l2_population': True,
                            'overlay_network_type': 'gre', })