openstack/nova
Code Issues Proposed changes

manage: Remove dead code

Browse Source 
There is code here to handle 'CONF.network_manager' being set to
'NeutronManager'. This is a long-dead pattern, having been replaced by
the 'use_neutron' option, and would never be called given that the
'validate_network_plugin' decorator ensures the functions can only be
used for nova-network. Just remove it.

Change-Id: I1dbfe3a0d9ef15176b17c7a959c68c6b8be879fa
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
Stephen Finucane 2018-06-29 11:46:43 +01:00
parent d68b9113a5
commit 2337aa5a7f
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/cmd/manage.py
View File

@ -311,13 +311,7 @@ class NetworkCommands(object):
raise Exception(_("Please specify either fixed_range or uuid")) raise Exception(_("Please specify either fixed_range or uuid"))
net_manager = importutils.import_object(CONF.network_manager) net_manager = importutils.import_object(CONF.network_manager)
if "NeutronManager" in CONF.network_manager:
if uuid is None:
raise Exception(_("UUID is required to delete "
"Neutron Networks"))
if fixed_range:
raise Exception(_("Deleting by fixed_range is not supported "
"with the NeutronManager"))
# delete the network # delete the network
net_manager.delete_network(context.get_admin_context(), net_manager.delete_network(context.get_admin_context(),
fixed_range, uuid) fixed_range, uuid)