Standardize logger usage

Use file logger for all command specific logs.

This patch also fixes some usage that doesn't
follow rules in:
http://docs.openstack.org/developer/oslo.i18n/guidelines.html

After this patch, all self.log and self.app.log
will be standardized to LOG().

NOTE: In shell.py, we got the log in class OpenStackShell,
      which is also known as self.app.log in other classes.
      This logger is used to record non-command-specific logs.
      So we leave it as-is.

Change-Id: I114f73ee6c7e84593d71e724bc1ad00d343c1896
Implements: blueprint log-usage

3 files changed, 22 insertions, 13 deletions

diff --git a/openstackclient/network/common.py b/openstackclient/network/common.py
index 16cc7379..f62840fc 100644
--- a/openstackclient/network/common.py
+++ b/openstackclient/network/common.py
@@ -12,6 +12,7 @@
 #
 
 import abc
+import logging
 
 from osc_lib.command import command
 from osc_lib import exceptions
@@ -20,6 +21,9 @@ import six
 from openstackclient.i18n import _
 
 
+LOG = logging.getLogger(__name__)
+
+
 @six.add_metaclass(abc.ABCMeta)
 class NetworkAndComputeCommand(command.Command):
     """Network and Compute Command
@@ -39,10 +43,10 @@ class NetworkAndComputeCommand(command.Command):
                                             parsed_args)
 
     def get_parser(self, prog_name):
-        self.log.debug('get_parser(%s)', prog_name)
+        LOG.debug('get_parser(%s)', prog_name)
         parser = super(NetworkAndComputeCommand, self).get_parser(prog_name)
         parser = self.update_parser_common(parser)
-        self.log.debug('common parser: %s', parser)
+        LOG.debug('common parser: %s', parser)
         if self.app.client_manager.is_network_endpoint_enabled():
             return self.update_parser_network(parser)
         else:
@@ -102,7 +106,7 @@ class NetworkAndComputeDelete(NetworkAndComputeCommand):
                             "name_or_id": r,
                             "e": e,
                 }
-                self.app.log.error(msg)
+                LOG.error(msg)
                 ret += 1
 
         if ret:
@@ -134,10 +138,10 @@ class NetworkAndComputeLister(command.Lister):
                                             parsed_args)
 
     def get_parser(self, prog_name):
-        self.log.debug('get_parser(%s)', prog_name)
+        LOG.debug('get_parser(%s)', prog_name)
         parser = super(NetworkAndComputeLister, self).get_parser(prog_name)
         parser = self.update_parser_common(parser)
-        self.log.debug('common parser: %s', parser)
+        LOG.debug('common parser: %s', parser)
         if self.app.client_manager.is_network_endpoint_enabled():
             return self.update_parser_network(parser)
         else:
@@ -185,10 +189,10 @@ class NetworkAndComputeShowOne(command.ShowOne):
                                             parsed_args)
 
     def get_parser(self, prog_name):
-        self.log.debug('get_parser(%s)', prog_name)
+        LOG.debug('get_parser(%s)', prog_name)
         parser = super(NetworkAndComputeShowOne, self).get_parser(prog_name)
         parser = self.update_parser_common(parser)
-        self.log.debug('common parser: %s', parser)
+        LOG.debug('common parser: %s', parser)
         if self.app.client_manager.is_network_endpoint_enabled():
             return self.update_parser_network(parser)
         else:
diff --git a/openstackclient/network/v2/address_scope.py b/openstackclient/network/v2/address_scope.py
index bc1a96c3..6cd13f8c 100644
--- a/openstackclient/network/v2/address_scope.py
+++ b/openstackclient/network/v2/address_scope.py
@@ -13,6 +13,8 @@
 
 """Address scope action implementations"""
 
+import logging
+
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
@@ -21,6 +23,9 @@ from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 
 
+LOG = logging.getLogger(__name__)
+
+
 def _get_columns(item):
     columns = list(item.keys())
     if 'tenant_id' in columns:
@@ -122,9 +127,9 @@ class DeleteAddressScope(command.Command):
                 client.delete_address_scope(obj)
             except Exception as e:
                 result += 1
-                self.app.log.error(_("Failed to delete address scope with "
-                                   "name or ID '%(scope)s': %(e)s")
-                                   % {'scope': scope, 'e': e})
+                LOG.error(_("Failed to delete address scope with "
+                            "name or ID '%(scope)s': %(e)s"),
+                          {'scope': scope, 'e': e})
 
         if result > 0:
             total = len(parsed_args.address_scope)
diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py
index 1c5db706..57461f89 100644
--- a/openstackclient/network/v2/port.py
+++ b/openstackclient/network/v2/port.py
@@ -293,9 +293,9 @@ class DeletePort(command.Command):
                 client.delete_port(obj)
             except Exception as e:
                 result += 1
-                self.app.log.error(_("Failed to delete port with "
-                                   "name or ID '%(port)s': %(e)s")
-                                   % {'port': port, 'e': e})
+                LOG.error(_("Failed to delete port with "
+                            "name or ID '%(port)s': %(e)s"),
+                          {'port': port, 'e': e})
 
         if result > 0:
             total = len(parsed_args.port)