Merge lp:~springfield-team/charm-helpers/trunk into lp:charm-helpers

[Shiv Prasad Rao]

Changes made to support Cisco N1kv for nova-cloud-controller

charmhelpers/contrib/openstack/context.py
Context for cisco_plugins.ini

charmhelpers/contrib/openstack/neutron.py
neutron_plugin details for Cisco N1kv

[lp:~springfield-team/charm-helpers/trunk]

163. By Liam Young on 2014-06-19

[jamespage, r=gnuoy] Fixup problem with fstab parsing if tabs are used instead of spaces

[Jorge Niedbalski (niedbalski)]

Hello Shiv,

I added a couple of unit tests to provide coverage for the added lines of code. Other than that, the change LGTM +1.

review: Approve

[lp:~springfield-team/charm-helpers/trunk]

164. By James Page on 2014-06-20

[corey.bryant,r=james-page] Add helper classes for writing amulet tests in Charms.

NOTE: needs unit tests but deferring for now - Corey will follow up with these.

165. By James Page on 2014-06-23

[shivrao,r=james-page,r=niedbalski] Add support for n1kv neutron plugin.

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2014-05-02 14:53:54 +0000
+++ charmhelpers/contrib/openstack/context.py	2014-06-19 17:11:58 +0000
@@ -541,6 +541,26 @@
 
         return nvp_ctxt
 
+    def n1kv_ctxt(self):
+        driver = neutron_plugin_attribute(self.plugin, 'driver',
+                                          self.network_manager)
+        n1kv_config = neutron_plugin_attribute(self.plugin, 'config',
+                                               self.network_manager)
+        n1kv_ctxt = {
+            'core_plugin': driver,
+            'neutron_plugin': 'n1kv',
+            'neutron_security_groups': self.neutron_security_groups,
+            'local_ip': unit_private_ip(),
+            'config': n1kv_config,
+            'vsm_ip': config('n1kv-vsm-ip'),
+            'vsm_username': config('n1kv-vsm-username'),
+            'vsm_password': config('n1kv-vsm-password'),
+            'restrict_policy_profiles': config(
+                'n1kv_restrict_policy_profiles'),
+        }
+
+        return n1kv_ctxt
+
     def neutron_ctxt(self):
         if https():
             proto = 'https'
@@ -572,6 +592,8 @@
             ctxt.update(self.ovs_ctxt())
         elif self.plugin in ['nvp', 'nsx']:
             ctxt.update(self.nvp_ctxt())
+        elif self.plugin == 'n1kv':
+            ctxt.update(self.n1kv_ctxt())
 
         alchemy_flags = config('neutron-alchemy-flags')
         if alchemy_flags:
 
=== modified file 'charmhelpers/contrib/openstack/neutron.py'
--- charmhelpers/contrib/openstack/neutron.py	2014-05-03 06:40:08 +0000
+++ charmhelpers/contrib/openstack/neutron.py	2014-06-19 17:11:58 +0000
@@ -128,6 +128,20 @@
             'server_packages': ['neutron-server',
                                 'neutron-plugin-vmware'],
             'server_services': ['neutron-server']
+        },
+        'n1kv': {
+            'config': '/etc/neutron/plugins/cisco/cisco_plugins.ini',
+            'driver': 'neutron.plugins.cisco.network_plugin.PluginV2',
+            'contexts': [
+                context.SharedDBContext(user=config('neutron-database-user'),
+                                        database=config('neutron-database'),
+                                        relation_prefix='neutron',
+                                        ssl_dir=NEUTRON_CONF_DIR)],
+            'services': [],
+            'packages': [['neutron-plugin-cisco']],
+            'server_packages': ['neutron-server',
+                                'neutron-plugin-cisco'],
+            'server_services': ['neutron-server']
         }
     }
     if release >= 'icehouse':
 
=== modified file 'tests/contrib/openstack/test_neutron_utils.py'
--- tests/contrib/openstack/test_neutron_utils.py	2014-05-03 06:40:08 +0000
+++ tests/contrib/openstack/test_neutron_utils.py	2014-06-19 17:11:58 +0000
@@ -47,22 +47,28 @@
     def test_quantum_plugins(self):
         self.config.return_value = 'foo'
         plugins = neutron.quantum_plugins()
