From 2337aa5a7f14b9e9f69743479e63840f969560dc Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 29 Jun 2018 11:46:43 +0100 Subject: [PATCH] manage: Remove dead code 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 --- nova/cmd/manage.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py index 4e736a667a0d..3f18946768c0 100644 --- a/nova/cmd/manage.py +++ b/nova/cmd/manage.py @@ -311,13 +311,7 @@ class NetworkCommands(object): raise Exception(_("Please specify either fixed_range or uuid")) 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 net_manager.delete_network(context.get_admin_context(), fixed_range, uuid)