diff --git a/tackerclient/client.py b/tackerclient/client.py index 470fead9..79021825 100644 --- a/tackerclient/client.py +++ b/tackerclient/client.py @@ -18,11 +18,11 @@ try: import json except ImportError: import simplejson as json -import logging import os from keystoneclient import access from keystoneclient import adapter +from oslo_log import log as logging import requests from tackerclient.common import exceptions @@ -33,13 +33,13 @@ _logger = logging.getLogger(__name__) if os.environ.get('TACKERCLIENT_DEBUG'): ch = logging.StreamHandler() - _logger.setLevel(logging.DEBUG) + _logger.logger.setLevel(logging.DEBUG) _logger.addHandler(ch) _requests_log_level = logging.DEBUG else: _requests_log_level = logging.WARNING -logging.getLogger("requests").setLevel(_requests_log_level) +logging.getLogger("requests").logger.setLevel(_requests_log_level) MAX_URI_LEN = 8192 diff --git a/tackerclient/common/serializer.py b/tackerclient/common/serializer.py index b66e9c1a..02b6a51d 100644 --- a/tackerclient/common/serializer.py +++ b/tackerclient/common/serializer.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -import logging from xml.etree import ElementTree as etree from xml.parsers import expat +from oslo_log import log as logging from oslo_serialization import jsonutils import six diff --git a/tackerclient/common/utils.py b/tackerclient/common/utils.py index fb62cf5f..ad23e462 100644 --- a/tackerclient/common/utils.py +++ b/tackerclient/common/utils.py @@ -18,9 +18,9 @@ """Utilities and helper functions.""" import argparse -import logging import os +from oslo_log import log as logging from oslo_log import versionutils from oslo_utils import encodeutils from oslo_utils import importutils diff --git a/tackerclient/shell.py b/tackerclient/shell.py index 76903b33..1dfdb067 100644 --- a/tackerclient/shell.py +++ b/tackerclient/shell.py @@ -24,7 +24,6 @@ import argparse import getpass import inspect import itertools -import logging import os import sys @@ -33,6 +32,7 @@ from keystoneclient.auth.identity import v3 as v3_auth from keystoneclient import discover from keystoneclient import exceptions as ks_exc from keystoneclient import session +from oslo_log import log as logging from oslo_utils import encodeutils import six.moves.urllib.parse as urlparse diff --git a/tackerclient/tacker/v1_0/__init__.py b/tackerclient/tacker/v1_0/__init__.py index 884dd98a..bd7d23ce 100644 --- a/tackerclient/tacker/v1_0/__init__.py +++ b/tackerclient/tacker/v1_0/__init__.py @@ -18,12 +18,12 @@ from __future__ import print_function import abc import argparse -import logging import re from cliff.formatters import table from cliff import lister from cliff import show +from oslo_log import log as logging from oslo_serialization import jsonutils import six diff --git a/tackerclient/tests/unit/test_command_meta.py b/tackerclient/tests/unit/test_command_meta.py index 5ae763a6..d7e5f521 100644 --- a/tackerclient/tests/unit/test_command_meta.py +++ b/tackerclient/tests/unit/test_command_meta.py @@ -14,8 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -import logging - +from oslo_log import log as logging import testtools from testtools import helpers diff --git a/tackerclient/tests/unit/test_shell.py b/tackerclient/tests/unit/test_shell.py index b9b9ac66..820a080e 100644 --- a/tackerclient/tests/unit/test_shell.py +++ b/tackerclient/tests/unit/test_shell.py @@ -14,7 +14,6 @@ # under the License. import argparse -import logging import os import re import six @@ -22,6 +21,7 @@ import sys import fixtures import mox +from oslo_log import log as logging import testtools from testtools import matchers diff --git a/tackerclient/v1_0/client.py b/tackerclient/v1_0/client.py index abdb03f4..b60b0ff5 100644 --- a/tackerclient/v1_0/client.py +++ b/tackerclient/v1_0/client.py @@ -15,9 +15,9 @@ # under the License. # -import logging import time +from oslo_log import log as logging import requests import six.moves.urllib.parse as urlparse