diff --git a/openstackclient/identity/v3/credential.py b/openstackclient/identity/v3/credential.py
new file mode 100644
index 0000000000..c98260526e
--- /dev/null
+++ b/openstackclient/identity/v3/credential.py
@@ -0,0 +1,199 @@
+# Copyright 2012-2013 OpenStack, LLC.
+#
+# 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 Credential action implementations"""
+
+import logging
+import sys
+
+from cliff import command
+from cliff import lister
+from cliff import show
+
+from openstackclient.common import utils
+
+
+class CreateCredential(show.ShowOne):
+ """Create credential command"""
+
+ api = 'identity'
+ log = logging.getLogger(__name__ + '.CreateCredential')
+
+ def get_parser(self, prog_name):
+ parser = super(CreateCredential, self).get_parser(prog_name)
+ parser.add_argument(
+ 'user',
+ metavar='<user>',
+ help='Name or ID of user that owns the credential',
+ )
+ parser.add_argument(
+ '--type',
+ default="cert",
+ metavar='<type>',
+ choices=['ec2', 'cert'],
+ help='New credential type',
+ )
+ parser.add_argument(
+ 'data',
+ metavar='<data>',
+ help='New credential data',
+ )
+ parser.add_argument(
+ '--project',
+ metavar='<project>',
+ help='Project name or ID which limits the scope of the credential',
+ )
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug('take_action(%s)' % parsed_args)
+ identity_client = self.app.client_manager.identity
+ user_id = utils.find_resource(identity_client.users,
+ parsed_args.user).id
+ if parsed_args.project:
+ project = utils.find_resource(identity_client.projects,
+ parsed_args.project).id
+ else:
+ project = None
+ credential = identity_client.credentials.create(
+ user_id,
+ parsed_args.type,
+ parsed_args.data,
+ project=project)
+
+ return zip(*sorted(credential._info.iteritems()))
+
+
+class DeleteCredential(command.Command):
+ """Delete credential command"""
+
+ api = 'identity'
+ log = logging.getLogger(__name__ + '.DeleteCredential')
+
+ def get_parser(self, prog_name):
+ parser = super(DeleteCredential, self).get_parser(prog_name)
+ parser.add_argument(
+ 'credential',
+ metavar='<credential-id>',
+ help='ID of credential to delete',
+ )
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug('take_action(%s)' % parsed_args)
+ identity_client = self.app.client_manager.identity
+ identity_client.credentials.delete(parsed_args.credential)
+ return
+
+
+class ListCredential(lister.Lister):
+ """List credential command"""
+
+ api = 'identity'
+ log = logging.getLogger(__name__ + '.ListCredential')
+
+ def take_action(self, parsed_args):
+ self.log.debug('take_action(%s)' % parsed_args)
+ columns = ('ID', 'Type', 'User ID', 'Data', 'Project ID')
+ data = self.app.client_manager.identity.credentials.list()
+ return (columns,
+ (utils.get_item_properties(
+ s, columns,
+ formatters={},
+ ) for s in data))
+
+
+class SetCredential(command.Command):
+ """Set credential command"""
+
+ api = 'identity'
+ log = logging.getLogger(__name__ + '.SetCredential')
+
+ def get_parser(self, prog_name):
+ parser = super(SetCredential, self).get_parser(prog_name)
+ parser.add_argument(
+ 'credential',
+ metavar='<credential-id>',
+ help='ID of credential to change',
+ )
+ parser.add_argument(
+ '--user',
+ metavar='<user>',
+ help='Name or ID of user that owns the credential',
+ )
+ parser.add_argument(
+ '--type',
+ metavar='<type>',
+ choices=['ec2', 'cert'],
+ help='New credential type',
+ )
+ parser.add_argument(
+ '--data',
+ metavar='<data>',
+ help='New credential data',
+ )
+ parser.add_argument(
+ '--project',
+ metavar='<project>',
+ help='Project name or ID which limits the scope of the credential',
+ )
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug('take_action(%s)' % parsed_args)
+ identity_client = self.app.client_manager.identity
+ user_id = utils.find_resource(identity_client.users,
+ parsed_args.user).id
+ kwargs = {}
+ if user_id:
+ kwargs['user'] = user_id
+ if parsed_args.type:
+ kwargs['type'] = parsed_args.type
+ if parsed_args.data:
+ kwargs['data'] = parsed_args.data
+ if parsed_args.project:
+ project = utils.find_resource(identity_client.projects,
+ parsed_args.project).id
+ kwargs['project'] = project
+
+ if not kwargs:
+ sys.stdout.write("Credential not updated, no arguments present")
+ return
+ identity_client.credentials.update(parsed_args.credential, **kwargs)
+ return
+
+
+class ShowCredential(show.ShowOne):
+ """Show credential command"""
+
+ api = 'identity'
+ log = logging.getLogger(__name__ + '.ShowCredential')
+
+ def get_parser(self, prog_name):
+ parser = super(ShowCredential, self).get_parser(prog_name)
+ parser.add_argument(
+ 'credential',
+ metavar='<credential-id>',
+ help='ID of credential to display',
+ )
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug('take_action(%s)' % parsed_args)
+ identity_client = self.app.client_manager.identity
+ credential = utils.find_resource(identity_client.credentials,
+ parsed_args.credential)
+
+ return zip(*sorted(credential._info.iteritems()))
diff --git a/openstackclient/identity/v3/domain.py b/openstackclient/identity/v3/domain.py
new file mode 100644
index 0000000000..e3eaec2fbc
--- /dev/null
+++ b/openstackclient/identity/v3/domain.py
@@ -0,0 +1,193 @@
+# Copyright 2012-2013 OpenStack, LLC.
+#
+# 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 Domain action implementations"""
+
+import logging
+import sys
+
+from cliff import command
+from cliff import lister
+from cliff import show
+
+from openstackclient.common import utils
+
+
+class CreateDomain(show.ShowOne):
+ """Create domain command"""
+
+ api = 'identity'
+ log = logging.getLogger(__name__ + '.CreateDomain')
+
+ def get_parser(self, prog_name):
+ parser = super(CreateDomain, self).get_parser(prog_name)
+ parser.add_argument(
+ 'name',
+ metavar='<domain-name>',
+ help='New domain name',
+ )
+ parser.add_argument(
+ '--description',
+ metavar='<domain-description>',
+ help='New domain description',
+ )
+ enable_group = parser.add_mutually_exclusive_group()
+ enable_group.add_argument(
+ '--enable',
+ dest='enabled',
+ action='store_true',
+ default=True,
+ help='Enable domain')
+ enable_group.add_argument(
+ '--disable',
+ dest='enabled',
+ action='store_false',
+ help='Disable domain')
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug('take_action(%s)' % parsed_args)
+ identity_client = self.app.client_manager.identity
+ domain = identity_client.domains.create(
+ parsed_args.name,
+ parsed_args.description,
+ enabled=parsed_args.enabled,
+ )
+
+ return zip(*sorted(domain._info.iteritems()))
+
+
+class DeleteDomain(command.Command):
+ """Delete domain command"""
+
+ api = 'identity'
+ log = logging.getLogger(__name__ + '.DeleteDomain')
+
+ def get_parser(self, prog_name):
+ parser = super(DeleteDomain, self).get_parser(prog_name)
+ parser.add_argument(
+ 'domain',
+ metavar='<domain>',
+ help='Name or ID of domain to delete',
+ )
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug('take_action(%s)' % parsed_args)
+ identity_client = self.app.client_manager.identity
+ domain = utils.find_resource(identity_client.domains,
+ parsed_args.domain)
+ identity_client.domains.delete(domain.id)
+ return
+
+
+class ListDomain(lister.Lister):
+ """List domain command"""
+
+ api = 'identity'
+ log = logging.getLogger(__name__ + '.ListDomain')
+
+ def take_action(self, parsed_args):
+ self.log.debug('take_action(%s)' % parsed_args)
+ columns = ('ID', 'Name', 'Enabled', 'Description')
+ data = self.app.client_manager.identity.domains.list()
+ return (columns,
+ (utils.get_item_properties(
+ s, columns,
+ formatters={},
+ ) for s in data))
+
+
+class SetDomain(command.Command):
+ """Set domain command"""
+
+ api = 'identity'
+ log = logging.getLogger(__name__ + '.SetDomain')
+
+ def get_parser(self, prog_name):
+ parser = super(SetDomain, self).get_parser(prog_name)
+ parser.add_argument(
+ 'domain',
+ metavar='<domain>',
+ help='Name or ID of domain to change',
+ )
+ parser.add_argument(
+ '--name',
+ metavar='<new-domain-name>',
+ help='New domain name',
+ )
+ parser.add_argument(
+ '--description',
+ metavar='<domain-description>',
+ help='New domain description',
+ )
+ enable_group = parser.add_mutually_exclusive_group()
+ enable_group.add_argument(
+ '--enable',
+ dest='enabled',
+ action='store_true',
+ default=True,
+ help='Enable domain (default)',
+ )
+ enable_group.add_argument(
+ '--disable',
+ dest='enabled',
+ action='store_false',
+ help='Disable domain',
+ )
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug('take_action(%s)' % parsed_args)
+ identity_client = self.app.client_manager.identity
+ domain = utils.find_resource(identity_client.domains,
+ parsed_args.domain)
+ kwargs = {}
+ if parsed_args.name:
+ kwargs['name'] = parsed_args.name
+ if parsed_args.description:
+ kwargs['description'] = parsed_args.description
+ if 'enabled' in parsed_args:
+ kwargs['enabled'] = parsed_args.enabled
+
+ if not kwargs:
+ sys.stdout.write("Domain not updated, no arguments present")
+ return
+ identity_client.domains.update(domain.id, **kwargs)
+ return
+
+
+class ShowDomain(show.ShowOne):
+ """Show domain command"""
+
+ api = 'identity'
+ log = logging.getLogger(__name__ + '.ShowDomain')
+
+ def get_parser(self, prog_name):
+ parser = super(ShowDomain, self).get_parser(prog_name)
+ parser.add_argument(
+ 'domain',
+ metavar='<domain>',
+ help='Name or ID of domain to display',
+ )
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug('take_action(%s)' % parsed_args)
+ identity_client = self.app.client_manager.identity
+ domain = utils.find_resource(identity_client.domains,
+ parsed_args.domain)
+
+ return zip(*sorted(domain._info.iteritems()))
diff --git a/setup.py b/setup.py
index e4ea3f93d3..f91f9eaa26 100644
--- a/setup.py
+++ b/setup.py
@@ -117,6 +117,21 @@ setuptools.setup(
'list_user=openstackclient.identity.v3.user:ListUser',
'set_user=openstackclient.identity.v3.user:SetUser',
'show_user=openstackclient.identity.v3.user:ShowUser',
+ 'create_credential=' +
+ 'openstackclient.identity.v3.credential:CreateCredential',
+ 'delete_credential=' +
+ 'openstackclient.identity.v3.credential:DeleteCredential',
+ 'set_credential=' +
+ 'openstackclient.identity.v3.credential:SetCredential',
+ 'show_credential=' +
+ 'openstackclient.identity.v3.credential:ShowCredential',
+ 'list_credential=' +
+ 'openstackclient.identity.v3.credential:ListCredential',
+ 'create_domain=openstackclient.identity.v3.domain:CreateDomain',
+ 'delete_domain=openstackclient.identity.v3.domain:DeleteDomain',
+ 'set_domain=openstackclient.identity.v3.domain:SetDomain',
+ 'show_domain=openstackclient.identity.v3.domain:ShowDomain',
+ 'list_domain=openstackclient.identity.v3.domain:ListDomain',
],
'openstack.image.v2': [
'list_image=openstackclient.image.v2.image:ListImage',