]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commit
NSX: allow net-migration only in combined mode
authorarmando-migliaccio <armamig@gmail.com>
Tue, 29 Apr 2014 01:27:04 +0000 (18:27 -0700)
committerThomas Goirand <thomas@goirand.fr>
Mon, 9 Jun 2014 15:06:55 +0000 (23:06 +0800)
commit4cd192c0255ee9f2f0503d538e90271923510953
tree7ffd84bc182197a80881ca8b3c5c0debfc1b2aec
parent1ef65cea7b15357eba5a03dcbe9bdf44a2679b46
NSX: allow net-migration only in combined mode

To allow migration of networks from the agent based model
to the agentless one, both modes need to be available; prior
to this change the extension was available in 'agentless' mode
too; this may lead to leftovers during the migration step.
This patch makes the extension available in 'combined' mode
only, which was the intended behavior.

Change-Id: I491ee3eaf25fc30c0ab4092ee198802a6b06d91d
Closes-bug: #1313985
(cherry picked from commit e737076c374d0743927782b6318132ecf226f05a)
neutron/plugins/vmware/dhcpmeta_modes.py
neutron/tests/unit/vmware/etc/nsx.ini.combined.test [new file with mode: 0644]
neutron/tests/unit/vmware/test_nsx_opts.py