From c32258c77d365534ac7b70bccbadb60a6ea4be1e Mon Sep 17 00:00:00 2001 From: Brad Hall Date: Sun, 2 Oct 2011 08:20:50 -0700 Subject: Change network delete to delete by uuid or cidr With melange it will be possible to have overlapping cidrs so it would be better to specify the uuid of the network to delete. Change-Id: I6781225d587952cbab3387cd40164d8ac77c58d6 --- bin/nova-manage | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/nova-manage b/bin/nova-manage index f6b86360e..c6ec155e4 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -858,14 +858,26 @@ class NetworkCommands(object): network.cidr, network.cidr_v6) - @args('--network', dest="fixed_range", metavar='', + @args('--fixed_range', dest="fixed_range", metavar='', help='Network to delete') - def delete(self, fixed_range): + @args('--uuid', dest='uuid', metavar='', + help='UUID of network to delete') + def delete(self, fixed_range=None, uuid=None): """Deletes a network""" - # delete the network + if fixed_range is None and uuid is None: + raise Exception("Please specify either fixed_range or uuid") + net_manager = utils.import_object(FLAGS.network_manager) - net_manager.delete_network(context.get_admin_context(), fixed_range) + if "QuantumManager" in FLAGS.network_manager: + if uuid is None: + raise Exception("UUID is required to delete Quantum Networks") + if fixed_range: + raise Exception("Deleting by fixed_range is not supported " \ + "with the QuantumManager") + # delete the network + net_manager.delete_network(context.get_admin_context(), + fixed_range, uuid) @args('--network', dest="fixed_range", metavar='', help='Network to modify') -- cgit