-        self.assertEquals(plugins['ovs']['services'], ['quantum-plugin-openvswitch-agent'])
+        self.assertEquals(plugins['ovs']['services'],
+                          ['quantum-plugin-openvswitch-agent'])
         self.assertEquals(plugins['nvp']['services'], [])
 
     def test_neutron_plugins_preicehouse(self):
         self.config.return_value = 'foo'
         self.os_release.return_value = 'havana'
         plugins = neutron.neutron_plugins()
-        self.assertEquals(plugins['ovs']['config'], '/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini')
+        self.assertEquals(plugins['ovs']['config'],
+                          '/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini')
         self.assertEquals(plugins['nvp']['services'], [])
 
     def test_neutron_plugins(self):
         self.config.return_value = 'foo'
         self.os_release.return_value = 'icehouse'
         plugins = neutron.neutron_plugins()
-        self.assertEquals(plugins['ovs']['config'], '/etc/neutron/plugins/ml2/ml2_conf.ini')
-        self.assertEquals(plugins['nvp']['config'], '/etc/neutron/plugins/vmware/nsx.ini')
+        self.assertEquals(plugins['ovs']['config'],
+                          '/etc/neutron/plugins/ml2/ml2_conf.ini')
+        self.assertEquals(plugins['nvp']['config'],
+                          '/etc/neutron/plugins/vmware/nsx.ini')
+        self.assertEquals(plugins['n1kv']['config'],
+                          '/etc/neutron/plugins/cisco/cisco_plugins.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	2014-05-04 23:09:50 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2014-06-19 17:11:58 +0000
@@ -511,7 +511,8 @@
         }
         _open.assert_called_once_with(ssl_dir + '/rabbit-client-ca.pem', 'w')
         self.assertEquals(result, expected)
-        self.assertEquals([call(AMQP_RELATION_WITH_SSL['ssl_ca'])], self.b64decode.call_args_list)
+        self.assertEquals([call(AMQP_RELATION_WITH_SSL['ssl_ca'])],
+                          self.b64decode.call_args_list)
 
     def test_amqp_context_with_data_ssl_noca(self):
         '''Test amqp context with all required data with ssl but missing ca'''
@@ -880,6 +881,28 @@
             'neutron_security_groups': True,
             'local_ip': '10.0.0.1'}, neutron.nvp_ctxt())
 
+    @patch.object(context, 'config')
+    @patch.object(context.NeutronContext, 'neutron_security_groups')
+    @patch.object(context, 'unit_private_ip')
+    @patch.object(context, 'neutron_plugin_attribute')
+    def test_neutron_n1kv_plugin_context(self, attr, ip, sec_groups, config):
+        ip.return_value = '10.0.0.1'
+        sec_groups.__get__ = MagicMock(return_value=True)
+        attr.return_value = 'some.quantum.driver.class'
+        config.return_value = 'n1kv'
+        neutron = context.NeutronContext()
+        self.assertEquals({
+            'core_plugin':  'some.quantum.driver.class',
+            'neutron_plugin': 'n1kv',
+            'neutron_security_groups': True,
+            'local_ip': '10.0.0.1',
+            'config': 'some.quantum.driver.class',
+            'vsm_ip': 'n1kv',
+            'vsm_username': 'n1kv',
+            'vsm_password': 'n1kv',
+            'restrict_policy_profiles': 'n1kv',
+        }, neutron.n1kv_ctxt())
+
     @patch('charmhelpers.contrib.openstack.context.unit_get')
     @patch.object(context.NeutronContext, 'network_manager')
     def test_neutron_neutron_ctxt(self, mock_network_manager,
@@ -980,9 +1003,11 @@
     @patch.object(context.NeutronContext, 'plugin')
     @patch.object(context.NeutronContext, '_ensure_packages')
     @patch.object(context.NeutronContext, 'network_manager')
-    def test_neutron_main_context_gen_nvp_and_alchemy(self, mock_network_manager,
+    def test_neutron_main_context_gen_nvp_and_alchemy(self,
+                                                      mock_network_manager,
                                                       mock_ensure_packages,
-                                                      mock_plugin, mock_nvp_ctxt,
+                                                      mock_plugin,
+                                                      mock_nvp_ctxt,
                                                       mock_save_flag_file,
                                                       mock_neutron_ctxt):