Merge "Add compute keypair commands"

openstackclient/compute/v2/keypair.py

@@ -0,0 +1,160 @@
+#   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 logging
+import os
+import sys
+
+from cliff import command
+from cliff import lister
+from cliff import show
+
+from openstackclient.common import exceptions
+from openstackclient.common import utils
+
+
+class CreateKeypair(show.ShowOne):
+    """Create keypair command"""
+
+    api = "compute"
+    log = logging.getLogger(__name__ + '.CreateKeypair')
+
+    def get_parser(self, prog_name):
+        parser = super(CreateKeypair, self).get_parser(prog_name)
+        parser.add_argument(
+            'name',
+            metavar='<name>',
+            help='New keypair name',
+        )
+        parser.add_argument(
+            '--public-key',
+            metavar='<file>',
+            help='Filename for public key to add',
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug('take_action(%s)' % 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:
+                raise exceptions.CommandError(
+                    "Key file %s not found: %s" % (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(info.iteritems()))
+        else:
+            sys.stdout.write(keypair.private_key)
+            return ({}, {})
+
+
+class DeleteKeypair(command.Command):
+    """Delete keypair command"""
+
+    api = "compute"
+    log = logging.getLogger(__name__ + '.DeleteKeypair')
+
+    def get_parser(self, prog_name):
+        parser = super(DeleteKeypair, self).get_parser(prog_name)
+        parser.add_argument(
+            'name',
+            metavar='<name>',
+            help='Name of keypair to delete',
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug('take_action(%s)' % parsed_args)
+        compute_client = self.app.client_manager.compute
+        compute_client.keypairs.delete(parsed_args.name)
+        return
+
+
+class ListKeypair(lister.Lister):
+    """List keypair command"""
+
+    api = "compute"
+    log = logging.getLogger(__name__ + ".ListKeypair")
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)" % 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(show.ShowOne):
+    """Show keypair command"""
+
+    api = 'compute'
+    log = logging.getLogger(__name__ + '.ShowKeypair')
+
+    def get_parser(self, prog_name):
+        parser = super(ShowKeypair, self).get_parser(prog_name)
+        parser.add_argument(
+            'name',
+            metavar='<name>',
+            help='Name of keypair to display',
+        )
+        parser.add_argument(
+            '--public-key',
+            action='store_true',
+            default=False,
+            help='Include public key in output',
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug('take_action(%s)' % parsed_args)
+        compute_client = self.app.client_manager.compute
+        keypair = utils.find_resource(compute_client.keypairs,
+                                      parsed_args.name)
+
+        info = {}
+        info.update(keypair._info['keypair'])
+        if not parsed_args.public_key:
+            del info['public_key']
+            return zip(*sorted(info.iteritems()))
+        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 ({}, {})

setup.py

@@ -223,6 +223,15 @@ setuptools.setup(
             'show_hypervisor='
                 'openstackclient.compute.v2.hypervisor:ShowHypervisor',
 
+            'create_keypair='
+                'openstackclient.compute.v2.keypair:CreateKeypair',
+            'delete_keypair='
+                'openstackclient.compute.v2.keypair:DeleteKeypair',
+            'list_keypair='
+                'openstackclient.compute.v2.keypair:ListKeypair',
+            'show_keypair='
+                'openstackclient.compute.v2.keypair:ShowKeypair',
+
             'create_server=openstackclient.compute.v2.server:CreateServer',
             'delete_server=openstackclient.compute.v2.server:DeleteServer',
             'list_server=openstackclient.compute.v2.server:ListServer',