Merge "Standardize logger usage of catalog in identity"

Author: Jenkins

openstackclient/identity/v2_0/catalog.py

@@ -13,6 +13,8 @@
 
 """Identity v2 Service Catalog 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 _
 
 
+LOG = logging.getLogger(__name__)
+
+
 def _format_endpoints(eps=None):
     if not eps:
         return ""
@@ -92,8 +97,7 @@ def take_action(self, parsed_args):
                 break
 
         if not data:
-            self.app.log.error(_('service %s not found\n') %
-                               parsed_args.service)
+            LOG.error(_('service %s not found\n'), parsed_args.service)
             return ((), ())
 
         return zip(*sorted(six.iteritems(data)))

openstackclient/identity/v3/catalog.py

@@ -13,6 +13,8 @@
 
 """Identity v3 Service Catalog 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 _
 
 
+LOG = logging.getLogger(__name__)
+
+
 def _format_endpoints(eps=None):
     if not eps:
         return ""
@@ -87,8 +92,7 @@ def take_action(self, parsed_args):
                 break
 
         if not data:
-            self.app.log.error(_('service %s not found\n') %
-                               parsed_args.service)
+            LOG.error(_('service %s not found\n'), parsed_args.service)
             return ((), ())
 
         return zip(*sorted(six.iteritems(data)))