Merge lp:~celebdor/charm-helpers/liberty into lp:charm-helpers

[Antoni Segura Puimedon]

charm-helpers change necessary for https://code.launchpad.net/~celebdor/charms/trusty/neutron-api/midonet_origins/+merge/283630

[lp:~celebdor/charm-helpers/liberty]

524. By Antoni Segura Puimedon <email address hidden> on 2016-01-23

Add test for the midonet kilo and liberty special behavior

525. By Antoni Segura Puimedon <email address hidden> on 2016-01-23

fix lack of midonet-origin for liberty specific behavior

[lp:~celebdor/charm-helpers/liberty]

526. By Antoni Segura Puimedon <email address hidden> on 2016-01-25

fix code for when midonet-origin is not set

=== modified file 'charmhelpers/contrib/openstack/neutron.py'
--- charmhelpers/contrib/openstack/neutron.py	2016-01-18 11:28:34 +0000
+++ charmhelpers/contrib/openstack/neutron.py	2016-01-25 15:01:02 +0000
@@ -233,6 +233,14 @@
                                              'neutron-plugin-ml2']
         # NOTE: patch in vmware renames nvp->nsx for icehouse onwards
         plugins['nvp'] = plugins['nsx']
+    if release >= 'kilo':
+        plugins['midonet']['driver'] = (
+            'neutron.plugins.midonet.plugin.MidonetPluginV2')
+    if release >= 'liberty':
+        midonet_origin = config('midonet-origin')
+        if midonet_origin is not None and midonet_origin[4:5] == '1':
+            plugins['midonet']['driver'] = (
+                'midonet.neutron.plugin_v1.MidonetPluginV2')
     return plugins
 
 

=== modified file 'tests/contrib/openstack/test_neutron_utils.py'
--- tests/contrib/openstack/test_neutron_utils.py	2016-01-18 11:28:34 +0000
+++ tests/contrib/openstack/test_neutron_utils.py	2016-01-25 15:01:02 +0000
@@ -80,6 +80,17 @@
         self.assertEquals(plugins['nvp']['services'], [])
         self.assertEquals(plugins['nsx'], plugins['nvp'])
 
+        self.os_release.return_value = 'kilo'
+        plugins = neutron.neutron_plugins()
+        self.assertEquals(plugins['midonet']['driver'],
+                          'neutron.plugins.midonet.plugin.MidonetPluginV2')
+
+        self.os_release.return_value = 'liberty'
+        self.config.return_value = 'mem-1.9'
+        plugins = neutron.neutron_plugins()
+        self.assertEquals(plugins['midonet']['driver'],
+                          'midonet.neutron.plugin_v1.MidonetPluginV2')
+
     @patch.object(neutron, 'network_manager')
     def test_neutron_plugin_attribute_quantum(self, _network_manager):
         self.config.return_value = 'foo'