summaryrefslogtreecommitdiff
path: root/openstackclient/object
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/object
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/object')
-rw-r--r--openstackclient/object/v1/account.py16
-rw-r--r--openstackclient/object/v1/container.py34
-rw-r--r--openstackclient/object/v1/object.py34
3 files changed, 10 insertions, 74 deletions
diff --git a/openstackclient/object/v1/account.py b/openstackclient/object/v1/account.py
index aa94ff5c..543ce4f3 100644
--- a/openstackclient/object/v1/account.py
+++ b/openstackclient/object/v1/account.py
@@ -13,12 +13,9 @@
"""Account v1 action implementations"""
-import logging
-
-from cliff import command
-from cliff import show
import six
+from openstackclient.common import command
from openstackclient.common import parseractions
from openstackclient.common import utils
@@ -26,8 +23,6 @@ from openstackclient.common import utils
class SetAccount(command.Command):
"""Set account properties"""
- log = logging.getLogger(__name__ + '.SetAccount')
-
def get_parser(self, prog_name):
parser = super(SetAccount, self).get_parser(prog_name)
parser.add_argument(
@@ -40,19 +35,15 @@ class SetAccount(command.Command):
)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
self.app.client_manager.object_store.account_set(
properties=parsed_args.property,
)
-class ShowAccount(show.ShowOne):
+class ShowAccount(command.ShowOne):
"""Display account details"""
- log = logging.getLogger(__name__ + '.ShowAccount')
-
- @utils.log_method(log)
def take_action(self, parsed_args):
data = self.app.client_manager.object_store.account_show()
if 'properties' in data:
@@ -63,8 +54,6 @@ class ShowAccount(show.ShowOne):
class UnsetAccount(command.Command):
"""Unset account properties"""
- log = logging.getLogger(__name__ + '.UnsetAccount')
-
def get_parser(self, prog_name):
parser = super(UnsetAccount, self).get_parser(prog_name)
parser.add_argument(
@@ -78,7 +67,6 @@ class UnsetAccount(command.Command):
)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
self.app.client_manager.object_store.account_unset(
properties=parsed_args.property,
diff --git a/openstackclient/object/v1/container.py b/openstackclient/object/v1/container.py
index 8c8844e2..e70afd9d 100644
--- a/openstackclient/object/v1/container.py
+++ b/openstackclient/object/v1/container.py
@@ -16,22 +16,16 @@
"""Container v1 action implementations"""
-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 CreateContainer(lister.Lister):
+class CreateContainer(command.Lister):
"""Create new container"""
- log = logging.getLogger(__name__ + '.CreateContainer')
-
def get_parser(self, prog_name):
parser = super(CreateContainer, self).get_parser(prog_name)
parser.add_argument(
@@ -42,7 +36,6 @@ class CreateContainer(lister.Lister):
)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
results = []
@@ -63,8 +56,6 @@ class CreateContainer(lister.Lister):
class DeleteContainer(command.Command):
"""Delete container"""
- log = logging.getLogger(__name__ + '.DeleteContainer')
-
def get_parser(self, prog_name):
parser = super(DeleteContainer, self).get_parser(prog_name)
parser.add_argument(
@@ -75,7 +66,6 @@ class DeleteContainer(command.Command):
)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
for container in parsed_args.containers:
@@ -84,11 +74,9 @@ class DeleteContainer(command.Command):
)
-class ListContainer(lister.Lister):
+class ListContainer(command.Lister):
"""List containers"""
- log = logging.getLogger(__name__ + '.ListContainer')
-
def get_parser(self, prog_name):
parser = super(ListContainer, self).get_parser(prog_name)
parser.add_argument(
@@ -126,7 +114,6 @@ class ListContainer(lister.Lister):
)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
if parsed_args.long:
@@ -160,8 +147,6 @@ class ListContainer(lister.Lister):
class SaveContainer(command.Command):
"""Save container contents locally"""
- log = logging.getLogger(__name__ + ".SaveContainer")
-
def get_parser(self, prog_name):
parser = super(SaveContainer, self).get_parser(prog_name)
parser.add_argument(
@@ -172,8 +157,6 @@ class SaveContainer(command.Command):
return parser
def take_action(self, parsed_args):
- self.log.debug("take_action(%s)", parsed_args)
-
self.app.client_manager.object_store.container_save(
container=parsed_args.container,
)
@@ -182,8 +165,6 @@ class SaveContainer(command.Command):
class SetContainer(command.Command):
"""Set container properties"""
- log = logging.getLogger(__name__ + '.SetContainer')
-
def get_parser(self, prog_name):
parser = super(SetContainer, self).get_parser(prog_name)
parser.add_argument(
@@ -201,7 +182,6 @@ class SetContainer(command.Command):
)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
self.app.client_manager.object_store.container_set(
parsed_args.container,
@@ -209,11 +189,9 @@ class SetContainer(command.Command):
)
-class ShowContainer(show.ShowOne):
+class ShowContainer(command.ShowOne):
"""Display container details"""
- log = logging.getLogger(__name__ + '.ShowContainer')
-
def get_parser(self, prog_name):
parser = super(ShowContainer, self).get_parser(prog_name)
parser.add_argument(
@@ -223,7 +201,6 @@ class ShowContainer(show.ShowOne):
)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
data = self.app.client_manager.object_store.container_show(
@@ -238,8 +215,6 @@ class ShowContainer(show.ShowOne):
class UnsetContainer(command.Command):
"""Unset container properties"""
- log = logging.getLogger(__name__ + '.UnsetContainer')
-
def get_parser(self, prog_name):
parser = super(UnsetContainer, self).get_parser(prog_name)
parser.add_argument(
@@ -258,7 +233,6 @@ class UnsetContainer(command.Command):
)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
self.app.client_manager.object_store.container_unset(
parsed_args.container,
diff --git a/openstackclient/object/v1/object.py b/openstackclient/object/v1/object.py
index 4bd06124..f9a55e9c 100644
--- a/openstackclient/object/v1/object.py
+++ b/openstackclient/object/v1/object.py
@@ -16,22 +16,16 @@
"""Object v1 action implementations"""
-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 CreateObject(lister.Lister):
+class CreateObject(command.Lister):
"""Upload object to container"""
- log = logging.getLogger(__name__ + '.CreateObject')
-
def get_parser(self, prog_name):
parser = super(CreateObject, self).get_parser(prog_name)
parser.add_argument(
@@ -47,7 +41,6 @@ class CreateObject(lister.Lister):
)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
results = []
@@ -69,8 +62,6 @@ class CreateObject(lister.Lister):
class DeleteObject(command.Command):
"""Delete object from container"""
- log = logging.getLogger(__name__ + '.DeleteObject')
-
def get_parser(self, prog_name):
parser = super(DeleteObject, self).get_parser(prog_name)
parser.add_argument(
@@ -86,7 +77,6 @@ class DeleteObject(command.Command):
)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
for obj in parsed_args.objects:
@@ -96,11 +86,9 @@ class DeleteObject(command.Command):
)
-class ListObject(lister.Lister):
+class ListObject(command.Lister):
"""List objects"""
- log = logging.getLogger(__name__ + '.ListObject')
-
def get_parser(self, prog_name):
parser = super(ListObject, self).get_parser(prog_name)
parser.add_argument(
@@ -148,7 +136,6 @@ class ListObject(lister.Lister):
)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
if parsed_args.long:
@@ -191,8 +178,6 @@ class ListObject(lister.Lister):
class SaveObject(command.Command):
"""Save object locally"""
- log = logging.getLogger(__name__ + ".SaveObject")
-
def get_parser(self, prog_name):
parser = super(SaveObject, self).get_parser(prog_name)
parser.add_argument(
@@ -213,8 +198,6 @@ class SaveObject(command.Command):
return parser
def take_action(self, parsed_args):
- self.log.debug("take_action(%s)", parsed_args)
-
self.app.client_manager.object_store.object_save(
container=parsed_args.container,
object=parsed_args.object,
@@ -225,8 +208,6 @@ class SaveObject(command.Command):
class SetObject(command.Command):
"""Set object properties"""
- log = logging.getLogger(__name__ + '.SetObject')
-
def get_parser(self, prog_name):
parser = super(SetObject, self).get_parser(prog_name)
parser.add_argument(
@@ -249,7 +230,6 @@ class SetObject(command.Command):
)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
self.app.client_manager.object_store.object_set(
parsed_args.container,
@@ -258,11 +238,9 @@ class SetObject(command.Command):
)
-class ShowObject(show.ShowOne):
+class ShowObject(command.ShowOne):
"""Display object details"""
- log = logging.getLogger(__name__ + '.ShowObject')
-
def get_parser(self, prog_name):
parser = super(ShowObject, self).get_parser(prog_name)
parser.add_argument(
@@ -277,7 +255,6 @@ class ShowObject(show.ShowOne):
)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
data = self.app.client_manager.object_store.object_show(
@@ -293,8 +270,6 @@ class ShowObject(show.ShowOne):
class UnsetObject(command.Command):
"""Unset object properties"""
- log = logging.getLogger(__name__ + '.UnsetObject')
-
def get_parser(self, prog_name):
parser = super(UnsetObject, self).get_parser(prog_name)
parser.add_argument(
@@ -318,7 +293,6 @@ class UnsetObject(command.Command):
)
return parser
- @utils.log_method(log)
def take_action(self, parsed_args):
self.app.client_manager.object_store.object_unset(
parsed_args.container,