diff options
| author | Zuul <zuul@review.openstack.org> | 2018-07-02 00:42:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-07-02 00:42:58 +0000 |
| commit | 4ea64cad3fcc4897690bfb2c02d2b06d65db4dcf (patch) | |
| tree | acc91817822117efd362c628a6044d9e3c8595d1 | |
| parent | 54343e9c7e036170f2f0d640e577da3dc9099625 (diff) | |
| parent | 2337aa5a7f14b9e9f69743479e63840f969560dc (diff) | |
| download | nova-4ea64cad3fcc4897690bfb2c02d2b06d65db4dcf.tar.gz | |
Merge "manage: Remove dead code"
| -rw-r--r-- | nova/cmd/manage.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py index 4e736a667a..3f18946768 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) |