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/service.py | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

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

diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py
index c9d48441..3af85d7d 100644
--- a/openstackclient/identity/v2_0/service.py
+++ b/openstackclient/identity/v2_0/service.py
@@ -16,24 +16,18 @@
 """Service action implementations"""
 
 import argparse
-import logging
 import six
 
-from cliff import command
-from cliff import lister
-from cliff import show
-
+from openstackclient.common import command
 from openstackclient.common import exceptions
 from openstackclient.common import utils
 from openstackclient.i18n import _  # noqa
 from openstackclient.identity import common
 
 
-class CreateService(show.ShowOne):
+class CreateService(command.ShowOne):
     """Create new service"""
 
-    log = logging.getLogger(__name__ + '.CreateService')
-
     def get_parser(self, prog_name):
         parser = super(CreateService, self).get_parser(prog_name)
         parser.add_argument(
@@ -59,7 +53,6 @@ class CreateService(show.ShowOne):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
 
@@ -95,8 +88,6 @@ class CreateService(show.ShowOne):
 class DeleteService(command.Command):
     """Delete service"""
 
-    log = logging.getLogger(__name__ + '.DeleteService')
-
     def get_parser(self, prog_name):
         parser = super(DeleteService, self).get_parser(prog_name)
         parser.add_argument(
@@ -106,7 +97,6 @@ class DeleteService(command.Command):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
         service = common.find_service(identity_client, parsed_args.service)
@@ -114,11 +104,9 @@ class DeleteService(command.Command):
         return
 
 
-class ListService(lister.Lister):
+class ListService(command.Lister):
     """List services"""
 
-    log = logging.getLogger(__name__ + '.ListService')
-
     def get_parser(self, prog_name):
         parser = super(ListService, self).get_parser(prog_name)
         parser.add_argument(
@@ -129,7 +117,6 @@ class ListService(lister.Lister):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
 
         if parsed_args.long:
@@ -143,11 +130,9 @@ class ListService(lister.Lister):
         )
 
 
-class ShowService(show.ShowOne):
+class ShowService(command.ShowOne):
     """Display service details"""
 
-    log = logging.getLogger(__name__ + '.ShowService')
-
     def get_parser(self, prog_name):
         parser = super(ShowService, self).get_parser(prog_name)
         parser.add_argument(
@@ -163,7 +148,6 @@ class ShowService(show.ShowOne):
         )
         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
-- 
cgit v1.2.1