diff options
| author | Akihiro MOTOKI <motoki@da.jp.nec.com> | 2013-03-07 14:24:52 +0900 |
|---|---|---|
| committer | Akihiro MOTOKI <motoki@da.jp.nec.com> | 2013-03-07 14:24:52 +0900 |
| commit | f96219d67a56976e69a4b22d7efe7229d5e20345 (patch) | |
| tree | e9d2b4bc4a518f8289c688b5a777540d7893f2e2 | |
| parent | 3709182a4632d61338b3360a09acdab5b6d8750c (diff) | |
| download | python-neutronclient-f96219d67a56976e69a4b22d7efe7229d5e20345.tar.gz | |
Fix a description of floatingip-id in (dis)associate commands2.2.0
Fixes bug 1151328
Also makes positional parameters of Show/Update/Delete commands upper.
Change-Id: Ifc6b76954ad987379f765f346167bb73556034f1
| -rw-r--r-- | quantumclient/quantum/v2_0/__init__.py | 6 | ||||
| -rw-r--r-- | quantumclient/quantum/v2_0/floatingip.py | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/quantumclient/quantum/v2_0/__init__.py b/quantumclient/quantum/v2_0/__init__.py index 6101db9..0f48b9b 100644 --- a/quantumclient/quantum/v2_0/__init__.py +++ b/quantumclient/quantum/v2_0/__init__.py @@ -358,7 +358,7 @@ class UpdateCommand(QuantumCommand): def get_parser(self, prog_name): parser = super(UpdateCommand, self).get_parser(prog_name) parser.add_argument( - 'id', metavar=self.resource, + 'id', metavar=self.resource.upper(), help='ID or name of %s to update' % self.resource) self.add_known_arguments(parser) return parser @@ -407,7 +407,7 @@ class DeleteCommand(QuantumCommand): else: help_str = 'ID of %s to delete' parser.add_argument( - 'id', metavar=self.resource, + 'id', metavar=self.resource.upper(), help=help_str % self.resource) return parser @@ -550,7 +550,7 @@ class ShowCommand(QuantumCommand, show.ShowOne): else: help_str = 'ID of %s to look up' parser.add_argument( - 'id', metavar=self.resource, + 'id', metavar=self.resource.upper(), help=help_str % self.resource) return parser diff --git a/quantumclient/quantum/v2_0/floatingip.py b/quantumclient/quantum/v2_0/floatingip.py index f4141f3..3916527 100644 --- a/quantumclient/quantum/v2_0/floatingip.py +++ b/quantumclient/quantum/v2_0/floatingip.py @@ -102,11 +102,11 @@ class AssociateFloatingIP(QuantumCommand): def get_parser(self, prog_name): parser = super(AssociateFloatingIP, self).get_parser(prog_name) parser.add_argument( - 'floatingip_id', metavar='floatingip-id', - help='IP address of the floating IP to associate') + 'floatingip_id', metavar='FLOATINGIP_ID', + help='ID of the floating IP to associate') parser.add_argument( - 'port_id', - help='ID of the port to be associated with the floatingip') + 'port_id', metavar='PORT', + help='ID or name of the port to be associated with the floatingip') parser.add_argument( '--fixed-ip-address', help=('IP address on the port (only required if port has multiple' @@ -142,8 +142,8 @@ class DisassociateFloatingIP(QuantumCommand): def get_parser(self, prog_name): parser = super(DisassociateFloatingIP, self).get_parser(prog_name) parser.add_argument( - 'floatingip_id', metavar='floatingip-id', - help='IP address of the floating IP to associate') + 'floatingip_id', metavar='FLOATINGIP_ID', + help='ID of the floating IP to associate') return parser def run(self, parsed_args): |