summaryrefslogtreecommitdiff
path: root/openstackclient/network/v2
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/network/v2
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/network/v2')
-rw-r--r--openstackclient/network/v2/network.py28
-rw-r--r--openstackclient/network/v2/port.py5
-rw-r--r--openstackclient/network/v2/router.py27
-rw-r--r--openstackclient/network/v2/subnet.py6
4 files changed, 8 insertions, 58 deletions
diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py
index 7d9324f0..fc94fd82 100644
--- a/openstackclient/network/v2/network.py
+++ b/openstackclient/network/v2/network.py
@@ -13,12 +13,7 @@
"""Network action implementations"""
-import logging
-
-from cliff import command
-from cliff import lister
-from cliff import show
-
+from openstackclient.common import command
from openstackclient.common import exceptions
from openstackclient.common import utils
from openstackclient.identity import common as identity_common
@@ -52,11 +47,9 @@ def _get_columns(item):
return tuple(sorted(columns))
-class CreateNetwork(show.ShowOne):
+class CreateNetwork(command.ShowOne):
"""Create new network"""
- log = logging.getLogger(__name__ + '.CreateNetwork')
-
def get_parser(self, prog_name):
parser = super(CreateNetwork, self).get_parser(prog_name)
parser.add_argument(
@@ -111,7 +104,6 @@ class CreateNetwork(show.ShowOne):
return parser
def take_action(self, parsed_args):
- self.log.debug('take_action(%s)' % parsed_args)
client = self.app.client_manager.network
body = self.get_body(parsed_args)
obj = client.create_network(**body)
@@ -142,8 +134,6 @@ class CreateNetwork(show.ShowOne):
class DeleteNetwork(command.Command):
"""Delete network(s)"""
- log = logging.getLogger(__name__ + '.DeleteNetwork')
-
def get_parser(self, prog_name):
parser = super(DeleteNetwork, self).get_parser(prog_name)
parser.add_argument(
@@ -155,18 +145,15 @@ class DeleteNetwork(command.Command):
return parser
def take_action(self, parsed_args):
- self.log.debug('take_action(%s)' % parsed_args)
client = self.app.client_manager.network
for network in parsed_args.network:
obj = client.find_network(network)
client.delete_network(obj)
-class ListNetwork(lister.Lister):
+class ListNetwork(command.Lister):
"""List networks"""
- log = logging.getLogger(__name__ + '.ListNetwork')
-
def get_parser(self, prog_name):
parser = super(ListNetwork, self).get_parser(prog_name)
parser.add_argument(
@@ -184,7 +171,6 @@ class ListNetwork(lister.Lister):
return parser
def take_action(self, parsed_args):
- self.log.debug('take_action(%s)' % parsed_args)
client = self.app.client_manager.network
if parsed_args.long:
@@ -239,8 +225,6 @@ class ListNetwork(lister.Lister):
class SetNetwork(command.Command):
"""Set network properties"""
- log = logging.getLogger(__name__ + '.SetNetwork')
-
def get_parser(self, prog_name):
parser = super(SetNetwork, self).get_parser(prog_name)
parser.add_argument(
@@ -284,7 +268,6 @@ class SetNetwork(command.Command):
return parser
def take_action(self, parsed_args):
- self.log.debug('take_action(%s)' % parsed_args)
client = self.app.client_manager.network
obj = client.find_network(parsed_args.identifier, ignore_missing=False)
@@ -302,11 +285,9 @@ class SetNetwork(command.Command):
client.update_network(obj)
-class ShowNetwork(show.ShowOne):
+class ShowNetwork(command.ShowOne):
"""Show network details"""
- log = logging.getLogger(__name__ + '.ShowNetwork')
-
def get_parser(self, prog_name):
parser = super(ShowNetwork, self).get_parser(prog_name)
parser.add_argument(
@@ -317,7 +298,6 @@ class ShowNetwork(show.ShowOne):
return parser
def take_action(self, parsed_args):
- self.log.debug('take_action(%s)' % parsed_args)
client = self.app.client_manager.network
obj = client.find_network(parsed_args.identifier, ignore_missing=False)
columns = _get_columns(obj)
diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py
index ad906a28..b91ac588 100644
--- a/openstackclient/network/v2/port.py
+++ b/openstackclient/network/v2/port.py
@@ -13,16 +13,12 @@
"""Port action implementations"""
-import logging
-
from cliff import command
class DeletePort(command.Command):
"""Delete port(s)"""
- log = logging.getLogger(__name__ + '.DeletePort')
-
def get_parser(self, prog_name):
parser = super(DeletePort, self).get_parser(prog_name)
parser.add_argument(
@@ -34,7 +30,6 @@ class DeletePort(command.Command):
return parser
def take_action(self, parsed_args):
- self.log.debug('take_action(%s)' % parsed_args)
client = self.app.client_manager.network
for port in parsed_args.port:
diff --git a/openstackclient/network/v2/router.py b/openstackclient/network/v2/router.py
index 09e0fe4c..6c8acb63 100644
--- a/openstackclient/network/v2/router.py
+++ b/openstackclient/network/v2/router.py
@@ -14,12 +14,8 @@
"""Router action implementations"""
import json
-import logging
-
-from cliff import command
-from cliff import lister
-from cliff import show
+from openstackclient.common import command
from openstackclient.common import exceptions
from openstackclient.common import utils
from openstackclient.identity import common as identity_common
@@ -67,11 +63,9 @@ def _get_attrs(client_manager, parsed_args):
return attrs
-class CreateRouter(show.ShowOne):
+class CreateRouter(command.ShowOne):
"""Create a new router"""
- log = logging.getLogger(__name__ + '.CreateRouter')
-
def get_parser(self, prog_name):
parser = super(CreateRouter, self).get_parser(prog_name)
parser.add_argument(
@@ -109,7 +103,6 @@ class CreateRouter(show.ShowOne):
return parser
def take_action(self, parsed_args):
- self.log.debug('take_action(%s)' % parsed_args)
client = self.app.client_manager.network
attrs = _get_attrs(self.app.client_manager, parsed_args)
@@ -128,8 +121,6 @@ class CreateRouter(show.ShowOne):
class DeleteRouter(command.Command):
"""Delete router(s)"""
- log = logging.getLogger(__name__ + '.DeleteRouter')
-
def get_parser(self, prog_name):
parser = super(DeleteRouter, self).get_parser(prog_name)
parser.add_argument(
@@ -141,18 +132,15 @@ class DeleteRouter(command.Command):
return parser
def take_action(self, parsed_args):
- self.log.debug('take_action(%s)' % parsed_args)
client = self.app.client_manager.network
for router in parsed_args.router:
obj = client.find_router(router)
client.delete_router(obj)
-class ListRouter(lister.Lister):
+class ListRouter(command.Lister):
"""List routers"""
- log = logging.getLogger(__name__ + '.ListRouter')
-
def get_parser(self, prog_name):
parser = super(ListRouter, self).get_parser(prog_name)
parser.add_argument(
@@ -164,7 +152,6 @@ class ListRouter(lister.Lister):
return parser
def take_action(self, parsed_args):
- self.log.debug('take_action(%s)' % parsed_args)
client = self.app.client_manager.network
columns = (
@@ -206,8 +193,6 @@ class ListRouter(lister.Lister):
class SetRouter(command.Command):
"""Set router properties"""
- log = logging.getLogger(__name__ + '.SetRouter')
-
def get_parser(self, prog_name):
parser = super(SetRouter, self).get_parser(prog_name)
parser.add_argument(
@@ -262,7 +247,6 @@ class SetRouter(command.Command):
return parser
def take_action(self, parsed_args):
- self.log.debug('take_action(%s)' % parsed_args)
client = self.app.client_manager.network
obj = client.find_router(parsed_args.router, ignore_missing=False)
@@ -274,11 +258,9 @@ class SetRouter(command.Command):
client.update_router(obj, **attrs)
-class ShowRouter(show.ShowOne):
+class ShowRouter(command.ShowOne):
"""Display router details"""
- log = logging.getLogger(__name__ + '.ShowRouter')
-
def get_parser(self, prog_name):
parser = super(ShowRouter, self).get_parser(prog_name)
parser.add_argument(
@@ -289,7 +271,6 @@ class ShowRouter(show.ShowOne):
return parser
def take_action(self, parsed_args):
- self.log.debug('take_action(%s)' % parsed_args)
client = self.app.client_manager.network
obj = client.find_router(parsed_args.router, ignore_missing=False)
columns = sorted(obj.keys())
diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py
index 62747125..467b6507 100644
--- a/openstackclient/network/v2/subnet.py
+++ b/openstackclient/network/v2/subnet.py
@@ -13,8 +13,6 @@
"""Subnet action implementations"""
-import logging
-
from cliff import lister
from openstackclient.common import utils
@@ -36,8 +34,6 @@ _formatters = {
class ListSubnet(lister.Lister):
"""List subnets"""
- log = logging.getLogger(__name__ + '.ListSubnet')
-
def get_parser(self, prog_name):
parser = super(ListSubnet, self).get_parser(prog_name)
parser.add_argument(
@@ -49,8 +45,6 @@ class ListSubnet(lister.Lister):
return parser
def take_action(self, parsed_args):
- self.log.debug('take_action(%s)' % parsed_args)
-
data = self.app.client_manager.network.subnets()
headers = ('ID', 'Name', 'Network', 'Subnet')