Merge lp:~james-page/charm-helpers/plumgrid into lp:charm-helpers

[James Page]

Add misc bits and pieces for plumgrid support

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2015-08-18 20:52:11 +0000
+++ charmhelpers/contrib/openstack/context.py	2015-09-02 14:24:29 +0000
@@ -895,6 +895,18 @@
                 'neutron_url': '%s://%s:%s' % (proto, host, '9696')}
         return ctxt
 
+    def pg_ctxt(self):
+        driver = neutron_plugin_attribute(self.plugin, 'driver',
+                                          self.network_manager)
+        config = neutron_plugin_attribute(self.plugin, 'config',
+                                          self.network_manager)
+        ovs_ctxt = {'core_plugin': driver,
+                    'neutron_plugin': 'plumgrid',
+                    'neutron_security_groups': self.neutron_security_groups,
+                    'local_ip': unit_private_ip(),
+                    'config': config}
+        return ovs_ctxt
+
     def __call__(self):
         if self.network_manager not in ['quantum', 'neutron']:
             return {}
@@ -914,6 +926,8 @@
             ctxt.update(self.calico_ctxt())
         elif self.plugin == 'vsp':
             ctxt.update(self.nuage_ctxt())
+        elif self.plugin == 'plumgrid':
+            ctxt.update(self.pg_ctxt())
 
         alchemy_flags = config('neutron-alchemy-flags')
         if alchemy_flags:

=== modified file 'charmhelpers/contrib/openstack/neutron.py'
--- charmhelpers/contrib/openstack/neutron.py	2015-08-18 11:35:52 +0000
+++ charmhelpers/contrib/openstack/neutron.py	2015-09-02 14:24:29 +0000
@@ -195,6 +195,20 @@
             'packages': [],
             'server_packages': ['neutron-server', 'neutron-plugin-nuage'],
             'server_services': ['neutron-server']
+        },
+        'plumgrid': {
+            'config': '/etc/neutron/plugins/plumgrid/plumgrid.ini',
+            'driver': 'neutron.plugins.plumgrid.plumgrid_plugin.plumgrid_plugin.NeutronPluginPLUMgridV2',
+            'contexts': [
+                context.SharedDBContext(user=config('database-user'),
+                                        database=config('database'),
+                                        ssl_dir=NEUTRON_CONF_DIR)],
+            'services': [],
+            'packages': [['plumgrid-lxc'],
+                         ['iovisor-dkms']],
+            'server_packages': ['neutron-server',
+                                'neutron-plugin-plumgrid'],
+            'server_services': ['neutron-server']
         }
     }
     if release >= 'icehouse':

=== modified file 'tests/contrib/openstack/test_neutron_utils.py'
--- tests/contrib/openstack/test_neutron_utils.py	2015-08-19 10:04:09 +0000
+++ tests/contrib/openstack/test_neutron_utils.py	2015-09-02 14:24:29 +0000
@@ -71,6 +71,8 @@
                           '/etc/neutron/plugins/cisco/cisco_plugins.ini')
         self.assertEquals(plugins['Calico']['config'],
                           '/etc/neutron/plugins/ml2/ml2_conf.ini')
+        self.assertEquals(plugins['plumgrid']['config'],
+                          '/etc/neutron/plugins/plumgrid/plumgrid.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-08-19 12:45:20 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2015-09-02 14:24:29 +0000
@@ -1788,6 +1788,21 @@
     @patch.object(context.NeutronContext, 'neutron_security_groups')
     @patch.object(context, 'unit_private_ip')
     @patch.object(context, 'neutron_plugin_attribute')
+    def test_neutron_plumgrid_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': 'plumgrid',
+            'neutron_security_groups': True,
+            'local_ip': '10.0.0.1'}, neutron.pg_ctxt())
+
+    @patch.object(context.NeutronContext, 'neutron_security_groups')
+    @patch.object(context, 'unit_private_ip')
+    @patch.object(context, 'neutron_plugin_attribute')
     def test_neutron_nuage_plugin_context(self, attr, ip, sec_groups):
         ip.return_value = '10.0.0.1'
         sec_groups.__get__ = MagicMock(return_value=True)