openstack/nova
Code Issues Proposed changes

Merge "manage: Remove dead code"

Browse Source
This commit is contained in:
Zuul 2018-07-02 00:42:58 +00:00 committed by Gerrit Code Review
commit 4ea64cad3f
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)