Merge lp:~james-page/charm-helpers/vmware-nsx-updates into lp:charm-helpers

[James Page]

Update to support use of NVP/NSX with icehouse openstack release.

[lp:~james-page/charm-helpers/vmware-nsx-updates]

150. By James Page on 2014-05-04

Rebase

[Liam Young (gnuoy)]

lgtm

review: Approve

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2014-04-02 12:17:07 +0000
+++ charmhelpers/contrib/openstack/context.py	2014-05-04 23:10:01 +0000
@@ -570,7 +570,7 @@
 
         if self.plugin == 'ovs':
             ctxt.update(self.ovs_ctxt())
-        elif self.plugin == 'nvp':
+        elif self.plugin in ['nvp', 'nsx']:
             ctxt.update(self.nvp_ctxt())
 
         alchemy_flags = config('neutron-alchemy-flags')
 
=== modified file 'charmhelpers/contrib/openstack/neutron.py'
--- charmhelpers/contrib/openstack/neutron.py	2014-03-26 10:26:36 +0000
+++ charmhelpers/contrib/openstack/neutron.py	2014-05-04 23:10:01 +0000
@@ -114,14 +114,30 @@
             'server_packages': ['neutron-server',
                                 'neutron-plugin-nicira'],
             'server_services': ['neutron-server']
+        },
+        'nsx': {
+            'config': '/etc/neutron/plugins/vmware/nsx.ini',
+            'driver': 'vmware',
+            'contexts': [
+                context.SharedDBContext(user=config('neutron-database-user'),
+                                        database=config('neutron-database'),
+                                        relation_prefix='neutron',
+                                        ssl_dir=NEUTRON_CONF_DIR)],
+            'services': [],
+            'packages': [],
+            'server_packages': ['neutron-server',
+                                'neutron-plugin-vmware'],
+            'server_services': ['neutron-server']
         }
     }
-    # NOTE: patch in ml2 plugin for icehouse onwards
     if release >= 'icehouse':
+        # NOTE: patch in ml2 plugin for icehouse onwards
         plugins['ovs']['config'] = '/etc/neutron/plugins/ml2/ml2_conf.ini'
         plugins['ovs']['driver'] = 'neutron.plugins.ml2.plugin.Ml2Plugin'
         plugins['ovs']['server_packages'] = ['neutron-server',
                                              'neutron-plugin-ml2']
+        # NOTE: patch in vmware renames nvp->nsx for icehouse onwards
+        plugins['nvp'] = plugins['nsx']
     return plugins
 
 
 
=== modified file 'tests/contrib/openstack/test_neutron_utils.py'
--- tests/contrib/openstack/test_neutron_utils.py	2014-04-07 08:42:55 +0000
+++ tests/contrib/openstack/test_neutron_utils.py	2014-05-04 23:10:01 +0000
@@ -52,17 +52,19 @@
 
     def test_neutron_plugins_preicehouse(self):
         self.config.return_value = 'foo'
-        self.os_release .return_value = 'havana'
+        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['nvp']['services'], [])
 
     def test_neutron_plugins(self):
         self.config.return_value = 'foo'
-        self.os_release .return_value = 'icehouse'
+        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['nvp']['services'], [])
+        self.assertEquals(plugins['nsx'], plugins['nvp'])
 
     @patch.object(neutron, 'network_manager')
     def test_neutron_plugin_attribute_quantum(self, _network_manager):
@@ -74,7 +76,7 @@
     @patch.object(neutron, 'network_manager')
     def test_neutron_plugin_attribute_neutron(self, _network_manager):
         self.config.return_value = 'foo'
-        self.os_release .return_value = 'icehouse'
+        self.os_release.return_value = 'icehouse'
         _network_manager.return_value = 'neutron'
         plugins = neutron.neutron_plugin_attribute('ovs', 'services')
         self.assertEquals(plugins, ['neutron-plugin-openvswitch-agent'])