From 258c1102cc6b93a860bcd7cc083d4e14ae0025ce Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <motoki@da.jp.nec.com>
Date: Sun, 10 Jan 2016 21:54:53 +0900
Subject: 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
---
 openstackclient/identity/v2_0/role.py | 36 ++++++-----------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

(limited to 'openstackclient/identity/v2_0/role.py')

diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py
index cab6b4a5..892ce006 100644
--- a/openstackclient/identity/v2_0/role.py
+++ b/openstackclient/identity/v2_0/role.py
@@ -15,24 +15,19 @@
 
 """Identity v2 Role action implementations"""
 
-import logging
 import six
 
-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 exceptions
 from openstackclient.common import utils
 from openstackclient.i18n import _  # noqa
 
 
-class AddRole(show.ShowOne):
+class AddRole(command.ShowOne):
     """Add role to project:user"""
 
-    log = logging.getLogger(__name__ + '.AddRole')
-
     def get_parser(self, prog_name):
         parser = super(AddRole, self).get_parser(prog_name)
         parser.add_argument(
@@ -54,7 +49,6 @@ class AddRole(show.ShowOne):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
         role = utils.find_resource(identity_client.roles, parsed_args.role)
@@ -74,11 +68,9 @@ class AddRole(show.ShowOne):
         return zip(*sorted(six.iteritems(info)))
 
 
-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(
@@ -93,7 +85,6 @@ class CreateRole(show.ShowOne):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
         try:
@@ -116,8 +107,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(
@@ -128,7 +117,6 @@ class DeleteRole(command.Command):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
 
@@ -141,11 +129,9 @@ 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)
         parser.add_argument(
@@ -160,7 +146,6 @@ class ListRole(lister.Lister):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
         auth_ref = self.app.client_manager.auth_ref
@@ -222,11 +207,9 @@ class ListRole(lister.Lister):
                 ) for s in data))
 
 
-class ListUserRole(lister.Lister):
+class ListUserRole(command.Lister):
     """List user-role assignments"""
 
-    log = logging.getLogger(__name__ + '.ListUserRole')
-
     def get_parser(self, prog_name):
         parser = super(ListUserRole, self).get_parser(prog_name)
         parser.add_argument(
@@ -242,7 +225,6 @@ class ListUserRole(lister.Lister):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
         auth_ref = self.app.client_manager.auth_ref
@@ -293,8 +275,6 @@ class ListUserRole(lister.Lister):
 class RemoveRole(command.Command):
     """Remove role from project : user"""
 
-    log = logging.getLogger(__name__ + '.RemoveRole')
-
     def get_parser(self, prog_name):
         parser = super(RemoveRole, self).get_parser(prog_name)
         parser.add_argument(
@@ -316,7 +296,6 @@ class RemoveRole(command.Command):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
         role = utils.find_resource(identity_client.roles, parsed_args.role)
@@ -331,11 +310,9 @@ class RemoveRole(command.Command):
             project.id)
 
 
-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(
@@ -345,7 +322,6 @@ class ShowRole(show.ShowOne):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
         role = utils.find_resource(identity_client.roles, parsed_args.role)
-- 
cgit v1.2.1