summaryrefslogtreecommitdiff
path: root/openstackclient/identity/v3/mapping.py
diff options
context:
space:
mode:
authorAkihiro Motoki <motoki@da.jp.nec.com>2016-01-10 21:54:53 +0900
committerAkihiro Motoki <motoki@da.jp.nec.com>2016-02-02 09:58:32 +0900
commit258c1102cc6b93a860bcd7cc083d4e14ae0025ce (patch)
tree6b963e16d6bd946c066a7163f6f36e7becba9b3b /openstackclient/identity/v3/mapping.py
parente9ff42eee73de147339c42bca90f777a8f40f5c1 (diff)
downloadpython-openstackclient-258c1102cc6b93a860bcd7cc083d4e14ae0025ce.tar.gz
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
Diffstat (limited to 'openstackclient/identity/v3/mapping.py')
-rw-r--r--openstackclient/identity/v3/mapping.py25
1 files changed, 4 insertions, 21 deletions
diff --git a/openstackclient/identity/v3/mapping.py b/openstackclient/identity/v3/mapping.py
index c79331ec..422d66bc 100644
--- a/openstackclient/identity/v3/mapping.py
+++ b/openstackclient/identity/v3/mapping.py
@@ -16,13 +16,10 @@
"""Identity v3 federation mapping action implementations"""
import json
-import logging
-from cliff import command
-from cliff import lister
-from cliff import show
import six
+from openstackclient.common import command
from openstackclient.common import exceptions
from openstackclient.common import utils
@@ -79,11 +76,9 @@ class _RulesReader(object):
return rules
-class CreateMapping(show.ShowOne, _RulesReader):
+class CreateMapping(command.ShowOne, _RulesReader):
"""Create new mapping"""
- log = logging.getLogger(__name__ + '.CreateMapping')
-
def get_parser(self, prog_name):
parser = super(CreateMapping, self).get_parser(prog_name)
parser.add_argument(
@@ -99,7 +94,6 @@ class CreateMapping(show.ShowOne, _RulesReader):
return parser
def take_action(self, parsed_args):
- self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
rules = self._read_rules(parsed_args.rules)
@@ -114,8 +108,6 @@ class CreateMapping(show.ShowOne, _RulesReader):
class DeleteMapping(command.Command):
"""Delete mapping"""
- log = logging.getLogger(__name__ + '.DeleteMapping')
-
def get_parser(self, prog_name):
parser = super(DeleteMapping, self).get_parser(prog_name)
parser.add_argument(
@@ -126,19 +118,16 @@ class DeleteMapping(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
identity_client.federation.mappings.delete(parsed_args.mapping)
return
-class ListMapping(lister.Lister):
+class ListMapping(command.Lister):
"""List mappings"""
- log = logging.getLogger(__name__ + '.ListMapping')
def take_action(self, parsed_args):
- self.log.debug('take_action(%s)' % parsed_args)
# NOTE(marek-denis): Since rules can be long and tedious I have decided
# to only list ids of the mappings. If somebody wants to check the
# rules, (s)he should show specific ones.
@@ -152,8 +141,6 @@ class ListMapping(lister.Lister):
class SetMapping(command.Command, _RulesReader):
"""Set mapping properties"""
- log = logging.getLogger(__name__ + '.SetMapping')
-
def get_parser(self, prog_name):
parser = super(SetMapping, self).get_parser(prog_name)
parser.add_argument(
@@ -169,7 +156,6 @@ class SetMapping(command.Command, _RulesReader):
return parser
def take_action(self, parsed_args):
- self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
if not parsed_args.rules:
@@ -186,11 +172,9 @@ class SetMapping(command.Command, _RulesReader):
return zip(*sorted(six.iteritems(mapping._info)))
-class ShowMapping(show.ShowOne):
+class ShowMapping(command.ShowOne):
"""Display mapping details"""
- log = logging.getLogger(__name__ + '.ShowMapping')
-
def get_parser(self, prog_name):
parser = super(ShowMapping, self).get_parser(prog_name)
parser.add_argument(
@@ -201,7 +185,6 @@ class ShowMapping(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
mapping = identity_client.federation.mappings.get(parsed_args.mapping)