From f96219d67a56976e69a4b22d7efe7229d5e20345 Mon Sep 17 00:00:00 2001 From: Akihiro MOTOKI Date: Thu, 7 Mar 2013 14:24:52 +0900 Subject: Fix a description of floatingip-id in (dis)associate commands Fixes bug 1151328 Also makes positional parameters of Show/Update/Delete commands upper. Change-Id: Ifc6b76954ad987379f765f346167bb73556034f1 --- quantumclient/quantum/v2_0/__init__.py | 6 +++--- 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): -- cgit v1.2.1