258c1102cc
Previously each command logs take_action parameters explicitly by using @utils.log_method decorator or log.debug(). Some commands have no logging. This commit calls a logger in the base class and drops all logging definition from individual commands. Closes-Bug: #1532294 Change-Id: I43cd0290a4353c68c075bade9571c940733da1be
142 lines
4.4 KiB
Python
142 lines
4.4 KiB
Python
# Copyright 2013 OpenStack Foundation
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
|
|
"""Keypair action implementations"""
|
|
|
|
import os
|
|
import six
|
|
import sys
|
|
|
|
from openstackclient.common import command
|
|
from openstackclient.common import exceptions
|
|
from openstackclient.common import utils
|
|
|
|
|
|
class CreateKeypair(command.ShowOne):
|
|
"""Create new public key"""
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(CreateKeypair, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'name',
|
|
metavar='<name>',
|
|
help='New public key name',
|
|
)
|
|
parser.add_argument(
|
|
'--public-key',
|
|
metavar='<file>',
|
|
help='Filename for public key to add',
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
compute_client = self.app.client_manager.compute
|
|
|
|
public_key = parsed_args.public_key
|
|
if public_key:
|
|
try:
|
|
with open(os.path.expanduser(parsed_args.public_key)) as p:
|
|
public_key = p.read()
|
|
except IOError as e:
|
|
msg = "Key file %s not found: %s"
|
|
raise exceptions.CommandError(msg
|
|
% (parsed_args.public_key, e))
|
|
|
|
keypair = compute_client.keypairs.create(
|
|
parsed_args.name,
|
|
public_key=public_key,
|
|
)
|
|
|
|
# NOTE(dtroyer): how do we want to handle the display of the private
|
|
# key when it needs to be communicated back to the user
|
|
# For now, duplicate nova keypair-add command output
|
|
info = {}
|
|
if public_key:
|
|
info.update(keypair._info)
|
|
del info['public_key']
|
|
return zip(*sorted(six.iteritems(info)))
|
|
else:
|
|
sys.stdout.write(keypair.private_key)
|
|
return ({}, {})
|
|
|
|
|
|
class DeleteKeypair(command.Command):
|
|
"""Delete public key"""
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(DeleteKeypair, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'name',
|
|
metavar='<key>',
|
|
help='Public key to delete',
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
compute_client = self.app.client_manager.compute
|
|
compute_client.keypairs.delete(parsed_args.name)
|
|
|
|
|
|
class ListKeypair(command.Lister):
|
|
"""List public key fingerprints"""
|
|
|
|
def take_action(self, parsed_args):
|
|
compute_client = self.app.client_manager.compute
|
|
columns = (
|
|
"Name",
|
|
"Fingerprint"
|
|
)
|
|
data = compute_client.keypairs.list()
|
|
|
|
return (columns,
|
|
(utils.get_item_properties(
|
|
s, columns,
|
|
) for s in data))
|
|
|
|
|
|
class ShowKeypair(command.ShowOne):
|
|
"""Display public key details"""
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(ShowKeypair, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'name',
|
|
metavar='<key>',
|
|
help='Public key to display',
|
|
)
|
|
parser.add_argument(
|
|
'--public-key',
|
|
action='store_true',
|
|
default=False,
|
|
help='Show only bare public key',
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
compute_client = self.app.client_manager.compute
|
|
keypair = utils.find_resource(compute_client.keypairs,
|
|
parsed_args.name)
|
|
|
|
info = {}
|
|
info.update(keypair._info)
|
|
if not parsed_args.public_key:
|
|
del info['public_key']
|
|
return zip(*sorted(six.iteritems(info)))
|
|
else:
|
|
# NOTE(dtroyer): a way to get the public key in a similar form
|
|
# as the private key in the create command
|
|
sys.stdout.write(keypair.public_key)
|
|
return ({}, {})
|