From 8898e020fb874871e4d120e686abac0a94afd392 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Mon, 9 Sep 2013 14:55:07 -0500
Subject: [PATCH] Identity v3 tests
* Add project, user, role and service v3 tests
* Fix issues in commands with enable/disable
* Make commands and tests more consistent between versions
* Make formatting and comments more consistent
Change-Id: Id21e7a5abd7e421a7742f937861ec46b53095fc7
---
openstackclient/identity/v2_0/role.py | 10 +-
openstackclient/identity/v3/project.py | 129 ++-
openstackclient/identity/v3/role.py | 189 +++-
openstackclient/identity/v3/service.py | 113 +-
openstackclient/identity/v3/user.py | 86 +-
.../tests/identity/v2_0/test_role.py | 10 +-
openstackclient/tests/identity/v3/__init__.py | 14 +
openstackclient/tests/identity/v3/fakes.py | 106 ++
.../tests/identity/v3/test_identity.py | 31 +
.../tests/identity/v3/test_project.py | 531 ++++++++++
.../tests/identity/v3/test_role.py | 550 ++++++++++
.../tests/identity/v3/test_service.py | 408 ++++++++
.../tests/identity/v3/test_user.py | 986 ++++++++++++++++++
13 files changed, 2981 insertions(+), 182 deletions(-)
create mode 100644 openstackclient/tests/identity/v3/__init__.py
create mode 100644 openstackclient/tests/identity/v3/fakes.py
create mode 100644 openstackclient/tests/identity/v3/test_identity.py
create mode 100644 openstackclient/tests/identity/v3/test_project.py
create mode 100644 openstackclient/tests/identity/v3/test_role.py
create mode 100644 openstackclient/tests/identity/v3/test_service.py
create mode 100644 openstackclient/tests/identity/v3/test_user.py
diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py
index 60a1f947fe..fdf211082d 100644
--- a/openstackclient/identity/v2_0/role.py
+++ b/openstackclient/identity/v2_0/role.py
@@ -103,13 +103,19 @@ class DeleteRole(command.Command):
parser.add_argument(
'role',
metavar='<role>',
- help='Name or ID of role to delete')
+ help='Name or ID of role 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
- role = utils.find_resource(identity_client.roles, parsed_args.role)
+
+ role = utils.find_resource(
+ identity_client.roles,
+ parsed_args.role,
+ )
+
identity_client.roles.delete(role.id)
return
diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py
index 05722b54d1..f245a88898 100644
--- a/openstackclient/identity/v3/project.py
+++ b/openstackclient/identity/v3/project.py
@@ -17,7 +17,6 @@
import logging
import six
-import sys
from cliff import command
from cliff import lister
@@ -27,38 +26,38 @@ from openstackclient.common import utils
class CreateProject(show.ShowOne):
- """Create project command"""
+ """Create new project"""
log = logging.getLogger(__name__ + '.CreateProject')
def get_parser(self, prog_name):
parser = super(CreateProject, self).get_parser(prog_name)
parser.add_argument(
- 'project_name',
+ 'name',
metavar='<project-name>',
- help='New project name')
+ help='New project name',
+ )
parser.add_argument(
'--domain',
metavar='<project-domain>',
- help='References the domain name or ID which owns the project')
+ help='Domain owning the project (name or ID)',
+ )
parser.add_argument(
'--description',
metavar='<project-description>',
- help='New project description')
- # FIXME (stevemar): need to update enabled/disabled as per Dolph's
- # comments in 19999/4
+ help='New project description',
+ )
enable_group = parser.add_mutually_exclusive_group()
enable_group.add_argument(
'--enable',
- dest='enabled',
action='store_true',
- default=True,
- help='Enable project')
+ help='Enable project',
+ )
enable_group.add_argument(
'--disable',
- dest='enabled',
- action='store_false',
- help='Disable project')
+ action='store_true',
+ help='Disable project',
+ )
return parser
def take_action(self, parsed_args):
@@ -66,16 +65,23 @@ class CreateProject(show.ShowOne):
identity_client = self.app.client_manager.identity
if parsed_args.domain:
- domain = utils.find_resource(identity_client.domains,
- parsed_args.domain).id
+ domain = utils.find_resource(
+ identity_client.domains,
+ parsed_args.domain,
+ ).id
else:
domain = None
+ enabled = True
+ if parsed_args.disable:
+ enabled = False
+
project = identity_client.projects.create(
- parsed_args.project_name,
- domain=domain,
+ parsed_args.name,
+ domain,
description=parsed_args.description,
- enabled=parsed_args.enabled)
+ enabled=enabled,
+ )
info = {}
info.update(project._info)
@@ -83,7 +89,7 @@ class CreateProject(show.ShowOne):
class DeleteProject(command.Command):
- """Delete project command"""
+ """Delete project"""
log = logging.getLogger(__name__ + '.DeleteProject')
@@ -92,20 +98,25 @@ class DeleteProject(command.Command):
parser.add_argument(
'project',
metavar='<project>',
- help='Name or ID of project to delete')
+ help='Project to delete (name or ID)',
+ )
return parser
def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
- project = utils.find_resource(identity_client.projects,
- parsed_args.project)
+
+ project = utils.find_resource(
+ identity_client.projects,
+ parsed_args.project,
+ )
+
identity_client.projects.delete(project.id)
return
class ListProject(lister.Lister):
- """List project command"""
+ """List projects"""
log = logging.getLogger(__name__ + '.ListProject')
@@ -115,7 +126,8 @@ class ListProject(lister.Lister):
'--long',
action='store_true',
default=False,
- help='Additional fields are listed in output')
+ help='List additional fields in output',
+ )
return parser
def take_action(self, parsed_args):
@@ -133,7 +145,7 @@ class ListProject(lister.Lister):
class SetProject(command.Command):
- """Set project command"""
+ """Set project properties"""
log = logging.getLogger(__name__ + '.SetProject')
@@ -142,54 +154,75 @@ class SetProject(command.Command):
parser.add_argument(
'project',
metavar='<project>',
- help='Name or ID of project to change')
+ help='Project to change (name or ID)',
+ )
parser.add_argument(
'--name',
metavar='<new-project-name>',
- help='New project name')
+ help='New project name',
+ )
parser.add_argument(
'--domain',
metavar='<project-domain>',
- help='New domain name or ID that will now own the project')
+ help='New domain owning the project (name or ID)',
+ )
parser.add_argument(
'--description',
metavar='<project-description>',
- help='New project description')
+ help='New project description',
+ )
enable_group = parser.add_mutually_exclusive_group()
enable_group.add_argument(
'--enable',
- dest='enabled',
action='store_true',
- default=True,
- help='Enable project (default)')
+ help='Enable project',
+ )
enable_group.add_argument(
'--disable',
- dest='enabled',
- action='store_false',
- help='Disable project')
+ action='store_true',
+ help='Disable project',
+ )
return parser
def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
- project = utils.find_resource(identity_client.projects,
- parsed_args.project)
- kwargs = {}
+
+ if (not parsed_args.name
+ and not parsed_args.description
+ and not parsed_args.domain
+ and not parsed_args.enable
+ and not parsed_args.disable):
+ return
+
+ project = utils.find_resource(
+ identity_client.projects,
+ parsed_args.project,
+ )
+
+ kwargs = project._info
if parsed_args.name:
kwargs['name'] = parsed_args.name
if parsed_args.domain:
- domain = utils.find_resource(
- identity_client.domains, parsed_args.domain).id
- kwargs['domain'] = domain
+ kwargs['domain'] = utils.find_resource(
+ identity_client.domains,
+ parsed_args.domain,
+ ).id
if parsed_args.description:
kwargs['description'] = parsed_args.description
- if 'enabled' in parsed_args:
- kwargs['enabled'] = parsed_args.enabled
+ if parsed_args.enable:
+ kwargs['enabled'] = True
+ if parsed_args.disable:
+ kwargs['enabled'] = False
+ if 'id' in kwargs:
+ del kwargs['id']
+ if 'domain_id' in kwargs:
+ # Hack around borken Identity API arg names
+ kwargs.update(
+ {'domain': kwargs.pop('domain_id')}
+ )
- if kwargs == {}:
- sys.stdout.write("Project not updated, no arguments present")
- return
- project.update(**kwargs)
+ identity_client.projects.update(project.id, **kwargs)
return
diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py
index 5403d4cb8c..05bdbbfc01 100644
--- a/openstackclient/identity/v3/role.py
+++ b/openstackclient/identity/v3/role.py
@@ -53,7 +53,6 @@ class AddRole(command.Command):
domain_or_project.add_argument(
'--domain',
metavar='<domain>',
- default='default',
help='Name or ID of domain associated with user or group',
)
domain_or_project.add_argument(
@@ -69,36 +68,69 @@ class AddRole(command.Command):
if (not parsed_args.user and not parsed_args.domain
and not parsed_args.group and not parsed_args.project):
- sys.stderr.write("Role not added, no arguments present\n")
return
- role_id = utils.find_resource(identity_client.roles,
- parsed_args.role).id
+ role = utils.find_resource(
+ identity_client.roles,
+ parsed_args.role,
+ )
if parsed_args.user and parsed_args.domain:
- user = utils.find_resource(identity_client.users,
- parsed_args.user)
- domain = utils.find_resource(identity_client.domains,
- parsed_args.domain)
- identity_client.roles.grant(role_id, user=user, domain=domain)
+ user = utils.find_resource(
+ identity_client.users,
+ parsed_args.user,
+ )
+ domain = utils.find_resource(
+ identity_client.domains,
+ parsed_args.domain,
+ )
+ identity_client.roles.grant(
+ role.id,
+ user=user.id,
+ domain=domain.id,
+ )
elif parsed_args.user and parsed_args.project:
- user = utils.find_resource(identity_client.users,
- parsed_args.user)
- project = utils.find_resource(identity_client.projects,
- parsed_args.project)
- identity_client.roles.grant(role_id, user=user, project=project)
+ user = utils.find_resource(
+ identity_client.users,
+ parsed_args.user,
+ )
+ project = utils.find_resource(
+ identity_client.projects,
+ parsed_args.project,
+ )
+ identity_client.roles.grant(
+ role.id,
+ user=user.id,
+ project=project.id,
+ )
elif parsed_args.group and parsed_args.domain:
- group = utils.find_resource(identity_client.groups,
- parsed_args.group)
- domain = utils.find_resource(identity_client.domains,
- parsed_args.domain)
- identity_client.roles.grant(role_id, group=group, domain=domain)
+ group = utils.find_resource(
+ identity_client.groups,
+ parsed_args.group,
+ )
+ domain = utils.find_resource(
+ identity_client.domains,
+ parsed_args.domain,
+ )
+ identity_client.roles.grant(
+ role.id,
+ group=group.id,
+ domain=domain.id,
+ )
elif parsed_args.group and parsed_args.project:
- group = utils.find_resource(identity_client.group,
- parsed_args.group)
- project = utils.find_resource(identity_client.projects,
- parsed_args.project)
- identity_client.roles.grant(role_id, group=group, project=project)
+ group = utils.find_resource(
+ identity_client.groups,
+ parsed_args.group,
+ )
+ project = utils.find_resource(
+ identity_client.projects,
+ parsed_args.project,
+ )
+ identity_client.roles.grant(
+ role.id,
+ group=group.id,
+ project=project.id,
+ )
else:
sys.stderr.write("Role not added, incorrect set of arguments \
provided. See openstack --help for more details\n")
@@ -122,6 +154,7 @@ class CreateRole(show.ShowOne):
def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
+
role = identity_client.roles.create(parsed_args.name)
return zip(*sorted(six.iteritems(role._info)))
@@ -144,9 +177,13 @@ class DeleteRole(command.Command):
def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
- role_id = utils.find_resource(identity_client.roles,
- parsed_args.role)
- identity_client.roles.delete(role_id)
+
+ role = utils.find_resource(
+ identity_client.roles,
+ parsed_args.role,
+ )
+
+ identity_client.roles.delete(role.id)
return
@@ -208,36 +245,69 @@ class RemoveRole(command.Command):
if (not parsed_args.user and not parsed_args.domain
and not parsed_args.group and not parsed_args.project):
- sys.stdout.write("Role not updated, no arguments present\n")
return
- role_id = utils.find_resource(identity_client.roles,
- parsed_args.role).id
+ role = utils.find_resource(
+ identity_client.roles,
+ parsed_args.role,
+ )
if parsed_args.user and parsed_args.domain:
- user = utils.find_resource(identity_client.users,
- parsed_args.user)
- domain = utils.find_resource(identity_client.domains,
- parsed_args.domain)
- identity_client.roles.revoke(role_id, user=user, domain=domain)
+ user = utils.find_resource(
+ identity_client.users,
+ parsed_args.user,
+ )
+ domain = utils.find_resource(
+ identity_client.domains,
+ parsed_args.domain,
+ )
+ identity_client.roles.revoke(
+ role.id,
+ user=user.id,
+ domain=domain.id,
+ )
elif parsed_args.user and parsed_args.project:
- user = utils.find_resource(identity_client.users,
- parsed_args.user)
- project = utils.find_resource(identity_client.projects,
- parsed_args.project)
- identity_client.roles.revoke(role_id, user=user, project=project)
- elif parsed_args.group and parsed_args.project:
- group = utils.find_resource(identity_client.group,
- parsed_args.group)
- project = utils.find_resource(identity_client.projects,
- parsed_args.project)
- identity_client.roles.revoke(role_id, group=group, project=project)
+ user = utils.find_resource(
+ identity_client.users,
+ parsed_args.user,
+ )
+ project = utils.find_resource(
+ identity_client.projects,
+ parsed_args.project,
+ )
+ identity_client.roles.revoke(
+ role.id,
+ user=user.id,
+ project=project.id,
+ )
elif parsed_args.group and parsed_args.domain:
- group = utils.find_resource(identity_client.group,
- parsed_args.group)
- domain = utils.find_resource(identity_client.domains,
- parsed_args.domain)
- identity_client.roles.revoke(role_id, group=group, domain=domain)
+ group = utils.find_resource(
+ identity_client.groups,
+ parsed_args.group,
+ )
+ domain = utils.find_resource(
+ identity_client.domains,
+ parsed_args.domain,
+ )
+ identity_client.roles.revoke(
+ role.id,
+ group=group.id,
+ domain=domain.id,
+ )
+ elif parsed_args.group and parsed_args.project:
+ group = utils.find_resource(
+ identity_client.groups,
+ parsed_args.group,
+ )
+ project = utils.find_resource(
+ identity_client.projects,
+ parsed_args.project,
+ )
+ identity_client.roles.revoke(
+ role.id,
+ group=group.id,
+ project=project.id,
+ )
else:
sys.stderr.write("Role not removed, incorrect set of arguments \
provided. See openstack --help for more details\n")
@@ -266,14 +336,16 @@ class SetRole(command.Command):
def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
- role_id = utils.find_resource(identity_client.roles,
- parsed_args.role)
if not parsed_args.name:
- sys.stderr.write("Role not updated, no arguments present")
return
- identity_client.roles.update(role_id, parsed_args.name)
+ role = utils.find_resource(
+ identity_client.roles,
+ parsed_args.role,
+ )
+
+ identity_client.roles.update(role.id, name=parsed_args.name)
return
@@ -294,7 +366,10 @@ class ShowRole(show.ShowOne):
def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
- role = utils.find_resource(identity_client.roles,
- parsed_args.role)
+
+ role = utils.find_resource(
+ identity_client.roles,
+ parsed_args.role,
+ )
return zip(*sorted(six.iteritems(role._info)))
diff --git a/openstackclient/identity/v3/service.py b/openstackclient/identity/v3/service.py
index 77efbeadfc..7e3bfc6b2d 100644
--- a/openstackclient/identity/v3/service.py
+++ b/openstackclient/identity/v3/service.py
@@ -17,7 +17,6 @@
import logging
import six
-import sys
from cliff import command
from cliff import lister
@@ -27,7 +26,7 @@ from openstackclient.common import utils
class CreateService(show.ShowOne):
- """Create service command"""
+ """Create new service"""
log = logging.getLogger(__name__ + '.CreateService')
@@ -36,38 +35,45 @@ class CreateService(show.ShowOne):
parser.add_argument(
'type',
metavar='<service-type>',
- help='New service type (compute, image, identity, volume, etc)')
+ help='New service type (compute, image, identity, volume, etc)',
+ )
parser.add_argument(
'--name',
metavar='<service-name>',
- help='New service name')
+ help='New service name',
+ )
enable_group = parser.add_mutually_exclusive_group()
enable_group.add_argument(
'--enable',
- dest='enabled',
action='store_true',
- default=True,
- help='Enable user')
+ help='Enable project',
+ )
enable_group.add_argument(
'--disable',
- dest='enabled',
- action='store_false',
- help='Disable user')
+ action='store_true',
+ help='Disable project',
+ )
return parser
def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
+
+ enabled = True
+ if parsed_args.disable:
+ enabled = False
+
service = identity_client.services.create(
parsed_args.name,
parsed_args.type,
- parsed_args.enabled)
+ enabled,
+ )
return zip(*sorted(six.iteritems(service._info)))
class DeleteService(command.Command):
- """Delete service command"""
+ """Delete service"""
log = logging.getLogger(__name__ + '.DeleteService')
@@ -76,27 +82,31 @@ class DeleteService(command.Command):
parser.add_argument(
'service',
metavar='<service>',
- help='Name or ID of service to delete')
+ help='Service to delete (name or ID)',
+ )
return parser
def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
- service_id = utils.find_resource(
- identity_client.services, parsed_args.service).id
+ service = utils.find_resource(
+ identity_client.services,
+ parsed_args.service,
+ )
- identity_client.services.delete(service_id)
+ identity_client.services.delete(service.id)
return
class ListService(lister.Lister):
- """List service command"""
+ """List services"""
log = logging.getLogger(__name__ + '.ListService')
def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args)
+
columns = ('ID', 'Name', 'Type', 'Enabled')
data = self.app.client_manager.identity.services.list()
return (columns,
@@ -106,8 +116,8 @@ class ListService(lister.Lister):
) for s in data))
-class SetService(show.ShowOne):
- """Set service command"""
+class SetService(command.Command):
+ """Set service properties"""
log = logging.getLogger(__name__ + '.SetService')
@@ -116,51 +126,67 @@ class SetService(show.ShowOne):
parser.add_argument(
'service',
metavar='<service>',
- help='Service name or ID to update')
+ help='Service to update (name or ID)',
+ )
parser.add_argument(
'--type',
metavar='<service-type>',
- help='New service type (compute, image, identity, volume, etc)')
+ help='New service type (compute, image, identity, volume, etc)',
+ )
parser.add_argument(
'--name',
metavar='<service-name>',
- help='New service name')
+ help='New service name',
+ )
enable_group = parser.add_mutually_exclusive_group()
enable_group.add_argument(
'--enable',
- dest='enabled',
action='store_true',
- default=True,
- help='Enable user')
+ help='Enable project',
+ )
enable_group.add_argument(
'--disable',
- dest='enabled',
- action='store_false',
- help='Disable user')
+ action='store_true',
+ help='Disable project',
+ )
return parser
def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
- service = utils.find_resource(identity_client.services,
- parsed_args.service)
-
- if not parsed_args.name and not parsed_args.type:
- sys.stdout.write("Service not updated, no arguments present")
+ if (not parsed_args.name
+ and not parsed_args.type
+ and not parsed_args.enable
+ and not parsed_args.disable):
return
- identity_client.services.update(
- service,
- parsed_args.name,
- parsed_args.type,
- parsed_args.enabled)
+ service = utils.find_resource(
+ identity_client.services,
+ parsed_args.service,
+ )
+ kwargs = service._info
+ if parsed_args.type:
+ kwargs['type'] = parsed_args.type
+ if parsed_args.name:
+ kwargs['name'] = parsed_args.name
+ if parsed_args.enable:
+ kwargs['enabled'] = True
+ if parsed_args.disable:
+ kwargs['enabled'] = False
+ if 'id' in kwargs:
+ del kwargs['id']
+
+ identity_client.services.update(
+ service.id,
+ **kwargs
+ )
return
class ShowService(show.ShowOne):
- """Show service command"""
+ """Show service details"""
log = logging.getLogger(__name__ + '.ShowService')
@@ -169,14 +195,17 @@ class ShowService(show.ShowOne):
parser.add_argument(
'service',
metavar='<service>',
- help='Type, name or ID of service to display')
+ help='Service to display (type, name or ID)',
+ )
return parser
def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
- service = utils.find_resource(identity_client.services,
- parsed_args.service)
+ service = utils.find_resource(
+ identity_client.services,
+ parsed_args.service,
+ )
return zip(*sorted(six.iteritems(service._info)))
diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py
index b90527a3f5..54ffe561a3 100644
--- a/openstackclient/identity/v3/user.py
+++ b/openstackclient/identity/v3/user.py
@@ -27,7 +27,7 @@ from openstackclient.common import utils
class CreateUser(show.ShowOne):
- """Create user command"""
+ """Create new user"""
log = logging.getLogger(__name__ + '.CreateUser')
@@ -51,7 +51,7 @@ class CreateUser(show.ShowOne):
parser.add_argument(
'--project',
metavar='<project>',
- help='New default project name or ID',
+ help='Set default project (name or ID)',
)
parser.add_argument(
'--domain',
@@ -66,15 +66,12 @@ class CreateUser(show.ShowOne):
enable_group = parser.add_mutually_exclusive_group()
enable_group.add_argument(
'--enable',
- dest='enabled',
action='store_true',
- default=True,
- help='Enable user',
+ help='Enable user (default)',
)
enable_group.add_argument(
'--disable',
- dest='enabled',
- action='store_false',
+ action='store_true',
help='Disable user',
)
return parser
@@ -85,7 +82,9 @@ class CreateUser(show.ShowOne):
if parsed_args.project:
project_id = utils.find_resource(
- identity_client.projects, parsed_args.project).id
+ identity_client.projects,
+ parsed_args.project,
+ ).id
else:
project_id = None
@@ -95,14 +94,18 @@ class CreateUser(show.ShowOne):
else:
domain_id = None
+ enabled = True
+ if parsed_args.disable:
+ enabled = False
+
user = identity_client.users.create(
parsed_args.name,
- domain_id,
- project_id,
- parsed_args.password,
- parsed_args.email,
- parsed_args.description,
- parsed_args.enabled
+ domain=domain_id,
+ default_project=project_id,
+ password=parsed_args.password,
+ email=parsed_args.email,
+ description=parsed_args.description,
+ enabled=enabled
)
info = {}
@@ -111,7 +114,7 @@ class CreateUser(show.ShowOne):
class DeleteUser(command.Command):
- """Delete user command"""
+ """Delete user"""
log = logging.getLogger(__name__ + '.DeleteUser')
@@ -120,15 +123,19 @@ class DeleteUser(command.Command):
parser.add_argument(
'user',
metavar='<user>',
- help='Name or ID of user to delete',
+ help='User to delete (name or ID)',
)
return parser
def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
+
user = utils.find_resource(
- identity_client.users, parsed_args.user)
+ identity_client.users,
+ parsed_args.user,
+ )
+
identity_client.users.delete(user.id)
return
@@ -245,7 +252,7 @@ class ListUser(lister.Lister):
class SetUser(command.Command):
- """Set user command"""
+ """Set user properties"""
log = logging.getLogger(__name__ + '.SetUser')
@@ -254,7 +261,7 @@ class SetUser(command.Command):
parser.add_argument(
'user',
metavar='<user>',
- help='Name or ID of user to change',
+ help='User to change (name or ID)',
)
parser.add_argument(
'--name',
@@ -289,15 +296,12 @@ class SetUser(command.Command):
enable_group = parser.add_mutually_exclusive_group()
enable_group.add_argument(
'--enable',
- dest='enabled',
action='store_true',
- default=True,
help='Enable user (default)',
)
enable_group.add_argument(
'--disable',
- dest='enabled',
- action='store_false',
+ action='store_true',
help='Disable user',
)
return parser
@@ -305,8 +309,23 @@ class SetUser(command.Command):
def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
+
+ if (not parsed_args.name
+ and not parsed_args.name
+ and not parsed_args.password
+ and not parsed_args.email
+ and not parsed_args.domain
+ and not parsed_args.project
+ and not parsed_args.description
+ and not parsed_args.enable
+ and not parsed_args.disable):
+ return
+
user = utils.find_resource(
- identity_client.users, parsed_args.user)
+ identity_client.users,
+ parsed_args.user,
+ )
+
kwargs = {}
if parsed_args.name:
kwargs['name'] = parsed_args.name
@@ -324,18 +343,18 @@ class SetUser(command.Command):
domain_id = utils.find_resource(
identity_client.domains, parsed_args.domain).id
kwargs['domainId'] = domain_id
- if 'enabled' in parsed_args:
- kwargs['enabled'] = parsed_args.enabled
+ kwargs['enabled'] = user.enabled
+ if parsed_args.enable:
+ kwargs['enabled'] = True
+ if parsed_args.disable:
+ kwargs['enabled'] = False
- if not len(kwargs):
- sys.stderr.write("User not updated, no arguments present")
- return
identity_client.users.update(user.id, **kwargs)
return
class ShowUser(show.ShowOne):
- """Show user command"""
+ """Show user details"""
log = logging.getLogger(__name__ + '.ShowUser')
@@ -344,15 +363,18 @@ class ShowUser(show.ShowOne):
parser.add_argument(
'user',
metavar='<user>',
- help='Name or ID of user to display',
+ help='User to display (name or ID)',
)
return parser
def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
+
user = utils.find_resource(
- identity_client.users, parsed_args.user)
+ identity_client.users,
+ parsed_args.user,
+ )
info = {}
info.update(user._info)
diff --git a/openstackclient/tests/identity/v2_0/test_role.py b/openstackclient/tests/identity/v2_0/test_role.py
index 58de8e52ce..56e9d4cb54 100644
--- a/openstackclient/tests/identity/v2_0/test_role.py
+++ b/openstackclient/tests/identity/v2_0/test_role.py
@@ -31,9 +31,11 @@ class TestRole(test_identity.TestIdentityv2):
# Get a shortcut to the TenantManager Mock
self.projects_mock = self.app.client_manager.identity.tenants
self.projects_mock.reset_mock()
+
# Get a shortcut to the UserManager Mock
self.users_mock = self.app.client_manager.identity.users
self.users_mock.reset_mock()
+
# Get a shortcut to the RoleManager Mock
self.roles_mock = self.app.client_manager.identity.roles
self.roles_mock.reset_mock()
@@ -49,11 +51,13 @@ class TestRoleAdd(TestRole):
copy.deepcopy(identity_fakes.PROJECT),
loaded=True,
)
+
self.users_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(identity_fakes.USER),
loaded=True,
)
+
self.roles_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(identity_fakes.ROLE),
@@ -75,9 +79,9 @@ class TestRoleAdd(TestRole):
identity_fakes.role_name,
]
verifylist = [
- ('role', identity_fakes.role_name),
('project', identity_fakes.project_name),
('user', identity_fakes.user_name),
+ ('role', identity_fakes.role_name),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -217,11 +221,13 @@ class TestUserRoleList(TestRole):
copy.deepcopy(identity_fakes.PROJECT),
loaded=True,
)
+
self.users_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(identity_fakes.USER),
loaded=True,
)
+
self.roles_mock.roles_for_user.return_value = [
fakes.FakeResource(
None,
@@ -340,11 +346,13 @@ class TestRoleRemove(TestRole):
copy.deepcopy(identity_fakes.PROJECT),
loaded=True,
)
+
self.users_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(identity_fakes.USER),
loaded=True,
)
+
self.roles_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(identity_fakes.ROLE),
diff --git a/openstackclient/tests/identity/v3/__init__.py b/openstackclient/tests/identity/v3/__init__.py
new file mode 100644
index 0000000000..c534c012e8
--- /dev/null
+++ b/openstackclient/tests/identity/v3/__init__.py
@@ -0,0 +1,14 @@
+# 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.
+#
diff --git a/openstackclient/tests/identity/v3/fakes.py b/openstackclient/tests/identity/v3/fakes.py
new file mode 100644
index 0000000000..1338553608
--- /dev/null
+++ b/openstackclient/tests/identity/v3/fakes.py
@@ -0,0 +1,106 @@
+# Copyright 2013 Nebula Inc.
+#
+# 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.
+#
+
+import mock
+
+from openstackclient.tests import fakes
+
+
+domain_id = 'd1'
+domain_name = 'oftheking'
+
+DOMAIN = {
+ 'id': domain_id,
+ 'name': domain_name,
+}
+
+group_id = 'gr-010'
+group_name = 'spencer davis'
+
+GROUP = {
+ 'id': group_id,
+ 'name': group_name,
+}
+
+project_id = '8-9-64'
+project_name = 'beatles'
+project_description = 'Fab Four'
+
+PROJECT = {
+ 'id': project_id,
+ 'name': project_name,
+ 'description': project_description,
+ 'enabled': True,
+ 'domain_id': domain_id,
+}
+
+PROJECT_2 = {
+ 'id': project_id + '-2222',
+ 'name': project_name + ' reprise',
+ 'description': project_description + 'plus four more',
+ 'enabled': True,
+ 'domain_id': domain_id,
+}
+
+role_id = 'r1'
+role_name = 'roller'
+
+ROLE = {
+ 'id': role_id,
+ 'name': role_name,
+}
+
+service_id = 's-123'
+service_name = 'Texaco'
+service_type = 'gas'
+
+SERVICE = {
+ 'id': service_id,
+ 'name': service_name,
+ 'type': service_type,
+ 'enabled': True,
+}
+
+user_id = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
+user_name = 'paul'
+user_description = 'Sir Paul'
+user_email = 'paul@applecorps.com'
+
+USER = {
+ 'id': user_id,
+ 'name': user_name,
+ 'project_id': project_id,
+ 'email': user_email,
+ 'enabled': True,
+ 'domain_id': domain_id,
+}
+
+
+class FakeIdentityv3Client(object):
+ def __init__(self, **kwargs):
+ self.domains = mock.Mock()
+ self.domains.resource_class = fakes.FakeResource(None, {})
+ self.groups = mock.Mock()
+ self.groups.resource_class = fakes.FakeResource(None, {})
+ self.projects = mock.Mock()
+ self.projects.resource_class = fakes.FakeResource(None, {})
+ self.roles = mock.Mock()
+ self.roles.resource_class = fakes.FakeResource(None, {})
+ self.services = mock.Mock()
+ self.services.resource_class = fakes.FakeResource(None, {})
+ self.users = mock.Mock()
+ self.users.resource_class = fakes.FakeResource(None, {})
+ self.auth_token = kwargs['token']
+ self.management_url = kwargs['endpoint']
diff --git a/openstackclient/tests/identity/v3/test_identity.py b/openstackclient/tests/identity/v3/test_identity.py
new file mode 100644
index 0000000000..4b55ee4540
--- /dev/null
+++ b/openstackclient/tests/identity/v3/test_identity.py
@@ -0,0 +1,31 @@
+# Copyright 2013 Nebula Inc.
+#
+# 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.
+#
+
+from openstackclient.tests.identity.v3 import fakes
+from openstackclient.tests import utils
+
+
+AUTH_TOKEN = "foobar"
+AUTH_URL = "http://0.0.0.0"
+
+
+class TestIdentityv3(utils.TestCommand):
+ def setUp(self):
+ super(TestIdentityv3, self).setUp()
+
+ self.app.client_manager.identity = fakes.FakeIdentityv3Client(
+ endpoint=AUTH_URL,
+ token=AUTH_TOKEN,
+ )
diff --git a/openstackclient/tests/identity/v3/test_project.py b/openstackclient/tests/identity/v3/test_project.py
new file mode 100644
index 0000000000..91c15e246d
--- /dev/null
+++ b/openstackclient/tests/identity/v3/test_project.py
@@ -0,0 +1,531 @@
+# Copyright 2013 Nebula Inc.
+#
+# 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.
+#
+
+import copy
+
+from openstackclient.identity.v3 import project
+from openstackclient.tests import fakes
+from openstackclient.tests.identity.v3 import fakes as identity_fakes
+from openstackclient.tests.identity.v3 import test_identity
+
+
+class TestProject(test_identity.TestIdentityv3):
+
+ def setUp(self):
+ super(TestProject, self).setUp()
+
+ # Get a shortcut to the DomainManager Mock
+ self.domains_mock = self.app.client_manager.identity.domains
+ self.domains_mock.reset_mock()
+
+ # Get a shortcut to the ProjectManager Mock
+ self.projects_mock = self.app.client_manager.identity.projects
+ self.projects_mock.reset_mock()
+
+
+class TestProjectCreate(TestProject):
+
+ def setUp(self):
+ super(TestProjectCreate, self).setUp()
+
+ self.domains_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.DOMAIN),
+ loaded=True,
+ )
+
+ self.projects_mock.create.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.PROJECT),
+ loaded=True,
+ )
+
+ # Get the command object to test
+ self.cmd = project.CreateProject(self.app, None)
+
+ def test_project_create_no_options(self):
+ arglist = [
+ identity_fakes.project_name,
+ ]
+ verifylist = [
+ ('enable', False),
+ ('disable', False),
+ ('name', identity_fakes.project_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'description': None,
+ 'enabled': True,
+ }
+ # ProjectManager.create(name, domain, description=, enabled=, **kwargs)
+ self.projects_mock.create.assert_called_with(
+ identity_fakes.project_name,
+ None,
+ **kwargs
+ )
+
+ collist = ('description', 'domain_id', 'enabled', 'id', 'name')
+ self.assertEqual(columns, collist)
+ datalist = (
+ identity_fakes.project_description,
+ identity_fakes.domain_id,
+ True,
+ identity_fakes.project_id,
+ identity_fakes.project_name,
+ )
+ self.assertEqual(data, datalist)
+
+ def test_project_create_description(self):
+ arglist = [
+ '--description', 'new desc',
+ identity_fakes.project_name,
+ ]
+ verifylist = [
+ ('description', 'new desc'),
+ ('enable', False),
+ ('disable', False),
+ ('name', identity_fakes.project_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'description': 'new desc',
+ 'enabled': True,
+ }
+ # ProjectManager.create(name, domain, description=, enabled=, **kwargs)
+ self.projects_mock.create.assert_called_with(
+ identity_fakes.project_name,
+ None,
+ **kwargs
+ )
+
+ collist = ('description', 'domain_id', 'enabled', 'id', 'name')
+ self.assertEqual(columns, collist)
+ datalist = (
+ identity_fakes.project_description,
+ identity_fakes.domain_id,
+ True,
+ identity_fakes.project_id,
+ identity_fakes.project_name,
+ )
+ self.assertEqual(data, datalist)
+
+ def test_project_create_domain(self):
+ arglist = [
+ '--domain', identity_fakes.domain_name,
+ identity_fakes.project_name,
+ ]
+ verifylist = [
+ ('domain', identity_fakes.domain_name),
+ ('enable', False),
+ ('disable', False),
+ ('name', identity_fakes.project_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'description': None,
+ 'enabled': True,
+ }
+ # ProjectManager.create(name, domain, description=, enabled=, **kwargs)
+ self.projects_mock.create.assert_called_with(
+ identity_fakes.project_name,
+ identity_fakes.domain_id,
+ **kwargs
+ )
+
+ collist = ('description', 'domain_id', 'enabled', 'id', 'name')
+ self.assertEqual(columns, collist)
+ datalist = (
+ identity_fakes.project_description,
+ identity_fakes.domain_id,
+ True,
+ identity_fakes.project_id,
+ identity_fakes.project_name,
+ )
+ self.assertEqual(data, datalist)
+
+ def test_project_create_enable(self):
+ arglist = [
+ '--enable',
+ identity_fakes.project_name,
+ ]
+ verifylist = [
+ ('enable', True),
+ ('disable', False),
+ ('name', identity_fakes.project_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'description': None,
+ 'enabled': True,
+ }
+ # ProjectManager.create(name, domain, description=, enabled=, **kwargs)
+ self.projects_mock.create.assert_called_with(
+ identity_fakes.project_name,
+ None,
+ **kwargs
+ )
+
+ collist = ('description', 'domain_id', 'enabled', 'id', 'name')
+ self.assertEqual(columns, collist)
+ datalist = (
+ identity_fakes.project_description,
+ identity_fakes.domain_id,
+ True,
+ identity_fakes.project_id,
+ identity_fakes.project_name,
+ )
+ self.assertEqual(data, datalist)
+
+ def test_project_create_disable(self):
+ arglist = [
+ '--disable',
+ identity_fakes.project_name,
+ ]
+ verifylist = [
+ ('enable', False),
+ ('disable', True),
+ ('name', identity_fakes.project_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'description': None,
+ 'enabled': False,
+ }
+ # ProjectManager.create(name, domain, description=, enabled=, **kwargs)
+ self.projects_mock.create.assert_called_with(
+ identity_fakes.project_name,
+ None,
+ **kwargs
+ )
+
+ collist = ('description', 'domain_id', 'enabled', 'id', 'name')
+ self.assertEqual(columns, collist)
+ datalist = (
+ identity_fakes.project_description,
+ identity_fakes.domain_id,
+ True,
+ identity_fakes.project_id,
+ identity_fakes.project_name,
+ )
+ self.assertEqual(data, datalist)
+
+
+class TestProjectDelete(TestProject):
+
+ def setUp(self):
+ super(TestProjectDelete, self).setUp()
+
+ # This is the return value for utils.find_resource()
+ self.projects_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.PROJECT),
+ loaded=True,
+ )
+ self.projects_mock.delete.return_value = None
+
+ # Get the command object to test
+ self.cmd = project.DeleteProject(self.app, None)
+
+ def test_project_delete_no_options(self):
+ arglist = [
+ identity_fakes.project_id,
+ ]
+ verifylist = [
+ ('project', identity_fakes.project_id),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.run(parsed_args)
+ self.assertEqual(result, 0)
+
+ self.projects_mock.delete.assert_called_with(
+ identity_fakes.project_id,
+ )
+
+
+class TestProjectList(TestProject):
+
+ def setUp(self):
+ super(TestProjectList, self).setUp()
+
+ self.projects_mock.list.return_value = [
+ fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.PROJECT),
+ loaded=True,
+ ),
+ ]
+
+ # Get the command object to test
+ self.cmd = project.ListProject(self.app, None)
+
+ def test_project_list_no_options(self):
+ arglist = []
+ verifylist = []
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+ self.projects_mock.list.assert_called_with()
+
+ collist = ('ID', 'Name')
+ self.assertEqual(columns, collist)
+ datalist = ((
+ identity_fakes.project_id,
+ identity_fakes.project_name,
+ ), )
+ self.assertEqual(tuple(data), datalist)
+
+ def test_project_list_long(self):
+ arglist = [
+ '--long',
+ ]
+ verifylist = [
+ ('long', True),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+ self.projects_mock.list.assert_called_with()
+
+ collist = ('ID', 'Name', 'Domain ID', 'Description', 'Enabled')
+ self.assertEqual(columns, collist)
+ datalist = ((
+ identity_fakes.project_id,
+ identity_fakes.project_name,
+ identity_fakes.domain_id,
+ identity_fakes.project_description,
+ True,
+ ), )
+ self.assertEqual(tuple(data), datalist)
+
+
+class TestProjectSet(TestProject):
+
+ def setUp(self):
+ super(TestProjectSet, self).setUp()
+
+ self.domains_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.DOMAIN),
+ loaded=True,
+ )
+
+ self.projects_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.PROJECT),
+ loaded=True,
+ )
+ self.projects_mock.update.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.PROJECT),
+ loaded=True,
+ )
+
+ # Get the command object to test
+ self.cmd = project.SetProject(self.app, None)
+
+ def test_project_set_no_options(self):
+ arglist = [
+ identity_fakes.project_name,
+ ]
+ verifylist = [
+ ('project', identity_fakes.project_name),
+ ('enable', False),
+ ('disable', False),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.run(parsed_args)
+ self.assertEqual(result, 0)
+
+ def test_project_set_name(self):
+ arglist = [
+ '--name', 'qwerty',
+ identity_fakes.project_name,
+ ]
+ verifylist = [
+ ('name', 'qwerty'),
+ ('enable', False),
+ ('disable', False),
+ ('project', identity_fakes.project_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.run(parsed_args)
+ self.assertEqual(result, 0)
+
+ # Set expected values
+ kwargs = {
+ 'description': identity_fakes.project_description,
+ 'domain': identity_fakes.domain_id,
+ 'enabled': True,
+ 'name': 'qwerty',
+ }
+ # ProjectManager.update(project, name=, domain=, description=,
+ # enabled=, **kwargs)
+ self.projects_mock.update.assert_called_with(
+ identity_fakes.project_id,
+ **kwargs
+ )
+
+ def test_project_set_description(self):
+ arglist = [
+ '--description', 'new desc',
+ identity_fakes.project_name,
+ ]
+ verifylist = [
+ ('description', 'new desc'),
+ ('enable', False),
+ ('disable', False),
+ ('project', identity_fakes.project_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.run(parsed_args)
+ self.assertEqual(result, 0)
+
+ # Set expected values
+ kwargs = {
+ 'description': 'new desc',
+ 'domain': identity_fakes.domain_id,
+ 'enabled': True,
+ 'name': identity_fakes.project_name,
+ }
+ self.projects_mock.update.assert_called_with(
+ identity_fakes.project_id,
+ **kwargs
+ )
+
+ def test_project_set_enable(self):
+ arglist = [
+ '--enable',
+ identity_fakes.project_name,
+ ]
+ verifylist = [
+ ('enable', True),
+ ('disable', False),
+ ('project', identity_fakes.project_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.run(parsed_args)
+ self.assertEqual(result, 0)
+
+ # Set expected values
+ kwargs = {
+ 'description': identity_fakes.project_description,
+ 'domain': identity_fakes.domain_id,
+ 'enabled': True,
+ 'name': identity_fakes.project_name,
+ }
+ self.projects_mock.update.assert_called_with(
+ identity_fakes.project_id,
+ **kwargs
+ )
+
+ def test_project_set_disable(self):
+ arglist = [
+ '--disable',
+ identity_fakes.project_name,
+ ]
+ verifylist = [
+ ('enable', False),
+ ('disable', True),
+ ('project', identity_fakes.project_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.run(parsed_args)
+ self.assertEqual(result, 0)
+
+ # Set expected values
+ kwargs = {
+ 'description': identity_fakes.project_description,
+ 'domain': identity_fakes.domain_id,
+ 'enabled': False,
+ 'name': identity_fakes.project_name,
+ }
+ self.projects_mock.update.assert_called_with(
+ identity_fakes.project_id,
+ **kwargs
+ )
+
+
+class TestProjectShow(TestProject):
+
+ def setUp(self):
+ super(TestProjectShow, self).setUp()
+
+ self.projects_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.PROJECT),
+ loaded=True,
+ )
+
+ # Get the command object to test
+ self.cmd = project.ShowProject(self.app, None)
+
+ def test_project_show(self):
+ arglist = [
+ identity_fakes.project_id,
+ ]
+ verifylist = [
+ ('project', identity_fakes.project_id),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+ self.projects_mock.get.assert_called_with(
+ identity_fakes.project_id,
+ )
+
+ collist = ('description', 'domain_id', 'enabled', 'id', 'name')
+ self.assertEqual(columns, collist)
+ datalist = (
+ identity_fakes.project_description,
+ identity_fakes.domain_id,
+ True,
+ identity_fakes.project_id,
+ identity_fakes.project_name,
+ )
+ self.assertEqual(data, datalist)
diff --git a/openstackclient/tests/identity/v3/test_role.py b/openstackclient/tests/identity/v3/test_role.py
new file mode 100644
index 0000000000..ef2b3e057c
--- /dev/null
+++ b/openstackclient/tests/identity/v3/test_role.py
@@ -0,0 +1,550 @@
+# Copyright 2013 Nebula Inc.
+#
+# 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.
+#
+
+import copy
+
+from openstackclient.identity.v3 import role
+from openstackclient.tests import fakes
+from openstackclient.tests.identity.v3 import fakes as identity_fakes
+from openstackclient.tests.identity.v3 import test_identity
+
+
+class TestRole(test_identity.TestIdentityv3):
+
+ def setUp(self):
+ super(TestRole, self).setUp()
+
+ # Get a shortcut to the UserManager Mock
+ self.users_mock = self.app.client_manager.identity.users
+ self.users_mock.reset_mock()
+
+ # Get a shortcut to the UserManager Mock
+ self.groups_mock = self.app.client_manager.identity.groups
+ self.groups_mock.reset_mock()
+
+ # Get a shortcut to the DomainManager Mock
+ self.domains_mock = self.app.client_manager.identity.domains
+ self.domains_mock.reset_mock()
+
+ # Get a shortcut to the ProjectManager Mock
+ self.projects_mock = self.app.client_manager.identity.projects
+ self.projects_mock.reset_mock()
+
+ # Get a shortcut to the RoleManager Mock
+ self.roles_mock = self.app.client_manager.identity.roles
+ self.roles_mock.reset_mock()
+
+
+class TestRoleAdd(TestRole):
+
+ def setUp(self):
+ super(TestRoleAdd, self).setUp()
+
+ self.users_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.USER),
+ loaded=True,
+ )
+
+ self.groups_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.GROUP),
+ loaded=True,
+ )
+
+ self.domains_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.DOMAIN),
+ loaded=True,
+ )
+
+ self.projects_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.PROJECT),
+ loaded=True,
+ )
+
+ self.roles_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.ROLE),
+ loaded=True,
+ )
+ self.roles_mock.grant.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.ROLE),
+ loaded=True,
+ )
+
+ # Get the command object to test
+ self.cmd = role.AddRole(self.app, None)
+
+ def test_role_add_user_domain(self):
+ arglist = [
+ '--user', identity_fakes.user_name,
+ '--domain', identity_fakes.domain_name,
+ identity_fakes.role_name,
+ ]
+ verifylist = [
+ ('user', identity_fakes.user_name),
+ ('group', None),
+ ('domain', identity_fakes.domain_name),
+ ('project', None),
+ ('role', identity_fakes.role_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.run(parsed_args)
+ self.assertEqual(result, 0)
+
+ # Set expected values
+ kwargs = {
+ 'user': identity_fakes.user_id,
+ 'domain': identity_fakes.domain_id,
+ }
+ # RoleManager.grant(role, user=, group=, domain=, project=)
+ self.roles_mock.grant.assert_called_with(
+ identity_fakes.role_id,
+ **kwargs
+ )
+
+ def test_role_add_user_project(self):
+ arglist = [
+ '--user', identity_fakes.user_name,
+ '--project', identity_fakes.project_name,
+ identity_fakes.role_name,
+ ]
+ verifylist = [
+ ('user', identity_fakes.user_name),
+ ('group', None),
+ ('domain', None),
+ ('project', identity_fakes.project_name),
+ ('role', identity_fakes.role_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.run(parsed_args)
+ self.assertEqual(result, 0)
+
+ # Set expected values
+ kwargs = {
+ 'user': identity_fakes.user_id,
+ 'project': identity_fakes.project_id,
+ }
+ # RoleManager.grant(role, user=, group=, domain=, project=)
+ self.roles_mock.grant.assert_called_with(
+ identity_fakes.role_id,
+ **kwargs
+ )
+
+ def test_role_add_group_domain(self):
+ arglist = [
+ '--group', identity_fakes.group_name,
+ '--domain', identity_fakes.domain_name,
+ identity_fakes.role_name,
+ ]
+ verifylist = [
+ ('user', None),
+ ('group', identity_fakes.group_name),
+ ('domain', identity_fakes.domain_name),
+ ('project', None),
+ ('role', identity_fakes.role_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.run(parsed_args)
+ self.assertEqual(result, 0)
+
+ # Set expected values
+ kwargs = {
+ 'group': identity_fakes.group_id,
+ 'domain': identity_fakes.domain_id,
+ }
+ # RoleManager.grant(role, user=, group=, domain=, project=)
+ self.roles_mock.grant.assert_called_with(
+ identity_fakes.role_id,
+ **kwargs
+ )
+
+ def test_role_add_group_project(self):
+ arglist = [
+ '--group', identity_fakes.group_name,
+ '--project', identity_fakes.project_name,
+ identity_fakes.role_name,
+ ]
+ verifylist = [
+ ('user', None),
+ ('group', identity_fakes.group_name),
+ ('domain', None),
+ ('project', identity_fakes.project_name),
+ ('role', identity_fakes.role_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.run(parsed_args)
+ self.assertEqual(result, 0)
+
+ # Set expected values
+ kwargs = {
+ 'group': identity_fakes.group_id,
+ 'project': identity_fakes.project_id,
+ }
+ # RoleManager.grant(role, user=, group=, domain=, project=)
+ self.roles_mock.grant.assert_called_with(
+ identity_fakes.role_id,
+ **kwargs
+ )
+
+
+class TestRoleCreate(TestRole):
+
+ def setUp(self):
+ super(TestRoleCreate, self).setUp()
+
+ self.roles_mock.create.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.ROLE),
+ loaded=True,
+ )
+
+ # Get the command object to test
+ self.cmd = role.CreateRole(self.app, None)
+
+ def test_role_create_no_options(self):
+ arglist = [
+ identity_fakes.role_name,
+ ]
+ verifylist = [
+ ('name', identity_fakes.role_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # RoleManager.create(name)
+ self.roles_mock.create.assert_called_with(
+ identity_fakes.role_name,
+ )
+
+ collist = ('id', 'name')
+ self.assertEqual(columns, collist)
+ datalist = (
+ identity_fakes.role_id,
+ identity_fakes.role_name,
+ )
+ self.assertEqual(data, datalist)
+
+
+class TestRoleDelete(TestRole):
+
+ def setUp(self):
+ super(TestRoleDelete, self).setUp()
+
+ self.roles_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.ROLE),
+ loaded=True,
+ )
+ self.roles_mock.delete.return_value = None
+
+ # Get the command object to test
+ self.cmd = role.DeleteRole(self.app, None)
+
+ def test_role_delete_no_options(self):
+ arglist = [
+ identity_fakes.role_name,
+ ]
+ verifylist = [
+ ('role', identity_fakes.role_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ self.cmd.take_action(parsed_args)
+
+ self.roles_mock.delete.assert_called_with(
+ identity_fakes.role_id,
+ )
+
+
+class TestRoleList(TestRole):
+
+ def setUp(self):
+ super(TestRoleList, self).setUp()
+
+ self.roles_mock.list.return_value = [
+ fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.ROLE),
+ loaded=True,
+ ),
+ ]
+
+ # Get the command object to test
+ self.cmd = role.ListRole(self.app, None)
+
+ def test_role_list_no_options(self):
+ arglist = []
+ verifylist = []
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ self.roles_mock.list.assert_called_with()
+
+ collist = ('ID', 'Name')
+ self.assertEqual(columns, collist)
+ datalist = ((
+ identity_fakes.role_id,
+ identity_fakes.role_name,
+ ), )
+ self.assertEqual(tuple(data), datalist)
+
+
+class TestRoleRemove(TestRole):
+
+ def setUp(self):
+ super(TestRoleRemove, self).setUp()
+
+ self.users_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.USER),
+ loaded=True,
+ )
+
+ self.groups_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.GROUP),
+ loaded=True,
+ )
+
+ self.domains_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.DOMAIN),
+ loaded=True,
+ )
+
+ self.projects_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.PROJECT),
+ loaded=True,
+ )
+
+ self.roles_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.ROLE),
+ loaded=True,
+ )
+ self.roles_mock.revoke.return_value = None
+
+ # Get the command object to test
+ self.cmd = role.RemoveRole(self.app, None)
+
+ def test_role_remove_user_domain(self):
+ arglist = [
+ '--user', identity_fakes.user_name,
+ '--domain', identity_fakes.domain_name,
+ identity_fakes.role_name,
+ ]
+ verifylist = [
+ ('user', identity_fakes.user_name),
+ ('group', None),
+ ('domain', identity_fakes.domain_name),
+ ('project', None),
+ ('role', identity_fakes.role_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'user': identity_fakes.user_id,
+ 'domain': identity_fakes.domain_id,
+ }
+ # RoleManager.revoke(role, user=, group=, domain=, project=)
+ self.roles_mock.revoke.assert_called_with(
+ identity_fakes.role_id,
+ **kwargs
+ )
+
+ def test_role_remove_user_project(self):
+ arglist = [
+ '--user', identity_fakes.user_name,
+ '--project', identity_fakes.project_name,
+ identity_fakes.role_name,
+ ]
+ verifylist = [
+ ('user', identity_fakes.user_name),
+ ('group', None),
+ ('domain', None),
+ ('project', identity_fakes.project_name),
+ ('role', identity_fakes.role_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'user': identity_fakes.user_id,
+ 'project': identity_fakes.project_id,
+ }
+ # RoleManager.revoke(role, user=, group=, domain=, project=)
+ self.roles_mock.revoke.assert_called_with(
+ identity_fakes.role_id,
+ **kwargs
+ )
+
+ def test_role_remove_group_domain(self):
+ arglist = [
+ '--group', identity_fakes.group_name,
+ '--domain', identity_fakes.domain_name,
+ identity_fakes.role_name,
+ ]
+ verifylist = [
+ ('user', None),
+ ('group', identity_fakes.group_name),
+ ('domain', identity_fakes.domain_name),
+ ('project', None),
+ ('role', identity_fakes.role_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'group': identity_fakes.group_id,
+ 'domain': identity_fakes.domain_id,
+ }
+ # RoleManager.revoke(role, user=, group=, domain=, project=)
+ self.roles_mock.revoke.assert_called_with(
+ identity_fakes.role_id,
+ **kwargs
+ )
+
+ def test_role_remove_group_project(self):
+ arglist = [
+ '--group', identity_fakes.group_name,
+ '--project', identity_fakes.project_name,
+ identity_fakes.role_name,
+ ]
+ verifylist = [
+ ('user', None),
+ ('group', identity_fakes.group_name),
+ ('domain', None),
+ ('project', identity_fakes.project_name),
+ ('role', identity_fakes.role_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'group': identity_fakes.group_id,
+ 'project': identity_fakes.project_id,
+ }
+ # RoleManager.revoke(role, user=, group=, domain=, project=)
+ self.roles_mock.revoke.assert_called_with(
+ identity_fakes.role_id,
+ **kwargs
+ )
+
+
+class TestRoleSet(TestRole):
+
+ def setUp(self):
+ super(TestRoleSet, self).setUp()
+
+ self.roles_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.ROLE),
+ loaded=True,
+ )
+ self.roles_mock.update.return_value = None
+
+ # Get the command object to test
+ self.cmd = role.SetRole(self.app, None)
+
+ def test_role_set_no_options(self):
+ arglist = [
+ '--name', 'over',
+ identity_fakes.role_name,
+ ]
+ verifylist = [
+ ('name', 'over'),
+ ('role', identity_fakes.role_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'name': 'over',
+ }
+ # RoleManager.update(role, name=)
+ self.roles_mock.update.assert_called_with(
+ identity_fakes.role_id,
+ **kwargs
+ )
+
+
+class TestRoleShow(TestRole):
+
+ def setUp(self):
+ super(TestRoleShow, self).setUp()
+
+ self.roles_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.ROLE),
+ loaded=True,
+ )
+
+ # Get the command object to test
+ self.cmd = role.ShowRole(self.app, None)
+
+ def test_service_show(self):
+ arglist = [
+ identity_fakes.role_name,
+ ]
+ verifylist = [
+ ('role', identity_fakes.role_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # RoleManager.get(role)
+ self.roles_mock.get.assert_called_with(
+ identity_fakes.role_name,
+ )
+
+ collist = ('id', 'name')
+ self.assertEqual(columns, collist)
+ datalist = (
+ identity_fakes.role_id,
+ identity_fakes.role_name,
+ )
+ self.assertEqual(data, datalist)
diff --git a/openstackclient/tests/identity/v3/test_service.py b/openstackclient/tests/identity/v3/test_service.py
new file mode 100644
index 0000000000..1c3ae21e16
--- /dev/null
+++ b/openstackclient/tests/identity/v3/test_service.py
@@ -0,0 +1,408 @@
+# Copyright 2013 Nebula Inc.
+#
+# 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.
+#
+
+import copy
+
+from openstackclient.identity.v3 import service
+from openstackclient.tests import fakes
+from openstackclient.tests.identity.v3 import fakes as identity_fakes
+from openstackclient.tests.identity.v3 import test_identity
+
+
+class TestService(test_identity.TestIdentityv3):
+
+ def setUp(self):
+ super(TestService, self).setUp()
+
+ # Get a shortcut to the ServiceManager Mock
+ self.services_mock = self.app.client_manager.identity.services
+ self.services_mock.reset_mock()
+
+
+class TestServiceCreate(TestService):
+
+ def setUp(self):
+ super(TestServiceCreate, self).setUp()
+
+ self.services_mock.create.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.SERVICE),
+ loaded=True,
+ )
+
+ # Get the command object to test
+ self.cmd = service.CreateService(self.app, None)
+
+ def test_service_create_name(self):
+ arglist = [
+ '--name', identity_fakes.service_name,
+ identity_fakes.service_type,
+ ]
+ verifylist = [
+ ('name', identity_fakes.service_name),
+ ('enable', False),
+ ('disable', False),
+ ('type', identity_fakes.service_type),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # ServiceManager.create(name, type, enabled=, **kwargs)
+ self.services_mock.create.assert_called_with(
+ identity_fakes.service_name,
+ identity_fakes.service_type,
+ True,
+ )
+
+ collist = ('enabled', 'id', 'name', 'type')
+ self.assertEqual(columns, collist)
+ datalist = (
+ True,
+ identity_fakes.service_id,
+ identity_fakes.service_name,
+ identity_fakes.service_type,
+ )
+ self.assertEqual(data, datalist)
+
+ def test_service_create_enable(self):
+ arglist = [
+ '--enable',
+ identity_fakes.service_type,
+ ]
+ verifylist = [
+ ('name', None),
+ ('enable', True),
+ ('disable', False),
+ ('type', identity_fakes.service_type),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # ServiceManager.create(name, type, enabled=, **kwargs)
+ self.services_mock.create.assert_called_with(
+ None,
+ identity_fakes.service_type,
+ True,
+ )
+
+ collist = ('enabled', 'id', 'name', 'type')
+ self.assertEqual(columns, collist)
+ datalist = (
+ True,
+ identity_fakes.service_id,
+ identity_fakes.service_name,
+ identity_fakes.service_type,
+ )
+ self.assertEqual(data, datalist)
+
+ def test_service_create_disable(self):
+ arglist = [
+ '--disable',
+ identity_fakes.service_type,
+ ]
+ verifylist = [
+ ('name', None),
+ ('enable', False),
+ ('disable', True),
+ ('type', identity_fakes.service_type),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # ServiceManager.create(name, type, enabled=, **kwargs)
+ self.services_mock.create.assert_called_with(
+ None,
+ identity_fakes.service_type,
+ False,
+ )
+
+ collist = ('enabled', 'id', 'name', 'type')
+ self.assertEqual(columns, collist)
+ datalist = (
+ True,
+ identity_fakes.service_id,
+ identity_fakes.service_name,
+ identity_fakes.service_type,
+ )
+ self.assertEqual(data, datalist)
+
+
+class TestServiceDelete(TestService):
+
+ def setUp(self):
+ super(TestServiceDelete, self).setUp()
+
+ self.services_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.SERVICE),
+ loaded=True,
+ )
+ self.services_mock.delete.return_value = None
+
+ # Get the command object to test
+ self.cmd = service.DeleteService(self.app, None)
+
+ def test_service_delete_no_options(self):
+ arglist = [
+ identity_fakes.service_name,
+ ]
+ verifylist = [
+ ('service', identity_fakes.service_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.run(parsed_args)
+ self.assertEqual(result, 0)
+
+ self.services_mock.delete.assert_called_with(
+ identity_fakes.service_id,
+ )
+
+
+class TestServiceList(TestService):
+
+ def setUp(self):
+ super(TestServiceList, self).setUp()
+
+ self.services_mock.list.return_value = [
+ fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.SERVICE),
+ loaded=True,
+ ),
+ ]
+
+ # Get the command object to test
+ self.cmd = service.ListService(self.app, None)
+
+ def test_service_list_no_options(self):
+ arglist = []
+ verifylist = []
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ self.services_mock.list.assert_called_with()
+
+ collist = ('ID', 'Name', 'Type', 'Enabled')
+ self.assertEqual(columns, collist)
+ datalist = ((
+ identity_fakes.service_id,
+ identity_fakes.service_name,
+ identity_fakes.service_type,
+ True,
+ ), )
+ self.assertEqual(tuple(data), datalist)
+
+
+class TestServiceSet(TestService):
+
+ def setUp(self):
+ super(TestServiceSet, self).setUp()
+
+ self.services_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.SERVICE),
+ loaded=True,
+ )
+ self.services_mock.update.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.SERVICE),
+ loaded=True,
+ )
+
+ # Get the command object to test
+ self.cmd = service.SetService(self.app, None)
+
+ def test_service_set_no_options(self):
+ arglist = [
+ identity_fakes.service_name,
+ ]
+ verifylist = [
+ ('type', None),
+ ('name', None),
+ ('enable', False),
+ ('disable', False),
+ ('service', identity_fakes.service_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.run(parsed_args)
+ self.assertEqual(result, 0)
+
+ def test_service_set_type(self):
+ arglist = [
+ '--type', identity_fakes.service_type,
+ identity_fakes.service_name,
+ ]
+ verifylist = [
+ ('type', identity_fakes.service_type),
+ ('name', None),
+ ('enable', False),
+ ('disable', False),
+ ('service', identity_fakes.service_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.run(parsed_args)
+ self.assertEqual(result, 0)
+
+ # Set expected values
+ kwargs = {
+ 'name': identity_fakes.service_name,
+ 'type': identity_fakes.service_type,
+ 'enabled': True,
+ }
+ # ServiceManager.update(service, name=, type=, enabled=, **kwargs)
+ self.services_mock.update.assert_called_with(
+ identity_fakes.service_id,
+ **kwargs
+ )
+
+ def test_service_set_name(self):
+ arglist = [
+ '--name', identity_fakes.service_name,
+ identity_fakes.service_name,
+ ]
+ verifylist = [
+ ('type', None),
+ ('name', identity_fakes.service_name),
+ ('enable', False),
+ ('disable', False),
+ ('service', identity_fakes.service_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.run(parsed_args)
+ self.assertEqual(result, 0)
+
+ # Set expected values
+ kwargs = {
+ 'name': identity_fakes.service_name,
+ 'type': identity_fakes.service_type,
+ 'enabled': True,
+ }
+ # ServiceManager.update(service, name=, type=, enabled=, **kwargs)
+ self.services_mock.update.assert_called_with(
+ identity_fakes.service_id,
+ **kwargs
+ )
+
+ def test_service_set_enable(self):
+ arglist = [
+ '--enable',
+ identity_fakes.service_name,
+ ]
+ verifylist = [
+ ('type', None),
+ ('name', None),
+ ('enable', True),
+ ('disable', False),
+ ('service', identity_fakes.service_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.run(parsed_args)
+ self.assertEqual(result, 0)
+
+ # Set expected values
+ kwargs = {
+ 'name': identity_fakes.service_name,
+ 'type': identity_fakes.service_type,
+ 'enabled': True,
+ }
+ # ServiceManager.update(service, name=, type=, enabled=, **kwargs)
+ self.services_mock.update.assert_called_with(
+ identity_fakes.service_id,
+ **kwargs
+ )
+
+ def test_service_set_disable(self):
+ arglist = [
+ '--disable',
+ identity_fakes.service_name,
+ ]
+ verifylist = [
+ ('type', None),
+ ('name', None),
+ ('enable', False),
+ ('disable', True),
+ ('service', identity_fakes.service_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.run(parsed_args)
+ self.assertEqual(result, 0)
+
+ # Set expected values
+ kwargs = {
+ 'name': identity_fakes.service_name,
+ 'type': identity_fakes.service_type,
+ 'enabled': False,
+ }
+ # ServiceManager.update(service, name=, type=, enabled=, **kwargs)
+ self.services_mock.update.assert_called_with(
+ identity_fakes.service_id,
+ **kwargs
+ )
+
+
+class TestServiceShow(TestService):
+
+ def setUp(self):
+ super(TestServiceShow, self).setUp()
+
+ self.services_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.SERVICE),
+ loaded=True,
+ )
+
+ # Get the command object to test
+ self.cmd = service.ShowService(self.app, None)
+
+ def test_service_show(self):
+ arglist = [
+ identity_fakes.service_name,
+ ]
+ verifylist = [
+ ('service', identity_fakes.service_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # ServiceManager.get(id)
+ self.services_mock.get.assert_called_with(
+ identity_fakes.service_name,
+ )
+
+ collist = ('enabled', 'id', 'name', 'type')
+ self.assertEqual(columns, collist)
+ datalist = (
+ True,
+ identity_fakes.service_id,
+ identity_fakes.service_name,
+ identity_fakes.service_type,
+ )
+ self.assertEqual(data, datalist)
diff --git a/openstackclient/tests/identity/v3/test_user.py b/openstackclient/tests/identity/v3/test_user.py
new file mode 100644
index 0000000000..8f195805c2
--- /dev/null
+++ b/openstackclient/tests/identity/v3/test_user.py
@@ -0,0 +1,986 @@
+# Copyright 2013 Nebula Inc.
+#
+# 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.
+#
+
+import copy
+
+from openstackclient.identity.v3 import user
+from openstackclient.tests import fakes
+from openstackclient.tests.identity.v3 import fakes as identity_fakes
+from openstackclient.tests.identity.v3 import test_identity
+
+
+class TestUser(test_identity.TestIdentityv3):
+
+ def setUp(self):
+ super(TestUser, self).setUp()
+
+ # Get a shortcut to the DomainManager Mock
+ self.domains_mock = self.app.client_manager.identity.domains
+ self.domains_mock.reset_mock()
+
+ # Get a shortcut to the ProjectManager Mock
+ self.projects_mock = self.app.client_manager.identity.projects
+ self.projects_mock.reset_mock()
+
+ # Get a shortcut to the RoleManager Mock
+ self.roles_mock = self.app.client_manager.identity.roles
+ self.roles_mock.reset_mock()
+
+ # Get a shortcut to the UserManager Mock
+ self.users_mock = self.app.client_manager.identity.users
+ self.users_mock.reset_mock()
+
+
+class TestUserCreate(TestUser):
+
+ def setUp(self):
+ super(TestUserCreate, self).setUp()
+
+ self.domains_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.DOMAIN),
+ loaded=True,
+ )
+
+ self.projects_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.PROJECT),
+ loaded=True,
+ )
+
+ self.users_mock.create.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.USER),
+ loaded=True,
+ )
+
+ # Get the command object to test
+ self.cmd = user.CreateUser(self.app, None)
+
+ def test_user_create_no_options(self):
+ arglist = [
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('enable', False),
+ ('disable', False),
+ ('name', identity_fakes.user_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'default_project': None,
+ 'description': None,
+ 'domain': None,
+ 'email': None,
+ 'enabled': True,
+ 'password': None,
+ }
+
+ # UserManager.create(name, domain=, project=, password=, email=,
+ # description=, enabled=, default_project=)
+ self.users_mock.create.assert_called_with(
+ identity_fakes.user_name,
+ **kwargs
+ )
+
+ collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id')
+ self.assertEqual(columns, collist)
+ datalist = (
+ identity_fakes.domain_id,
+ identity_fakes.user_email,
+ True,
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ identity_fakes.project_id,
+ )
+ self.assertEqual(data, datalist)
+
+ def test_user_create_password(self):
+ arglist = [
+ '--password', 'secret',
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('password', 'secret'),
+ ('enable', False),
+ ('disable', False),
+ ('name', identity_fakes.user_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'default_project': None,
+ 'description': None,
+ 'domain': None,
+ 'email': None,
+ 'enabled': True,
+ 'password': 'secret',
+ }
+ # UserManager.create(name, domain=, project=, password=, email=,
+ # description=, enabled=, default_project=)
+ self.users_mock.create.assert_called_with(
+ identity_fakes.user_name,
+ **kwargs
+ )
+
+ collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id')
+ self.assertEqual(columns, collist)
+ datalist = (
+ identity_fakes.domain_id,
+ identity_fakes.user_email,
+ True,
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ identity_fakes.project_id,
+ )
+ self.assertEqual(data, datalist)
+
+ def test_user_create_email(self):
+ arglist = [
+ '--email', 'barney@example.com',
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('email', 'barney@example.com'),
+ ('enable', False),
+ ('disable', False),
+ ('name', identity_fakes.user_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'default_project': None,
+ 'description': None,
+ 'domain': None,
+ 'email': 'barney@example.com',
+ 'enabled': True,
+ 'password': None,
+ }
+ # UserManager.create(name, domain=, project=, password=, email=,
+ # description=, enabled=, default_project=)
+ self.users_mock.create.assert_called_with(
+ identity_fakes.user_name,
+ **kwargs
+ )
+
+ collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id')
+ self.assertEqual(columns, collist)
+ datalist = (
+ identity_fakes.domain_id,
+ identity_fakes.user_email,
+ True,
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ identity_fakes.project_id,
+ )
+ self.assertEqual(data, datalist)
+
+ def test_user_create_project(self):
+ # Return the new project
+ self.projects_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.PROJECT_2),
+ loaded=True,
+ )
+ # Set up to return an updated user
+ USER_2 = copy.deepcopy(identity_fakes.USER)
+ USER_2['project_id'] = identity_fakes.PROJECT_2['id']
+ self.users_mock.create.return_value = fakes.FakeResource(
+ None,
+ USER_2,
+ loaded=True,
+ )
+
+ arglist = [
+ '--project', identity_fakes.PROJECT_2['name'],
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('project', identity_fakes.PROJECT_2['name']),
+ ('enable', False),
+ ('disable', False),
+ ('name', identity_fakes.user_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'default_project': identity_fakes.PROJECT_2['id'],
+ 'description': None,
+ 'domain': None,
+ 'email': None,
+ 'enabled': True,
+ 'password': None,
+ }
+ # UserManager.create(name, domain=, project=, password=, email=,
+ # description=, enabled=, default_project=)
+ self.users_mock.create.assert_called_with(
+ identity_fakes.user_name,
+ **kwargs
+ )
+
+ collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id')
+ self.assertEqual(columns, collist)
+ datalist = (
+ identity_fakes.domain_id,
+ identity_fakes.user_email,
+ True,
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ identity_fakes.PROJECT_2['id'],
+ )
+ self.assertEqual(data, datalist)
+
+ def test_user_create_domain(self):
+ arglist = [
+ '--domain', identity_fakes.domain_name,
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('domain', identity_fakes.domain_name),
+ ('enable', False),
+ ('disable', False),
+ ('name', identity_fakes.user_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'default_project': None,
+ 'description': None,
+ 'domain': identity_fakes.domain_id,
+ 'email': None,
+ 'enabled': True,
+ 'password': None,
+ }
+ # UserManager.create(name, domain=, project=, password=, email=,
+ # description=, enabled=, default_project=)
+ self.users_mock.create.assert_called_with(
+ identity_fakes.user_name,
+ **kwargs
+ )
+
+ collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id')
+ self.assertEqual(columns, collist)
+ datalist = (
+ identity_fakes.domain_id,
+ identity_fakes.user_email,
+ True,
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ identity_fakes.project_id,
+ )
+ self.assertEqual(data, datalist)
+
+ def test_user_create_enable(self):
+ arglist = [
+ '--enable',
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('enable', True),
+ ('disable', False),
+ ('name', identity_fakes.user_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'default_project': None,
+ 'description': None,
+ 'domain': None,
+ 'email': None,
+ 'enabled': True,
+ 'password': None,
+ }
+ # UserManager.create(name, domain=, project=, password=, email=,
+ # description=, enabled=, default_project=)
+ self.users_mock.create.assert_called_with(
+ identity_fakes.user_name,
+ **kwargs
+ )
+
+ collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id')
+ self.assertEqual(columns, collist)
+ datalist = (
+ identity_fakes.domain_id,
+ identity_fakes.user_email,
+ True,
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ identity_fakes.project_id,
+ )
+ self.assertEqual(data, datalist)
+
+ def test_user_create_disable(self):
+ arglist = [
+ '--disable',
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('name', identity_fakes.user_name),
+ ('enable', False),
+ ('disable', True),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'default_project': None,
+ 'description': None,
+ 'domain': None,
+ 'email': None,
+ 'enabled': False,
+ 'password': None,
+ }
+ # users.create(name, password, email, tenant_id=None, enabled=True)
+ self.users_mock.create.assert_called_with(
+ identity_fakes.user_name,
+ **kwargs
+ )
+
+ collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id')
+ self.assertEqual(columns, collist)
+ datalist = (
+ identity_fakes.domain_id,
+ identity_fakes.user_email,
+ True,
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ identity_fakes.project_id,
+ )
+ self.assertEqual(data, datalist)
+
+
+class TestUserDelete(TestUser):
+
+ def setUp(self):
+ super(TestUserDelete, self).setUp()
+
+ # This is the return value for utils.find_resource()
+ self.users_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.USER),
+ loaded=True,
+ )
+ self.users_mock.delete.return_value = None
+
+ # Get the command object to test
+ self.cmd = user.DeleteUser(self.app, None)
+
+ def test_user_delete_no_options(self):
+ arglist = [
+ identity_fakes.user_id,
+ ]
+ verifylist = [
+ ('user', identity_fakes.user_id),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ self.cmd.take_action(parsed_args)
+
+ self.users_mock.delete.assert_called_with(
+ identity_fakes.user_id,
+ )
+
+
+class TestUserList(TestUser):
+
+ def setUp(self):
+ super(TestUserList, self).setUp()
+
+ self.domains_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.DOMAIN),
+ loaded=True,
+ )
+
+ self.projects_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.PROJECT),
+ loaded=True,
+ )
+ self.projects_mock.list.return_value = [
+ fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.PROJECT),
+ loaded=True,
+ ),
+ ]
+
+ self.roles_mock.list.return_value = [
+ fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.ROLE),
+ loaded=True,
+ ),
+ ]
+
+ self.users_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.USER),
+ loaded=True,
+ )
+ self.users_mock.list.return_value = [
+ fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.USER),
+ loaded=True,
+ ),
+ ]
+
+ # Get the command object to test
+ self.cmd = user.ListUser(self.app, None)
+
+ def test_user_list_no_options(self):
+ arglist = []
+ verifylist = []
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ self.users_mock.list.assert_called_with()
+
+ collist = ('ID', 'Name')
+ self.assertEqual(columns, collist)
+ datalist = ((
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ ), )
+ self.assertEqual(tuple(data), datalist)
+
+ def test_user_list_project(self):
+ arglist = [
+ '--project', identity_fakes.project_id,
+ ]
+ verifylist = [
+ ('project', identity_fakes.project_id),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ self.users_mock.list.assert_called_with()
+
+ collist = ('ID', 'Name')
+ self.assertEqual(columns, collist)
+ datalist = ((
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ ), )
+ self.assertEqual(tuple(data), datalist)
+
+ def test_user_list_domain(self):
+ arglist = [
+ '--domain', identity_fakes.domain_id,
+ ]
+ verifylist = [
+ ('domain', identity_fakes.domain_id),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ self.users_mock.list.assert_called_with()
+
+ collist = ('ID', 'Name')
+ self.assertEqual(columns, collist)
+ datalist = ((
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ ), )
+ self.assertEqual(tuple(data), datalist)
+
+ def test_user_list_role_user(self):
+ arglist = [
+ '--role',
+ identity_fakes.user_id,
+ ]
+ verifylist = [
+ ('role', True),
+ ('user', identity_fakes.user_id),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'domain': 'default',
+ 'user': self.users_mock.get(),
+ }
+ # RoleManager.list(user=, group=, domain=, project=, **kwargs)
+ self.roles_mock.list.assert_called_with(
+ **kwargs
+ )
+
+ collist = ('ID', 'Name')
+ self.assertEqual(columns, collist)
+ datalist = ((
+ identity_fakes.role_id,
+ identity_fakes.role_name,
+ ), )
+ self.assertEqual(tuple(data), datalist)
+
+ def test_user_list_role_domain(self):
+ arglist = [
+ '--domain', identity_fakes.domain_name,
+ '--role',
+ identity_fakes.user_id,
+ ]
+ verifylist = [
+ ('domain', identity_fakes.domain_name),
+ ('role', True),
+ ('user', identity_fakes.user_id),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'domain': self.domains_mock.get(),
+ 'user': self.users_mock.get(),
+ }
+ # RoleManager.list(user=, group=, domain=, project=, **kwargs)
+ self.roles_mock.list.assert_called_with(
+ **kwargs
+ )
+
+ collist = ('ID', 'Name', 'Domain', 'User')
+ self.assertEqual(columns, collist)
+ datalist = ((
+ identity_fakes.role_id,
+ identity_fakes.role_name,
+ identity_fakes.domain_name,
+ identity_fakes.user_name,
+ ), )
+ self.assertEqual(tuple(data), datalist)
+
+ def test_user_list_role_project(self):
+ arglist = [
+ '--project', identity_fakes.project_name,
+ '--role',
+ identity_fakes.user_id,
+ ]
+ verifylist = [
+ ('project', identity_fakes.project_name),
+ ('role', True),
+ ('user', identity_fakes.user_id),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'project': self.projects_mock.get(),
+ 'user': self.users_mock.get(),
+ }
+ # RoleManager.list(user=, group=, domain=, project=, **kwargs)
+ self.roles_mock.list.assert_called_with(
+ **kwargs
+ )
+
+ collist = ('ID', 'Name', 'Project', 'User')
+ self.assertEqual(columns, collist)
+ datalist = ((
+ identity_fakes.role_id,
+ identity_fakes.role_name,
+ identity_fakes.project_name,
+ identity_fakes.user_name,
+ ), )
+ self.assertEqual(tuple(data), datalist)
+
+ def test_user_list_long(self):
+ arglist = [
+ '--long',
+ ]
+ verifylist = [
+ ('long', True),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ self.users_mock.list.assert_called_with()
+
+ collist = (
+ 'ID',
+ 'Name',
+ 'Project Id',
+ 'Domain Id',
+ 'Description',
+ 'Email',
+ 'Enabled',
+ )
+ self.assertEqual(columns, collist)
+ datalist = ((
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ identity_fakes.project_id,
+ identity_fakes.domain_id,
+ '',
+ identity_fakes.user_email,
+ True,
+ ), )
+ self.assertEqual(tuple(data), datalist)
+
+
+class TestUserSet(TestUser):
+
+ def setUp(self):
+ super(TestUserSet, self).setUp()
+
+ self.domains_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.DOMAIN),
+ loaded=True,
+ )
+
+ self.projects_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.PROJECT),
+ loaded=True,
+ )
+
+ self.users_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.USER),
+ loaded=True,
+ )
+ self.users_mock.update.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.USER),
+ loaded=True,
+ )
+
+ # Get the command object to test
+ self.cmd = user.SetUser(self.app, None)
+
+ def test_user_set_no_options(self):
+ arglist = [
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('name', None),
+ ('password', None),
+ ('email', None),
+ ('domain', None),
+ ('project', None),
+ ('enable', False),
+ ('disable', False),
+ ('user', identity_fakes.user_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.run(parsed_args)
+ self.assertEqual(result, 0)
+
+ def test_user_set_name(self):
+ arglist = [
+ '--name', 'qwerty',
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('name', 'qwerty'),
+ ('password', None),
+ ('email', None),
+ ('domain', None),
+ ('project', None),
+ ('enable', False),
+ ('disable', False),
+ ('user', identity_fakes.user_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'enabled': True,
+ 'name': 'qwerty',
+ }
+ # UserManager.update(user, name=, domain=, project=, password=,
+ # email=, description=, enabled=, default_project=)
+ self.users_mock.update.assert_called_with(
+ identity_fakes.user_id,
+ **kwargs
+ )
+
+ def test_user_set_password(self):
+ arglist = [
+ '--password', 'secret',
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('name', None),
+ ('password', 'secret'),
+ ('email', None),
+ ('domain', None),
+ ('project', None),
+ ('enable', False),
+ ('disable', False),
+ ('user', identity_fakes.user_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'enabled': True,
+ 'password': 'secret',
+ }
+ # UserManager.update(user, name=, domain=, project=, password=,
+ # email=, description=, enabled=, default_project=)
+ self.users_mock.update.assert_called_with(
+ identity_fakes.user_id,
+ **kwargs
+ )
+
+ def test_user_set_email(self):
+ arglist = [
+ '--email', 'barney@example.com',
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('name', None),
+ ('password', None),
+ ('email', 'barney@example.com'),
+ ('domain', None),
+ ('project', None),
+ ('enable', False),
+ ('disable', False),
+ ('user', identity_fakes.user_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'enabled': True,
+ 'email': 'barney@example.com',
+ }
+ # UserManager.update(user, name=, domain=, project=, password=,
+ # email=, description=, enabled=, default_project=)
+ self.users_mock.update.assert_called_with(
+ identity_fakes.user_id,
+ **kwargs
+ )
+
+ def test_user_set_domain(self):
+ arglist = [
+ '--domain', identity_fakes.domain_id,
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('name', None),
+ ('password', None),
+ ('email', None),
+ ('domain', identity_fakes.domain_id),
+ ('project', None),
+ ('enable', False),
+ ('disable', False),
+ ('user', identity_fakes.user_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'enabled': True,
+ 'domainId': identity_fakes.domain_id,
+ }
+ # UserManager.update(user, name=, domain=, project=, password=,
+ # email=, description=, enabled=, default_project=)
+ self.users_mock.update.assert_called_with(
+ identity_fakes.user_id,
+ **kwargs
+ )
+
+ def test_user_set_project(self):
+ arglist = [
+ '--project', identity_fakes.project_id,
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('name', None),
+ ('password', None),
+ ('email', None),
+ ('domain', None),
+ ('project', identity_fakes.project_id),
+ ('enable', False),
+ ('disable', False),
+ ('user', identity_fakes.user_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'enabled': True,
+ 'projectId': identity_fakes.project_id,
+ }
+ # UserManager.update(user, name=, domain=, project=, password=,
+ # email=, description=, enabled=, default_project=)
+ self.users_mock.update.assert_called_with(
+ identity_fakes.user_id,
+ **kwargs
+ )
+
+ def test_user_set_enable(self):
+ arglist = [
+ '--enable',
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('name', None),
+ ('password', None),
+ ('email', None),
+ ('domain', None),
+ ('project', None),
+ ('enable', True),
+ ('disable', False),
+ ('user', identity_fakes.user_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'enabled': True,
+ }
+ # UserManager.update(user, name=, domain=, project=, password=,
+ # email=, description=, enabled=, default_project=)
+ self.users_mock.update.assert_called_with(
+ identity_fakes.user_id,
+ **kwargs
+ )
+
+ def test_user_set_disable(self):
+ arglist = [
+ '--disable',
+ identity_fakes.user_name,
+ ]
+ verifylist = [
+ ('name', None),
+ ('password', None),
+ ('email', None),
+ ('domain', None),
+ ('project', None),
+ ('enable', False),
+ ('disable', True),
+ ('user', identity_fakes.user_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ self.cmd.take_action(parsed_args)
+
+ # Set expected values
+ kwargs = {
+ 'enabled': False,
+ }
+ # UserManager.update(user, name=, domain=, project=, password=,
+ # email=, description=, enabled=, default_project=)
+ self.users_mock.update.assert_called_with(
+ identity_fakes.user_id,
+ **kwargs
+ )
+
+
+class TestUserShow(TestUser):
+
+ def setUp(self):
+ super(TestUserShow, self).setUp()
+
+ self.users_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.USER),
+ loaded=True,
+ )
+
+ # Get the command object to test
+ self.cmd = user.ShowUser(self.app, None)
+
+ def test_user_show(self):
+ arglist = [
+ identity_fakes.user_id,
+ ]
+ verifylist = [
+ ('user', identity_fakes.user_id),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ self.users_mock.get.assert_called_with(identity_fakes.user_id)
+
+ collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id')
+ self.assertEqual(columns, collist)
+ datalist = (
+ identity_fakes.domain_id,
+ identity_fakes.user_email,
+ True,
+ identity_fakes.user_id,
+ identity_fakes.user_name,
+ identity_fakes.project_id,
+ )
+ self.assertEqual(data, datalist)