diff options
| author | Ewan Mellor <ewan.mellor@citrix.com> | 2012-01-13 17:28:27 -0800 |
|---|---|---|
| committer | Ewan Mellor <ewan.mellor@citrix.com> | 2012-01-24 13:41:42 -0800 |
| commit | 4cbf0984f9e07cf0395d87492406bf61a82c967f (patch) | |
| tree | 6cd27307e9961c4e51fad84e4b0e905774e7dc4a | |
| parent | 39d8311e6532e8da32bb85ebe027a3b6c9c817ee (diff) | |
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
| -rwxr-xr-x | bin/nova-manage | 2 | ||||
| -rw-r--r-- | doc/source/runnova/managing.networks.rst | 17 |
2 files changed, 18 insertions, 1 deletions
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='<x.x.x.x/yy>', + @args('--fixed_range', dest="fixed_range", metavar='<x.x.x.x/yy>', help='Network to modify') @args('--project', dest="project", metavar='<project name>', 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=\<IP range\>` - Specify the network to modify by + IP range. Required. + * :option:`--project=\<project name\>` - Project name to associate. + Optional. + * :option:`--host=\<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=\<IP range\>` - Specify the network by range. + * :option:`--uuid=\<UUID\>` - Specify the network by UUID. |