summaryrefslogtreecommitdiff
path: root/openstackclient/identity/v3/role.py
diff options
context:
space:
mode:
authorAkihiro Motoki <motoki@da.jp.nec.com>2016-01-10 21:54:53 +0900
committerAkihiro Motoki <motoki@da.jp.nec.com>2016-02-02 09:58:32 +0900
commit258c1102cc6b93a860bcd7cc083d4e14ae0025ce (patch)
tree6b963e16d6bd946c066a7163f6f36e7becba9b3b /openstackclient/identity/v3/role.py
parente9ff42eee73de147339c42bca90f777a8f40f5c1 (diff)
downloadpython-openstackclient-258c1102cc6b93a860bcd7cc083d4e14ae0025ce.tar.gz
log take_action parameters in a single place
Previously each command logs take_action parameters explicitly by using @utils.log_method decorator or log.debug(). Some commands have no logging. This commit calls a logger in the base class and drops all logging definition from individual commands. Closes-Bug: #1532294 Change-Id: I43cd0290a4353c68c075bade9571c940733da1be
Diffstat (limited to 'openstackclient/identity/v3/role.py')
-rw-r--r--openstackclient/identity/v3/role.py32
1 files changed, 4 insertions, 28 deletions
diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py
index 66f18964..4cced611 100644
--- a/openstackclient/identity/v3/role.py
+++ b/openstackclient/identity/v3/role.py
@@ -15,15 +15,12 @@
"""Identity v3 Role action implementations"""
-import logging
import six
import sys
-from cliff import command
-from cliff import lister
-from cliff import show
from keystoneauth1 import exceptions as ks_exc
+from openstackclient.common import command
from openstackclient.common import utils
from openstackclient.i18n import _ # noqa
from openstackclient.identity import common
@@ -110,8 +107,6 @@ def _process_identity_and_resource_options(parsed_args,
class AddRole(command.Command):
"""Adds a role to a user or group on a domain or project"""
- log = logging.getLogger(__name__ + '.AddRole')
-
def get_parser(self, prog_name):
parser = super(AddRole, self).get_parser(prog_name)
parser.add_argument(
@@ -122,7 +117,6 @@ class AddRole(command.Command):
_add_identity_and_resource_options_to_parser(parser)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
identity_client = self.app.client_manager.identity
@@ -147,11 +141,9 @@ class AddRole(command.Command):
return
-class CreateRole(show.ShowOne):
+class CreateRole(command.ShowOne):
"""Create new role"""
- log = logging.getLogger(__name__ + '.CreateRole')
-
def get_parser(self, prog_name):
parser = super(CreateRole, self).get_parser(prog_name)
parser.add_argument(
@@ -166,7 +158,6 @@ class CreateRole(show.ShowOne):
)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
identity_client = self.app.client_manager.identity
@@ -187,8 +178,6 @@ class CreateRole(show.ShowOne):
class DeleteRole(command.Command):
"""Delete role(s)"""
- log = logging.getLogger(__name__ + '.DeleteRole')
-
def get_parser(self, prog_name):
parser = super(DeleteRole, self).get_parser(prog_name)
parser.add_argument(
@@ -199,7 +188,6 @@ class DeleteRole(command.Command):
)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
identity_client = self.app.client_manager.identity
@@ -212,18 +200,15 @@ class DeleteRole(command.Command):
return
-class ListRole(lister.Lister):
+class ListRole(command.Lister):
"""List roles"""
- log = logging.getLogger(__name__ + '.ListRole')
-
def get_parser(self, prog_name):
parser = super(ListRole, self).get_parser(prog_name)
_add_identity_and_resource_options_to_parser(parser)
return parser
def take_action(self, parsed_args):
- self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
if parsed_args.user:
@@ -318,8 +303,6 @@ class ListRole(lister.Lister):
class RemoveRole(command.Command):
"""Remove role from domain/project : user/group"""
- log = logging.getLogger(__name__ + '.RemoveRole')
-
def get_parser(self, prog_name):
parser = super(RemoveRole, self).get_parser(prog_name)
parser.add_argument(
@@ -330,7 +313,6 @@ class RemoveRole(command.Command):
_add_identity_and_resource_options_to_parser(parser)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
identity_client = self.app.client_manager.identity
@@ -357,8 +339,6 @@ class RemoveRole(command.Command):
class SetRole(command.Command):
"""Set role properties"""
- log = logging.getLogger(__name__ + '.SetRole')
-
def get_parser(self, prog_name):
parser = super(SetRole, self).get_parser(prog_name)
parser.add_argument(
@@ -373,7 +353,6 @@ class SetRole(command.Command):
)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
identity_client = self.app.client_manager.identity
@@ -389,11 +368,9 @@ class SetRole(command.Command):
return
-class ShowRole(show.ShowOne):
+class ShowRole(command.ShowOne):
"""Display role details"""
- log = logging.getLogger(__name__ + '.ShowRole')
-
def get_parser(self, prog_name):
parser = super(ShowRole, self).get_parser(prog_name)
parser.add_argument(
@@ -403,7 +380,6 @@ class ShowRole(show.ShowOne):
)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
identity_client = self.app.client_manager.identity