summaryrefslogtreecommitdiff
path: root/openstackclient/identity/v3
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2013-01-31 13:31:41 -0600
committerJosh Kearney <josh@jk0.org>2013-01-31 13:31:41 -0600
commitb26cb5bf683e7f4f03d9704524a188b76ac5e9b9 (patch)
treef059ddb3b7e15f50d722cf1fbd2b0eaf8242b1a4 /openstackclient/identity/v3
parentaa4f12aec1d13d02df2ecc2710d85ebd90d6dfe7 (diff)
downloadpython-openstackclient-b26cb5bf683e7f4f03d9704524a188b76ac5e9b9.tar.gz
Upgraded to PEP8 1.3.3 to stay aligned with Nova, etc.
Made all the necessary changes to pass new PEP8 standards. Also cleaned up docstrings to conform to the HACKING stanards. Change-Id: Ib8df3030da7a7885655689ab5da0717748c9edbe
Diffstat (limited to 'openstackclient/identity/v3')
-rw-r--r--openstackclient/identity/v3/group.py53
-rw-r--r--openstackclient/identity/v3/project.py70
2 files changed, 45 insertions, 78 deletions
diff --git a/openstackclient/identity/v3/group.py b/openstackclient/identity/v3/group.py
index f783eb4f..3a9b80ed 100644
--- a/openstackclient/identity/v3/group.py
+++ b/openstackclient/identity/v3/group.py
@@ -13,9 +13,7 @@
# under the License.
#
-"""
-Group action implementations
-"""
+"""Group action implementations"""
import logging
@@ -37,18 +35,15 @@ class CreateGroup(show.ShowOne):
parser.add_argument(
'name',
metavar='<group-name>',
- help='New group name',
- )
+ help='New group name')
parser.add_argument(
'--description',
metavar='<group-description>',
- help='New group description',
- )
+ help='New group description')
parser.add_argument(
'--domain',
metavar='<group-domain>',
- help='References the domain ID or name which owns the group',
- )
+ help='References the domain ID or name which owns the group')
return parser
@@ -56,15 +51,14 @@ class CreateGroup(show.ShowOne):
self.log.debug('take_action(%s)' % parsed_args)
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
group = identity_client.groups.create(
parsed_args.name,
domain=domain,
- description=parsed_args.description,
- )
+ description=parsed_args.description)
info = {}
info.update(group._info)
@@ -82,15 +76,13 @@ class DeleteGroup(command.Command):
parser.add_argument(
'group',
metavar='<group>',
- help='Name or ID of group to delete',
- )
+ help='Name or ID of group 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
- group = utils.find_resource(
- identity_client.groups, parsed_args.group)
+ group = utils.find_resource(identity_client.groups, parsed_args.group)
identity_client.groups.delete(group.id)
return
@@ -107,8 +99,7 @@ class ListGroup(lister.Lister):
'--long',
action='store_true',
default=False,
- help='Additional fields are listed in output',
- )
+ help='Additional fields are listed in output')
return parser
def take_action(self, parsed_args):
@@ -122,8 +113,7 @@ class ListGroup(lister.Lister):
(utils.get_item_properties(
s, columns,
formatters={},
- ) for s in data),
- )
+ ) for s in data))
class SetGroup(command.Command):
@@ -137,30 +127,25 @@ class SetGroup(command.Command):
parser.add_argument(
'group',
metavar='<group>',
- help='Name or ID of group to change',
- )
+ help='Name or ID of group to change')
parser.add_argument(
'--name',
metavar='<new-group-name>',
- help='New group name',
- )
+ help='New group name')
parser.add_argument(
'--domain',
metavar='<group-domain>',
- help='New domain name or ID that will now own the group',
- )
+ help='New domain name or ID that will now own the group')
parser.add_argument(
'--description',
metavar='<group-description>',
- help='New group description',
- )
+ help='New group description')
return parser
def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
- group = utils.find_resource(
- identity_client.groups, parsed_args.group)
+ group = utils.find_resource(identity_client.groups, parsed_args.group)
kwargs = {}
if parsed_args.name:
kwargs['name'] = parsed_args.name
@@ -189,15 +174,13 @@ class ShowGroup(show.ShowOne):
parser.add_argument(
'group',
metavar='<group>',
- help='Name or ID of group to display',
- )
+ help='Name or ID of group to display')
return parser
def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
- group = utils.find_resource(
- identity_client.groups, parsed_args.group)
+ group = utils.find_resource(identity_client.groups, parsed_args.group)
info = {}
info.update(group._info)
diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py
index 06022e45..d1e67acc 100644
--- a/openstackclient/identity/v3/project.py
+++ b/openstackclient/identity/v3/project.py
@@ -13,9 +13,7 @@
# under the License.
#
-"""
-Project action implementations
-"""
+"""Project action implementations"""
import logging
@@ -37,18 +35,15 @@ class CreateProject(show.ShowOne):
parser.add_argument(
'project_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='References the domain name or ID which owns the project')
parser.add_argument(
'--description',
metavar='<project-description>',
- help='New project description',
- )
+ help='New project description')
# FIXME (stevemar): need to update enabled/disabled as per Dolph's
# comments in 19999/4
enable_group = parser.add_mutually_exclusive_group()
@@ -57,30 +52,29 @@ class CreateProject(show.ShowOne):
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',
- )
+ 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
+
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
+
project = identity_client.projects.create(
parsed_args.project_name,
domain=domain,
description=parsed_args.description,
- enabled=parsed_args.enabled,
- )
+ enabled=parsed_args.enabled)
info = {}
info.update(project._info)
@@ -98,15 +92,14 @@ class DeleteProject(command.Command):
parser.add_argument(
'project',
metavar='<project>',
- help='Name or ID of project to delete',
- )
+ help='Name or ID of project 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
- 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
@@ -123,8 +116,7 @@ class ListProject(lister.Lister):
'--long',
action='store_true',
default=False,
- help='Additional fields are listed in output',
- )
+ help='Additional fields are listed in output')
return parser
def take_action(self, parsed_args):
@@ -138,8 +130,7 @@ class ListProject(lister.Lister):
(utils.get_item_properties(
s, columns,
formatters={},
- ) for s in data),
- )
+ ) for s in data))
class SetProject(command.Command):
@@ -153,44 +144,38 @@ class SetProject(command.Command):
parser.add_argument(
'project',
metavar='<project>',
- help='Name or ID of project to change',
- )
+ help='Name or ID of project to change')
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 name or ID that will now own the project')
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 (default)')
enable_group.add_argument(
'--disable',
dest='enabled',
action='store_false',
- help='Disable project',
- )
+ 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)
+ project = utils.find_resource(identity_client.projects,
+ parsed_args.project)
kwargs = {}
if parsed_args.name:
kwargs['name'] = parsed_args.name
@@ -221,15 +206,14 @@ class ShowProject(show.ShowOne):
parser.add_argument(
'project',
metavar='<project>',
- help='Name or ID of project to display',
- )
+ help='Name or ID of project to display')
return parser
def take_action(self, parsed_args):
self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
- project = utils.find_resource(
- identity_client.projects, parsed_args.project)
+ project = utils.find_resource(identity_client.projects,
+ parsed_args.project)
info = {}
info.update(project._info)