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/volume/v1/volume.py | 30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

(limited to 'openstackclient/volume/v1/volume.py')

diff --git a/openstackclient/volume/v1/volume.py b/openstackclient/volume/v1/volume.py
index 17b6c9c8..90827d20 100644
--- a/openstackclient/volume/v1/volume.py
+++ b/openstackclient/volume/v1/volume.py
@@ -16,22 +16,16 @@
 """Volume v1 Volume 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 parseractions
 from openstackclient.common import utils
 
 
-class CreateVolume(show.ShowOne):
+class CreateVolume(command.ShowOne):
     """Create new volume"""
 
-    log = logging.getLogger(__name__ + '.CreateVolume')
-
     def get_parser(self, prog_name):
         parser = super(CreateVolume, self).get_parser(prog_name)
         parser.add_argument(
@@ -102,7 +96,6 @@ class CreateVolume(show.ShowOne):
 
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
 
         identity_client = self.app.client_manager.identity
@@ -166,8 +159,6 @@ class CreateVolume(show.ShowOne):
 class DeleteVolume(command.Command):
     """Delete volume(s)"""
 
-    log = logging.getLogger(__name__ + '.DeleteVolume')
-
     def get_parser(self, prog_name):
         parser = super(DeleteVolume, self).get_parser(prog_name)
         parser.add_argument(
@@ -186,7 +177,6 @@ class DeleteVolume(command.Command):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         volume_client = self.app.client_manager.volume
         for volume in parsed_args.volumes:
@@ -198,11 +188,9 @@ class DeleteVolume(command.Command):
                 volume_client.volumes.delete(volume_obj.id)
 
 
-class ListVolume(lister.Lister):
+class ListVolume(command.Lister):
     """List volumes"""
 
-    log = logging.getLogger(__name__ + '.ListVolume')
-
     def get_parser(self, prog_name):
         parser = super(ListVolume, self).get_parser(prog_name)
         parser.add_argument(
@@ -229,7 +217,6 @@ class ListVolume(lister.Lister):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
 
         volume_client = self.app.client_manager.volume
@@ -316,8 +303,6 @@ class ListVolume(lister.Lister):
 class SetVolume(command.Command):
     """Set volume properties"""
 
-    log = logging.getLogger(__name__ + '.SetVolume')
-
     def get_parser(self, prog_name):
         parser = super(SetVolume, self).get_parser(prog_name)
         parser.add_argument(
@@ -350,7 +335,6 @@ class SetVolume(command.Command):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         volume_client = self.app.client_manager.volume
         volume = utils.find_resource(volume_client.volumes, parsed_args.volume)
@@ -382,11 +366,9 @@ class SetVolume(command.Command):
             self.app.log.error("No changes requested\n")
 
 
-class ShowVolume(show.ShowOne):
+class ShowVolume(command.ShowOne):
     """Show volume details"""
 
-    log = logging.getLogger(__name__ + '.ShowVolume')
-
     def get_parser(self, prog_name):
         parser = super(ShowVolume, self).get_parser(prog_name)
         parser.add_argument(
@@ -396,7 +378,6 @@ class ShowVolume(show.ShowOne):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         volume_client = self.app.client_manager.volume
         volume = utils.find_resource(volume_client.volumes, parsed_args.volume)
@@ -418,8 +399,6 @@ class ShowVolume(show.ShowOne):
 class UnsetVolume(command.Command):
     """Unset volume properties"""
 
-    log = logging.getLogger(__name__ + '.UnsetVolume')
-
     def get_parser(self, prog_name):
         parser = super(UnsetVolume, self).get_parser(prog_name)
         parser.add_argument(
@@ -438,7 +417,6 @@ class UnsetVolume(command.Command):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         volume_client = self.app.client_manager.volume
         volume = utils.find_resource(
-- 
cgit v1.2.1