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

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

diff --git a/openstackclient/volume/v1/snapshot.py b/openstackclient/volume/v1/snapshot.py
index 24379a9a..95200e40 100644
--- a/openstackclient/volume/v1/snapshot.py
+++ b/openstackclient/volume/v1/snapshot.py
@@ -16,22 +16,16 @@
 """Volume v1 Snapshot action implementations"""
 
 import copy
-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 CreateSnapshot(show.ShowOne):
+class CreateSnapshot(command.ShowOne):
     """Create new snapshot"""
 
-    log = logging.getLogger(__name__ + '.CreateSnapshot')
-
     def get_parser(self, prog_name):
         parser = super(CreateSnapshot, self).get_parser(prog_name)
         parser.add_argument(
@@ -59,7 +53,6 @@ class CreateSnapshot(show.ShowOne):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         volume_client = self.app.client_manager.volume
         volume_id = utils.find_resource(volume_client.volumes,
@@ -81,8 +74,6 @@ class CreateSnapshot(show.ShowOne):
 class DeleteSnapshot(command.Command):
     """Delete snapshot(s)"""
 
-    log = logging.getLogger(__name__ + '.DeleteSnapshot')
-
     def get_parser(self, prog_name):
         parser = super(DeleteSnapshot, self).get_parser(prog_name)
         parser.add_argument(
@@ -93,7 +84,6 @@ class DeleteSnapshot(command.Command):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         volume_client = self.app.client_manager.volume
         for snapshot in parsed_args.snapshots:
@@ -102,11 +92,9 @@ class DeleteSnapshot(command.Command):
             volume_client.volume_snapshots.delete(snapshot_id)
 
 
-class ListSnapshot(lister.Lister):
+class ListSnapshot(command.Lister):
     """List snapshots"""
 
-    log = logging.getLogger(__name__ + '.ListSnapshot')
-
     def get_parser(self, prog_name):
         parser = super(ListSnapshot, self).get_parser(prog_name)
         parser.add_argument(
@@ -123,7 +111,6 @@ class ListSnapshot(lister.Lister):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
 
         def _format_volume_id(volume_id):
@@ -179,8 +166,6 @@ class ListSnapshot(lister.Lister):
 class SetSnapshot(command.Command):
     """Set snapshot properties"""
 
-    log = logging.getLogger(__name__ + '.SetSnapshot')
-
     def get_parser(self, prog_name):
         parser = super(SetSnapshot, self).get_parser(prog_name)
         parser.add_argument(
@@ -204,7 +189,6 @@ class SetSnapshot(command.Command):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         volume_client = self.app.client_manager.volume
         snapshot = utils.find_resource(volume_client.volume_snapshots,
@@ -227,11 +211,9 @@ class SetSnapshot(command.Command):
         snapshot.update(**kwargs)
 
 
-class ShowSnapshot(show.ShowOne):
+class ShowSnapshot(command.ShowOne):
     """Display snapshot details"""
 
-    log = logging.getLogger(__name__ + '.ShowSnapshot')
-
     def get_parser(self, prog_name):
         parser = super(ShowSnapshot, self).get_parser(prog_name)
         parser.add_argument(
@@ -240,7 +222,6 @@ class ShowSnapshot(show.ShowOne):
             help='Snapshot to display (name or ID)')
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         volume_client = self.app.client_manager.volume
         snapshot = utils.find_resource(volume_client.volume_snapshots,
@@ -256,8 +237,6 @@ class ShowSnapshot(show.ShowOne):
 class UnsetSnapshot(command.Command):
     """Unset snapshot properties"""
 
-    log = logging.getLogger(__name__ + '.UnsetSnapshot')
-
     def get_parser(self, prog_name):
         parser = super(UnsetSnapshot, self).get_parser(prog_name)
         parser.add_argument(
@@ -276,7 +255,6 @@ class UnsetSnapshot(command.Command):
         )
         return parser
 
-    @utils.log_method(log)
     def take_action(self, parsed_args):
         volume_client = self.app.client_manager.volume
         snapshot = utils.find_resource(
-- 
cgit v1.2.1