Merge lp:~thedac/charm-helpers/nsx-updates into lp:charm-helpers

[David Ames]

Add support for Mitaka NSX

Update Neutron plugins for NSX on Mitaka

Update Neutron plugins for NSX on Mitaka

[Billy Olsen (billy-olsen)]

This looks good to me. +1.

review: Approve

[Ryan Beisner (1chb1n)]

review: Approve

=== modified file 'charmhelpers/contrib/openstack/neutron.py'
--- charmhelpers/contrib/openstack/neutron.py	2016-07-06 14:41:05 +0000
+++ charmhelpers/contrib/openstack/neutron.py	2016-08-12 22:59:45 +0000
@@ -245,6 +245,10 @@
             'networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2')
         plugins['plumgrid']['server_packages'].remove(
             'neutron-plugin-plumgrid')
+    if release >= 'mitaka':
+        plugins['nsx']['server_packages'].remove('neutron-plugin-vmware')
+        plugins['nsx']['server_packages'].append('python-vmware-nsx')
+        plugins['nsx']['config'] = '/etc/neutron/nsx.ini'
     return plugins
 
 
 
=== modified file 'tests/contrib/openstack/test_neutron_utils.py'
--- tests/contrib/openstack/test_neutron_utils.py	2016-02-10 14:07:13 +0000
+++ tests/contrib/openstack/test_neutron_utils.py	2016-08-12 22:59:45 +0000
@@ -69,6 +69,8 @@
                           '/etc/neutron/plugins/ml2/ml2_conf.ini')
         self.assertEquals(plugins['nvp']['config'],
                           '/etc/neutron/plugins/vmware/nsx.ini')
+        self.assertTrue('neutron-plugin-vmware' in
+                        plugins['nvp']['server_packages'])
         self.assertEquals(plugins['n1kv']['config'],
                           '/etc/neutron/plugins/cisco/cisco_plugins.ini')
         self.assertEquals(plugins['Calico']['config'],
@@ -77,6 +79,7 @@
                           '/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'])
 
@@ -84,6 +87,8 @@
         plugins = neutron.neutron_plugins()
         self.assertEquals(plugins['midonet']['driver'],
                           'neutron.plugins.midonet.plugin.MidonetPluginV2')
+        self.assertEquals(plugins['nsx']['config'],
+                          '/etc/neutron/plugins/vmware/nsx.ini')
 
         self.os_release.return_value = 'liberty'
         self.config.return_value = 'mem-1.9'
@@ -93,6 +98,14 @@
         self.assertTrue('python-networking-midonet' in
                         plugins['midonet']['server_packages'])
 
+        self.os_release.return_value = 'mitaka'
+        self.config.return_value = 'mem-1.9'
+        plugins = neutron.neutron_plugins()
+        self.assertEquals(plugins['nsx']['config'],
+                          '/etc/neutron/nsx.ini')
+        self.assertTrue('python-vmware-nsx' in
+                        plugins['nsx']['server_packages'])
+
     @patch.object(neutron, 'network_manager')
     def test_neutron_plugin_attribute_quantum(self, _network_manager):
         self.config.return_value = 'foo'