Merge lp:~gnuoy/charms/trusty/neutron-openvswitch/next-l2-population into lp:~openstack-charmers-archive/charms/trusty/neutron-openvswitch/next

[Liam Young]

[James Page (james-page)]

review: Approve

=== modified file 'hooks/neutron_ovs_context.py'
--- hooks/neutron_ovs_context.py	2014-07-24 10:30:22 +0000
+++ hooks/neutron_ovs_context.py	2014-09-30 09:51:31 +0000
@@ -18,19 +18,26 @@
 DATA_BRIDGE = 'br-data'
 
 
-def _neutron_security_groups():
-    '''
-    Inspects current neutron-plugin relation and determine if neutron-api has
-    instructed us to use neutron security groups.
-    '''
+def _neutron_api_settings():
+    '''
+    Inspects current neutron-plugin relation
+    '''
+    neutron_settings = {
+        'neutron_security_groups': False,
+        'l2_population': True,
+
+    }
     for rid in relation_ids('neutron-plugin-api'):
         for unit in related_units(rid):
-            sec_group = relation_get('neutron-security-groups',
-                                     rid=rid,
-                                     unit=unit)
-            if sec_group is not None:
-                return sec_group
-    return False
+            rdata = relation_get(rid=rid, unit=unit)
+            if 'l2-population' not in rdata:
+                continue
+            neutron_settings = {
+                'l2_population': rdata['l2-population'],
+                'neutron_security_groups': rdata['neutron-security-groups']
+            }
+            return neutron_settings
+    return neutron_settings
 
 
 class OVSPluginContext(context.NeutronContext):
@@ -46,7 +53,8 @@
 
     @property
     def neutron_security_groups(self):
-        return _neutron_security_groups()
+        neutron_api_settings = _neutron_api_settings()
+        return neutron_api_settings['neutron_security_groups']
 
     def get_data_port(self):
         data_ports = config('data-port')
@@ -88,7 +96,9 @@
         ovs_ctxt['local_ip'] = \
             get_address_in_network(config('os-data-network'),
                                    get_host_ip(unit_get('private-address')))
+        neutron_api_settings = _neutron_api_settings()
         ovs_ctxt['neutron_security_groups'] = self.neutron_security_groups
+        ovs_ctxt['l2_population'] = neutron_api_settings['l2_population']
         # TODO: We need to sort out the syslog and debug/verbose options as a
         # general context helper
         ovs_ctxt['use_syslog'] = conf['use-syslog']

=== modified file 'templates/icehouse/ml2_conf.ini'
--- templates/icehouse/ml2_conf.ini	2014-07-14 11:47:38 +0000
+++ templates/icehouse/ml2_conf.ini	2014-09-30 09:51:31 +0000
@@ -7,7 +7,7 @@
 [ml2]
 type_drivers = gre,vxlan,vlan,flat
 tenant_network_types = gre,vxlan,vlan,flat
-mechanism_drivers = openvswitch,hyperv
+mechanism_drivers = openvswitch,hyperv,l2population
 
 [ml2_type_gre]
 tunnel_id_ranges = 1:1000
@@ -28,6 +28,7 @@
 
 [agent]
 tunnel_types = gre
+l2_population = {{ l2_population }}
 
 [securitygroup]
 {% if neutron_security_groups == 'True' -%}

=== modified file 'unit_tests/test_neutron_ovs_context.py'
--- unit_tests/test_neutron_ovs_context.py	2014-07-21 13:03:08 +0000
+++ unit_tests/test_neutron_ovs_context.py	2014-09-30 09:51:31 +0000
@@ -88,7 +88,9 @@
         _is_clus.return_value = False
         self.related_units.return_value = ['unit1']
         self.relation_ids.return_value = ['rid2']
-        self.test_relation.set({'neutron-security-groups': 'yes'})
+        self.test_relation.set({'neutron-security-groups': 'yes',
+                                'l2-population': True,
+                                })
         self.get_host_ip.return_value = '127.0.0.15'
         self.service_running.return_value = False
         napi_ctxt = context.OVSPluginContext()
@@ -103,7 +105,8 @@
             'debug': True,
             'core_plugin': 'neutron.randomdriver',
             'neutron_plugin': 'ovs',
-            'neutron_url': 'https://127.0.0.13:9696'
+            'neutron_url': 'https://127.0.0.13:9696',
+            'l2_population': True,
         }
         self.assertEquals(expect, napi_ctxt())
         self.service_start.assertCalled()