Merge "The 'nova keypair-show key_name' command added."
This commit is contained in:
commit
f41b76cf1b
|
@ -875,6 +875,9 @@ class FakeHTTPClient(base_client.HTTPClient):
|
||||||
#
|
#
|
||||||
# Keypairs
|
# Keypairs
|
||||||
#
|
#
|
||||||
|
def get_os_keypairs_test(self, *kw):
|
||||||
|
return (200, {}, {'keypair': self.get_os_keypairs()[2]['keypairs'][0]})
|
||||||
|
|
||||||
def get_os_keypairs(self, *kw):
|
def get_os_keypairs(self, *kw):
|
||||||
return (200, {}, {"keypairs": [
|
return (200, {}, {"keypairs": [
|
||||||
{'fingerprint': 'FAKE_KEYPAIR', 'name': 'test'}
|
{'fingerprint': 'FAKE_KEYPAIR', 'name': 'test'}
|
||||||
|
|
|
@ -8,6 +8,12 @@ cs = fakes.FakeClient()
|
||||||
|
|
||||||
class KeypairsTest(utils.TestCase):
|
class KeypairsTest(utils.TestCase):
|
||||||
|
|
||||||
|
def test_get_keypair(self):
|
||||||
|
kp = cs.keypairs.get('test')
|
||||||
|
cs.assert_called('GET', '/os-keypairs/test')
|
||||||
|
self.assertTrue(isinstance(kp, keypairs.Keypair))
|
||||||
|
self.assertEqual(kp.name, 'test')
|
||||||
|
|
||||||
def test_list_keypairs(self):
|
def test_list_keypairs(self):
|
||||||
kps = cs.keypairs.list()
|
kps = cs.keypairs.list()
|
||||||
cs.assert_called('GET', '/os-keypairs')
|
cs.assert_called('GET', '/os-keypairs')
|
||||||
|
|
|
@ -45,6 +45,15 @@ class Keypair(base.Resource):
|
||||||
class KeypairManager(base.ManagerWithFind):
|
class KeypairManager(base.ManagerWithFind):
|
||||||
resource_class = Keypair
|
resource_class = Keypair
|
||||||
|
|
||||||
|
def get(self, keypair):
|
||||||
|
"""
|
||||||
|
Get a keypair.
|
||||||
|
|
||||||
|
:param keypair: The ID of the keypair to get.
|
||||||
|
:rtype: :class:`Keypair`
|
||||||
|
"""
|
||||||
|
return self._get("/os-keypairs/%s" % base.getid(keypair), "keypair")
|
||||||
|
|
||||||
def create(self, name, public_key=None):
|
def create(self, name, public_key=None):
|
||||||
"""
|
"""
|
||||||
Create a keypair
|
Create a keypair
|
||||||
|
|
|
@ -2157,6 +2157,22 @@ def do_keypair_list(cs, args):
|
||||||
utils.print_list(keypairs, columns)
|
utils.print_list(keypairs, columns)
|
||||||
|
|
||||||
|
|
||||||
|
def _print_keypair(keypair):
|
||||||
|
kp = keypair._info.copy()
|
||||||
|
pk = kp.pop('public_key')
|
||||||
|
utils.print_dict(kp)
|
||||||
|
print "Public key: %s" % pk
|
||||||
|
|
||||||
|
|
||||||
|
@utils.arg('keypair',
|
||||||
|
metavar='<keypair>',
|
||||||
|
help="Name or ID of keypair")
|
||||||
|
def do_keypair_show(cs, args):
|
||||||
|
"""Show details about the given keypair."""
|
||||||
|
keypair = cs.keypairs.get(args.keypair)
|
||||||
|
_print_keypair(keypair)
|
||||||
|
|
||||||
|
|
||||||
@utils.arg('--reserved',
|
@utils.arg('--reserved',
|
||||||
dest='reserved',
|
dest='reserved',
|
||||||
action='store_true',
|
action='store_true',
|
||||||
|
|
Loading…
Reference in New Issue