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

[Antoni Segura Puimedon]

Adding MidoNet support for the OpenStack charms to use.

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2015-09-29 20:57:50 +0000
+++ charmhelpers/contrib/openstack/context.py	2015-10-07 11:37:05 +0000
@@ -952,6 +952,19 @@
                     'config': config}
         return ovs_ctxt
 
+    def midonet_ctxt(self):
+        driver = neutron_plugin_attribute(self.plugin, 'driver',
+                                          self.network_manager)
+        midonet_config = neutron_plugin_attribute(self.plugin, 'config',
+                                                  self.network_manager)
+        mido_ctxt = {'core_plugin': driver,
+                     'neutron_plugin': 'midonet',
+                     'neutron_security_groups': self.neutron_security_groups,
+                     'local_ip': unit_private_ip(),
+                     'config': midonet_config}
+
+        return mido_ctxt
+
     def __call__(self):
         if self.network_manager not in ['quantum', 'neutron']:
             return {}
@@ -973,6 +986,8 @@
             ctxt.update(self.nuage_ctxt())
         elif self.plugin == 'plumgrid':
             ctxt.update(self.pg_ctxt())
+        elif self.plugin == 'midonet':
+            ctxt.update(self.midonet_ctxt())
 
         alchemy_flags = config('neutron-alchemy-flags')
         if alchemy_flags:

=== modified file 'charmhelpers/contrib/openstack/neutron.py'
--- charmhelpers/contrib/openstack/neutron.py	2015-09-28 10:58:33 +0000
+++ charmhelpers/contrib/openstack/neutron.py	2015-10-07 11:37:05 +0000
@@ -209,6 +209,20 @@
             'server_packages': ['neutron-server',
                                 'neutron-plugin-plumgrid'],
             'server_services': ['neutron-server']
+        },
+        'midonet': {
+            'config': '/etc/neutron/plugins/midonet/midonet.ini',
+            'driver': 'midonet.neutron.plugin.MidonetPluginV2',
+            'contexts': [
+                context.SharedDBContext(user=config('neutron-database-user'),
+                                        database=config('neutron-database'),
+                                        relation_prefix='neutron',
+                                        ssl_dir=NEUTRON_CONF_DIR)],
+            'services': [],
+            'packages': [[headers_package()] + determine_dkms_package()],
+            'server_packages': ['neutron-server',
+                                'python-neutron-plugin-midonet'],
+            'server_services': ['neutron-server']
         }
     }
     if release >= 'icehouse':

=== modified file 'tests/contrib/openstack/test_neutron_utils.py'
--- tests/contrib/openstack/test_neutron_utils.py	2015-09-02 14:09:43 +0000
+++ tests/contrib/openstack/test_neutron_utils.py	2015-10-07 11:37:05 +0000
@@ -73,6 +73,8 @@
                           '/etc/neutron/plugins/ml2/ml2_conf.ini')
         self.assertEquals(plugins['plumgrid']['config'],
                           '/etc/neutron/plugins/plumgrid/plumgrid.ini')
+        self.assertEquals(plugins['midonet']['config'],
+                          '/etc/neutron/plugins/midonet/midonet.ini')
         self.assertEquals(plugins['nvp']['services'], [])
         self.assertEquals(plugins['nsx'], plugins['nvp'])
 

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2015-09-28 10:58:33 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2015-10-07 11:37:05 +0000
@@ -1912,6 +1912,21 @@
             'neutron_security_groups': True,
             'local_ip': '10.0.0.1'}, neutron.nuage_ctxt())
 
+    @patch.object(context.NeutronContext, 'neutron_security_groups')
+    @patch.object(context, 'unit_private_ip')
+    @patch.object(context, 'neutron_plugin_attribute')
+    def test_neutron_midonet_plugin_context(self, attr, ip, sec_groups):
+        ip.return_value = '10.0.0.1'
+        sec_groups.__get__ = MagicMock(return_value=True)
+        attr.return_value = 'some.quantum.driver.class'
+        neutron = context.NeutronContext()
+        self.assertEquals({
+            'config': 'some.quantum.driver.class',
+            'core_plugin': 'some.quantum.driver.class',
+            'neutron_plugin': 'midonet',
+            'neutron_security_groups': True,
+            'local_ip': '10.0.0.1'}, neutron.midonet_ctxt())
+
     @patch('charmhelpers.contrib.openstack.context.unit_get')
     @patch.object(context.NeutronContext, 'network_manager')
     def test_neutron_neutron_ctxt(self, mock_network_manager,