openstack/python-novaclient
Code Issues Proposed changes

Merge "remove start_version arg for keypairs v2.10 shell"

Browse Source
This commit is contained in:
Jenkins
2016-08-05 00:28:14 +00:00
committed by Gerrit Code Review
parent e78cc20514 5694a9a0f2
commit 4c9810c173
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
novaclient/v2/shell.py
View File

@@ -3095,8 +3095,7 @@ def do_keypair_delete(cs, args):
'--user', '--user',
metavar='<user-id>', metavar='<user-id>',
default=None, default=None,
help=_('ID of key-pair owner (Admin only).'), help=_('ID of key-pair owner (Admin only).'))
start_version="2.10")
def do_keypair_delete(cs, args): def do_keypair_delete(cs, args):
"""Delete keypair given by its name.""" """Delete keypair given by its name."""
cs.keypairs.delete(args.name, args.user) cs.keypairs.delete(args.name, args.user)
@@ -3125,8 +3124,7 @@ def do_keypair_list(cs, args):
'--user', '--user',
metavar='<user-id>', metavar='<user-id>',
default=None, default=None,
help=_('List key-pairs of specified user ID (Admin only).'), help=_('List key-pairs of specified user ID (Admin only).'))
start_version="2.10")
def do_keypair_list(cs, args): def do_keypair_list(cs, args):
"""Print a list of keypairs for a user""" """Print a list of keypairs for a user"""
keypairs = cs.keypairs.list(args.user) keypairs = cs.keypairs.list(args.user)
@@ -3161,8 +3159,7 @@ def do_keypair_show(cs, args):
'--user', '--user',
metavar='<user-id>', metavar='<user-id>',
default=None, default=None,
help=_('ID of key-pair owner (Admin only).'), help=_('ID of key-pair owner (Admin only).'))
start_version="2.10")
def do_keypair_show(cs, args): def do_keypair_show(cs, args):
"""Show details about the given keypair.""" """Show details about the given keypair."""
keypair = cs.keypairs.get(args.keypair, args.user) keypair = cs.keypairs.get(args.keypair, args.user)