From 15d3717e733aec9e8b6526a1abffd62f2da1e32b Mon Sep 17 00:00:00 2001
From: Jamie Lennox <jamielennox@redhat.com>
Date: Mon, 1 Jun 2015 17:43:56 +1000
Subject: [PATCH] Add EC2 support for identity v3 API
EC2 support is provided for the v2 identity API and is available in
almost exactly the same format in the v3 API and enabled by default.
Supporting EC2 in the v3 identity API in OSC will make it much easier to
transition devstack to a v3 only state.
Closes-Bug: 1236326
Change-Id: I52ff2020ef2fcbdc8a98280b73c6fd4a93bc8e0f
---
openstackclient/identity/v3/ec2creds.py | 196 ++++++++++++++++++++++++
setup.cfg | 5 +
2 files changed, 201 insertions(+)
create mode 100644 openstackclient/identity/v3/ec2creds.py
diff --git a/openstackclient/identity/v3/ec2creds.py b/openstackclient/identity/v3/ec2creds.py
new file mode 100644
index 0000000000..254cca78a5
--- /dev/null
+++ b/openstackclient/identity/v3/ec2creds.py
@@ -0,0 +1,196 @@
+# 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.
+
+"""Identity v3 EC2 Credentials action implementations"""
+
+import logging
+import six
+
+from cliff import command
+from cliff import lister
+from cliff import show
+
+from openstackclient.common import utils
+from openstackclient.i18n import _ # noqa
+
+
+class CreateEC2Creds(show.ShowOne):
+ """Create EC2 credentials"""
+
+ log = logging.getLogger(__name__ + ".CreateEC2Creds")
+
+ def get_parser(self, prog_name):
+ parser = super(CreateEC2Creds, self).get_parser(prog_name)
+ parser.add_argument(
+ '--project',
+ metavar='<project>',
+ help=_('Specify an alternate project'
+ ' (default: current authenticated project)'),
+ )
+ parser.add_argument(
+ '--user',
+ metavar='<user>',
+ help=_('Specify an alternate user'
+ ' (default: current authenticated user)'),
+ )
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug('take_action(%s)', parsed_args)
+ identity_client = self.app.client_manager.identity
+
+ if parsed_args.project:
+ project = utils.find_resource(
+ identity_client.projects,
+ parsed_args.project,
+ ).id
+ else:
+ # Get the project from the current auth
+ project = self.app.client_manager.auth_ref.project_id
+ if parsed_args.user:
+ user = utils.find_resource(
+ identity_client.users,
+ parsed_args.user,
+ ).id
+ else:
+ # Get the user from the current auth
+ user = self.app.client_manager.auth_ref.user_id
+
+ creds = identity_client.ec2.create(user, project)
+
+ info = {}
+ info.update(creds._info)
+
+ if 'tenant_id' in info:
+ info.update(
+ {'project_id': info.pop('tenant_id')}
+ )
+
+ return zip(*sorted(six.iteritems(info)))
+
+
+class DeleteEC2Creds(command.Command):
+ """Delete EC2 credentials"""
+
+ log = logging.getLogger(__name__ + '.DeleteEC2Creds')
+
+ def get_parser(self, prog_name):
+ parser = super(DeleteEC2Creds, self).get_parser(prog_name)
+ parser.add_argument(
+ 'access_key',
+ metavar='<access-key>',
+ help=_('Credentials access key'),
+ )
+ parser.add_argument(
+ '--user',
+ metavar='<user>',
+ help=_('Specify a user'),
+ )
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug('take_action(%s)', parsed_args)
+ identity_client = self.app.client_manager.identity
+
+ if parsed_args.user:
+ user = utils.find_resource(
+ identity_client.users,
+ parsed_args.user,
+ ).id
+ else:
+ # Get the user from the current auth
+ user = self.app.client_manager.auth_ref.user_id
+
+ identity_client.ec2.delete(user, parsed_args.access_key)
+
+
+class ListEC2Creds(lister.Lister):
+ """List EC2 credentials"""
+
+ log = logging.getLogger(__name__ + '.ListEC2Creds')
+
+ def get_parser(self, prog_name):
+ parser = super(ListEC2Creds, self).get_parser(prog_name)
+ parser.add_argument(
+ '--user',
+ metavar='<user>',
+ help=_('Specify a user'),
+ )
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug('take_action(%s)', parsed_args)
+ identity_client = self.app.client_manager.identity
+
+ if parsed_args.user:
+ user = utils.find_resource(
+ identity_client.users,
+ parsed_args.user,
+ ).id
+ else:
+ # Get the user from the current auth
+ user = self.app.client_manager.auth_ref.user_id
+
+ columns = ('access', 'secret', 'tenant_id', 'user_id')
+ column_headers = ('Access', 'Secret', 'Project ID', 'User ID')
+ data = identity_client.ec2.list(user)
+
+ return (column_headers,
+ (utils.get_item_properties(
+ s, columns,
+ formatters={},
+ ) for s in data))
+
+
+class ShowEC2Creds(show.ShowOne):
+ """Display EC2 credentials details"""
+
+ log = logging.getLogger(__name__ + '.ShowEC2Creds')
+
+ def get_parser(self, prog_name):
+ parser = super(ShowEC2Creds, self).get_parser(prog_name)
+ parser.add_argument(
+ 'access_key',
+ metavar='<access-key>',
+ help=_('Credentials access key'),
+ )
+ parser.add_argument(
+ '--user',
+ metavar='<user>',
+ help=_('Specify a user'),
+ )
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug('take_action(%s)', parsed_args)
+ identity_client = self.app.client_manager.identity
+
+ if parsed_args.user:
+ user = utils.find_resource(
+ identity_client.users,
+ parsed_args.user,
+ ).id
+ else:
+ # Get the user from the current auth
+ user = self.app.client_manager.auth_ref.user_id
+
+ creds = identity_client.ec2.get(user, parsed_args.access_key)
+
+ info = {}
+ info.update(creds._info)
+
+ if 'tenant_id' in info:
+ info.update(
+ {'project_id': info.pop('tenant_id')}
+ )
+
+ return zip(*sorted(six.iteritems(info)))
diff --git a/setup.cfg b/setup.cfg
index 8db7c3eae4..ce6a0b9b00 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -208,6 +208,11 @@ openstack.identity.v3 =
domain_set = openstackclient.identity.v3.domain:SetDomain
domain_show = openstackclient.identity.v3.domain:ShowDomain
+ ec2_credentials_create = openstackclient.identity.v3.ec2creds:CreateEC2Creds
+ ec2_credentials_delete = openstackclient.identity.v3.ec2creds:DeleteEC2Creds
+ ec2_credentials_list = openstackclient.identity.v3.ec2creds:ListEC2Creds
+ ec2_credentials_show = openstackclient.identity.v3.ec2creds:ShowEC2Creds
+
endpoint_create = openstackclient.identity.v3.endpoint:CreateEndpoint
endpoint_delete = openstackclient.identity.v3.endpoint:DeleteEndpoint
endpoint_set = openstackclient.identity.v3.endpoint:SetEndpoint