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

2 files changed, 9 insertions, 66 deletions

diff --git a/openstackclient/image/v1/image.py b/openstackclient/image/v1/image.py
index c18f3fc7..9cc5facd 100644
--- a/openstackclient/image/v1/image.py
+++ b/openstackclient/image/v1/image.py
@@ -17,7 +17,6 @@
 
 import argparse
 import io
-import logging
 import os
 import six
 import sys
@@ -27,12 +26,9 @@ if os.name == "nt":
 else:
     msvcrt = None
 
-from cliff import command
-from cliff import lister
-from cliff import show
-
 from glanceclient.common import utils as gc_utils
 from openstackclient.api import utils as api_utils
+from openstackclient.common import command
 from openstackclient.common import parseractions
 from openstackclient.common import utils
 from openstackclient.i18n import _  # noqa
@@ -57,11 +53,9 @@ def _format_visibility(data):
         return 'private'
 
 
-class CreateImage(show.ShowOne):
+class CreateImage(command.ShowOne):
     """Create/upload an image"""
 
-    log = logging.getLogger(__name__ + ".CreateImage")
-
     def get_parser(self, prog_name):
         parser = super(CreateImage, self).get_parser(prog_name)
         parser.add_argument(
@@ -191,7 +185,6 @@ class CreateImage(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)", parsed_args)
         image_client = self.app.client_manager.image
 
         if getattr(parsed_args, 'owner', None) is not None:
@@ -283,8 +276,6 @@ class CreateImage(show.ShowOne):
 class DeleteImage(command.Command):
     """Delete image(s)"""
 
-    log = logging.getLogger(__name__ + ".DeleteImage")
-
     def get_parser(self, prog_name):
         parser = super(DeleteImage, self).get_parser(prog_name)
         parser.add_argument(
@@ -296,8 +287,6 @@ class DeleteImage(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)", parsed_args)
-
         image_client = self.app.client_manager.image
         for image in parsed_args.images:
             image_obj = utils.find_resource(
@@ -307,11 +296,9 @@ class DeleteImage(command.Command):
             image_client.images.delete(image_obj.id)
 
 
-class ListImage(lister.Lister):
+class ListImage(command.Lister):
     """List available images"""
 
-    log = logging.getLogger(__name__ + ".ListImage")
-
     def get_parser(self, prog_name):
         parser = super(ListImage, self).get_parser(prog_name)
         public_group = parser.add_mutually_exclusive_group()
@@ -367,8 +354,6 @@ class ListImage(lister.Lister):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)", parsed_args)
-
         image_client = self.app.client_manager.image
 
         kwargs = {}
@@ -452,8 +437,6 @@ class ListImage(lister.Lister):
 class SaveImage(command.Command):
     """Save an image locally"""
 
-    log = logging.getLogger(__name__ + ".SaveImage")
-
     def get_parser(self, prog_name):
         parser = super(SaveImage, self).get_parser(prog_name)
         parser.add_argument(
@@ -469,8 +452,6 @@ class SaveImage(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)", parsed_args)
-
         image_client = self.app.client_manager.image
         image = utils.find_resource(
             image_client.images,
@@ -484,8 +465,6 @@ class SaveImage(command.Command):
 class SetImage(command.Command):
     """Set image properties"""
 
-    log = logging.getLogger(__name__ + ".SetImage")
-
     def get_parser(self, prog_name):
         parser = super(SetImage, self).get_parser(prog_name)
         parser.add_argument(
@@ -624,7 +603,6 @@ class SetImage(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)", parsed_args)
         image_client = self.app.client_manager.image
 
         if getattr(parsed_args, 'owner', None) is not None:
@@ -723,11 +701,9 @@ class SetImage(command.Command):
                     kwargs['data'].close()
 
 
-class ShowImage(show.ShowOne):
+class ShowImage(command.ShowOne):
     """Display image details"""
 
-    log = logging.getLogger(__name__ + ".ShowImage")
-
     def get_parser(self, prog_name):
         parser = super(ShowImage, self).get_parser(prog_name)
         parser.add_argument(
@@ -738,8 +714,6 @@ class ShowImage(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)", parsed_args)
-
         image_client = self.app.client_manager.image
         image = utils.find_resource(
             image_client.images,
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
index 123599ed..39a53195 100644
--- a/openstackclient/image/v2/image.py
+++ b/openstackclient/image/v2/image.py
@@ -16,15 +16,12 @@
 """Image V2 Action Implementations"""
 
 import argparse
-import logging
 import six
 
-from cliff import command
-from cliff import lister
-from cliff import show
 from glanceclient.common import utils as gc_utils
 
 from openstackclient.api import utils as api_utils
+from openstackclient.common import command
 from openstackclient.common import exceptions
 from openstackclient.common import parseractions
 from openstackclient.common import utils
@@ -67,11 +64,9 @@ def _format_image(image):
     return info
 
 
-class AddProjectToImage(show.ShowOne):
+class AddProjectToImage(command.ShowOne):
     """Associate project with image"""
 
-    log = logging.getLogger(__name__ + ".AddProjectToImage")
-
     def get_parser(self, prog_name):
         parser = super(AddProjectToImage, self).get_parser(prog_name)
         parser.add_argument(
@@ -88,8 +83,6 @@ class AddProjectToImage(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)", parsed_args)
-
         image_client = self.app.client_manager.image
         identity_client = self.app.client_manager.identity
 
@@ -109,10 +102,9 @@ class AddProjectToImage(show.ShowOne):
         return zip(*sorted(six.iteritems(image_member)))
 
 
-class CreateImage(show.ShowOne):
+class CreateImage(command.ShowOne):
     """Create/upload an image"""
 
-    log = logging.getLogger(__name__ + ".CreateImage")
     deadopts = ('size', 'location', 'copy-from', 'checksum', 'store')
 
     def get_parser(self, prog_name):
@@ -241,7 +233,6 @@ class CreateImage(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)", parsed_args)
         identity_client = self.app.client_manager.identity
         image_client = self.app.client_manager.image
 
@@ -366,8 +357,6 @@ class CreateImage(show.ShowOne):
 class DeleteImage(command.Command):
     """Delete image(s)"""
 
-    log = logging.getLogger(__name__ + ".DeleteImage")
-
     def get_parser(self, prog_name):
         parser = super(DeleteImage, self).get_parser(prog_name)
         parser.add_argument(
@@ -379,8 +368,6 @@ class DeleteImage(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)", parsed_args)
-
         image_client = self.app.client_manager.image
         for image in parsed_args.images:
             image_obj = utils.find_resource(
@@ -390,11 +377,9 @@ class DeleteImage(command.Command):
             image_client.images.delete(image_obj.id)
 
 
-class ListImage(lister.Lister):
+class ListImage(command.Lister):
     """List available images"""
 
-    log = logging.getLogger(__name__ + ".ListImage")
-
     def get_parser(self, prog_name):
         parser = super(ListImage, self).get_parser(prog_name)
         public_group = parser.add_mutually_exclusive_group()
@@ -449,8 +434,6 @@ class ListImage(lister.Lister):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)", parsed_args)
-
         image_client = self.app.client_manager.image
 
         kwargs = {}
@@ -529,8 +512,6 @@ class ListImage(lister.Lister):
 class RemoveProjectImage(command.Command):
     """Disassociate project with image"""
 
-    log = logging.getLogger(__name__ + ".RemoveProjectImage")
-
     def get_parser(self, prog_name):
         parser = super(RemoveProjectImage, self).get_parser(prog_name)
         parser.add_argument(
@@ -547,8 +528,6 @@ class RemoveProjectImage(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)", parsed_args)
-
         image_client = self.app.client_manager.image
         identity_client = self.app.client_manager.identity
 
@@ -566,8 +545,6 @@ class RemoveProjectImage(command.Command):
 class SaveImage(command.Command):
     """Save an image locally"""
 
-    log = logging.getLogger(__name__ + ".SaveImage")
-
     def get_parser(self, prog_name):
         parser = super(SaveImage, self).get_parser(prog_name)
         parser.add_argument(
@@ -583,8 +560,6 @@ class SaveImage(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)", parsed_args)
-
         image_client = self.app.client_manager.image
         image = utils.find_resource(
             image_client.images,
@@ -598,7 +573,6 @@ class SaveImage(command.Command):
 class SetImage(command.Command):
     """Set image properties"""
 
-    log = logging.getLogger(__name__ + ".SetImage")
     deadopts = ('visibility',)
 
     def get_parser(self, prog_name):
@@ -758,7 +732,6 @@ class SetImage(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)", parsed_args)
         identity_client = self.app.client_manager.identity
         image_client = self.app.client_manager.image
 
@@ -848,11 +821,9 @@ class SetImage(command.Command):
             raise e
 
 
-class ShowImage(show.ShowOne):
+class ShowImage(command.ShowOne):
     """Display image details"""
 
-    log = logging.getLogger(__name__ + ".ShowImage")
-
     def get_parser(self, prog_name):
         parser = super(ShowImage, self).get_parser(prog_name)
         parser.add_argument(
@@ -863,8 +834,6 @@ class ShowImage(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)", parsed_args)
-
         image_client = self.app.client_manager.image
         image = utils.find_resource(
             image_client.images,