Charm Helpers

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

  1. nsx-updates
  2. Merge into devel
Proposed by David Ames
Status: Merged
Merged at revision: 619
Proposed branch: lp:~thedac/charm-helpers/nsx-updates
Merge into: lp:charm-helpers
Diff against target: 59 lines (+17/-0)
2 files modified
charmhelpers/contrib/openstack/neutron.py (+4/-0)
tests/contrib/openstack/test_neutron_utils.py (+13/-0)
To merge this branch: bzr merge lp:~thedac/charm-helpers/nsx-updates
Reviewer Review Type Date Requested Status
Ryan Beisner (community) Approve
Billy Olsen Approve
Review via email: mp+302863@code.launchpad.net

Commit message

Add support for Mitaka NSX

Update Neutron plugins for NSX on Mitaka

Description of the change

Update Neutron plugins for NSX on Mitaka

To post a comment you must log in.
Revision history for this message
Billy Olsen (billy-olsen) wrote :

This looks good to me. +1.

review: Approve
Revision history for this message
Ryan Beisner (1chb1n) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/neutron.py'
2--- charmhelpers/contrib/openstack/neutron.py 2016-07-06 14:41:05 +0000
3+++ charmhelpers/contrib/openstack/neutron.py 2016-08-12 22:59:45 +0000
4@@ -245,6 +245,10 @@
5 'networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2')
6 plugins['plumgrid']['server_packages'].remove(
7 'neutron-plugin-plumgrid')
8+ if release >= 'mitaka':
9+ plugins['nsx']['server_packages'].remove('neutron-plugin-vmware')
10+ plugins['nsx']['server_packages'].append('python-vmware-nsx')
11+ plugins['nsx']['config'] = '/etc/neutron/nsx.ini'
12 return plugins
13
14
15
16=== modified file 'tests/contrib/openstack/test_neutron_utils.py'
17--- tests/contrib/openstack/test_neutron_utils.py 2016-02-10 14:07:13 +0000
18+++ tests/contrib/openstack/test_neutron_utils.py 2016-08-12 22:59:45 +0000
19@@ -69,6 +69,8 @@
20 '/etc/neutron/plugins/ml2/ml2_conf.ini')
21 self.assertEquals(plugins['nvp']['config'],
22 '/etc/neutron/plugins/vmware/nsx.ini')
23+ self.assertTrue('neutron-plugin-vmware' in
24+ plugins['nvp']['server_packages'])
25 self.assertEquals(plugins['n1kv']['config'],
26 '/etc/neutron/plugins/cisco/cisco_plugins.ini')
27 self.assertEquals(plugins['Calico']['config'],
28@@ -77,6 +79,7 @@
29 '/etc/neutron/plugins/plumgrid/plumgrid.ini')
30 self.assertEquals(plugins['midonet']['config'],
31 '/etc/neutron/plugins/midonet/midonet.ini')
32+
33 self.assertEquals(plugins['nvp']['services'], [])
34 self.assertEquals(plugins['nsx'], plugins['nvp'])
35
36@@ -84,6 +87,8 @@
37 plugins = neutron.neutron_plugins()
38 self.assertEquals(plugins['midonet']['driver'],
39 'neutron.plugins.midonet.plugin.MidonetPluginV2')
40+ self.assertEquals(plugins['nsx']['config'],
41+ '/etc/neutron/plugins/vmware/nsx.ini')
42
43 self.os_release.return_value = 'liberty'
44 self.config.return_value = 'mem-1.9'
45@@ -93,6 +98,14 @@
46 self.assertTrue('python-networking-midonet' in
47 plugins['midonet']['server_packages'])
48
49+ self.os_release.return_value = 'mitaka'
50+ self.config.return_value = 'mem-1.9'
51+ plugins = neutron.neutron_plugins()
52+ self.assertEquals(plugins['nsx']['config'],
53+ '/etc/neutron/nsx.ini')
54+ self.assertTrue('python-vmware-nsx' in
55+ plugins['nsx']['server_packages'])
56+
57 @patch.object(neutron, 'network_manager')
58 def test_neutron_plugin_attribute_quantum(self, _network_manager):
59 self.config.return_value = 'foo'

Subscribers

People subscribed via source and target branches