openstack/python-openstackclient
Code Issues Proposed changes

Merge "Clean up args and help strings in server commands"

Browse Source
This commit is contained in:
Jenkins 2013-03-08 15:47:10 +00:00 committed by Gerrit Code Review
commit ec91bb617e
1 changed files with 9 additions and 9 deletions

18
openstackclient/compute/v2/server.py

@ -165,11 +165,11 @@ class CreateServer(show.ShowOne):
parser.add_argument( parser.add_argument(
'--user-data', '--user-data',
metavar='<user-data>', metavar='<user-data>',
help='User data file to be serverd by the metadata server') help='User data file to serve from the metadata server')
parser.add_argument( parser.add_argument(
'--availability-zone', '--availability-zone',
metavar='<zone-name>', metavar='<zone-name>',
help='Keypair to inject into this server') help='Select an availability zone for the server')
parser.add_argument( parser.add_argument(
'--block-device-mapping', '--block-device-mapping',
metavar='<dev-name=mapping>', metavar='<dev-name=mapping>',
@ -212,7 +212,7 @@ class CreateServer(show.ShowOne):
'--wait', '--wait',
dest='wait', dest='wait',
action='store_true', action='store_true',
help='Wait for server to become active to return') help='Wait for servers to become active')
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@ -362,10 +362,6 @@ class ListServer(lister.Lister):
'--name', '--name',
metavar='<name>', metavar='<name>',
help='regular expression to match name') help='regular expression to match name')
parser.add_argument(
'--instance-name',
metavar='<server-name>',
help='regular expression to match instance name')
parser.add_argument( parser.add_argument(
'--status', '--status',
metavar='<status>', metavar='<status>',
@ -383,6 +379,10 @@ class ListServer(lister.Lister):
'--host', '--host',
metavar='<hostname>', metavar='<hostname>',
help='search by hostname') help='search by hostname')
parser.add_argument(
'--instance-name',
metavar='<server-name>',
help='regular expression to match instance name (admin only)')
parser.add_argument( parser.add_argument(
'--all-tenants', '--all-tenants',
action='store_true', action='store_true',
@ -505,8 +505,8 @@ class RebuildServer(show.ShowOne):
required=True, required=True,
help='Recreate server from this image') help='Recreate server from this image')
parser.add_argument( parser.add_argument(
'--rebuild-password', '--password',
metavar='<rebuild_password>', metavar='<password>',
default=False, default=False,
help="Set the provided password on the rebuild instance") help="Set the provided password on the rebuild instance")
parser.add_argument( parser.add_argument(