From 4cbf0984f9e07cf0395d87492406bf61a82c967f Mon Sep 17 00:00:00 2001 From: Ewan Mellor Date: Fri, 13 Jan 2012 17:28:27 -0800 Subject: Bug #916312: nova-manage network modify --network flag is inconsistent. Change nova-manage network modify --network to --fixed_range, to match nova-manage network delete. Also document both. Change-Id: I3c03a33e9e3576393252d771eb4ce3353a7f2eaa --- bin/nova-manage | 2 +- doc/source/runnova/managing.networks.rst | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/bin/nova-manage b/bin/nova-manage index 30b62b2d8..faf585270 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -907,7 +907,7 @@ class NetworkCommands(object): net_manager.delete_network(context.get_admin_context(), fixed_range, uuid) - @args('--network', dest="fixed_range", metavar='', + @args('--fixed_range', dest="fixed_range", metavar='', help='Network to modify') @args('--project', dest="project", metavar='', help='Project name to associate') diff --git a/doc/source/runnova/managing.networks.rst b/doc/source/runnova/managing.networks.rst index 9eea46d70..f19d0b8ce 100644 --- a/doc/source/runnova/managing.networks.rst +++ b/doc/source/runnova/managing.networks.rst @@ -68,3 +68,20 @@ Network Management [network_size=FLAG], [vlan_start=FLAG], [vpn_start=FLAG] +* network modify: Associate/disassociate network with project and/or host. + + * :option:`--fixed_range=\` - Specify the network to modify by + IP range. Required. + * :option:`--project=\` - Project name to associate. + Optional. + * :option:`--host=\` - Host to associate. Optional. + * :option:`--disassociate-project` - Disassociate network from project. + Optional, mutually exclusive with :option:`--project`. + * :option:`--disassociate-host` - Disassociate host from project. + Optional, mutually exclusive with :option:`--host`. + +* network delete: Deletes a network. Precisely one of :option:`--fixed_range` + or :option:`--uuid` must be specified. + + * :option:`--fixed_range=\` - Specify the network by range. + * :option:`--uuid=\` - Specify the network by UUID. -- cgit