diff --git a/fuel_plugin_builder/actions/build.py b/fuel_plugin_builder/actions/build.py index 7e91fb0..c92ad40 100644 --- a/fuel_plugin_builder/actions/build.py +++ b/fuel_plugin_builder/actions/build.py @@ -17,10 +17,10 @@ from __future__ import unicode_literals import abc -import logging import os from os.path import join as join_path +from oslo_log import log as logging from fuel_plugin_builder.actions import BaseAction from fuel_plugin_builder import errors diff --git a/fuel_plugin_builder/actions/create.py b/fuel_plugin_builder/actions/create.py index 9ce9e51..b5869e2 100644 --- a/fuel_plugin_builder/actions/create.py +++ b/fuel_plugin_builder/actions/create.py @@ -14,10 +14,11 @@ # License for the specific language governing permissions and limitations # under the License. -import logging import os import re +from oslo_log import log as logging + from fuel_plugin_builder.actions import BaseAction from fuel_plugin_builder import consts from fuel_plugin_builder import errors diff --git a/fuel_plugin_builder/cli.py b/fuel_plugin_builder/cli.py index 18b4dae..37c56d8 100644 --- a/fuel_plugin_builder/cli.py +++ b/fuel_plugin_builder/cli.py @@ -15,10 +15,11 @@ # under the License. import argparse -import logging import six import sys +from oslo_log import log as logging + from fuel_plugin_builder import actions from fuel_plugin_builder import errors from fuel_plugin_builder import messages diff --git a/fuel_plugin_builder/utils.py b/fuel_plugin_builder/utils.py index 8ff327e..3edf544 100644 --- a/fuel_plugin_builder/utils.py +++ b/fuel_plugin_builder/utils.py @@ -17,7 +17,6 @@ import datetime import hashlib import io -import logging import os import shutil import subprocess @@ -27,6 +26,7 @@ import yaml from distutils import dir_util from distutils.version import StrictVersion from glob import glob +from oslo_log import log as logging from mako.template import Template diff --git a/fuel_plugin_builder/validators/base.py b/fuel_plugin_builder/validators/base.py index a487ac0..38d5787 100644 --- a/fuel_plugin_builder/validators/base.py +++ b/fuel_plugin_builder/validators/base.py @@ -15,9 +15,9 @@ # under the License. import abc -import logging import jsonschema +from oslo_log import log as logging import six from distutils.version import StrictVersion diff --git a/fuel_plugin_builder/validators/validator_v1.py b/fuel_plugin_builder/validators/validator_v1.py index aabce30..7511edd 100644 --- a/fuel_plugin_builder/validators/validator_v1.py +++ b/fuel_plugin_builder/validators/validator_v1.py @@ -14,9 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. -import logging from os.path import join as join_path +from oslo_log import log as logging + from fuel_plugin_builder import utils from fuel_plugin_builder.validators.base import LegacyBaseValidator from fuel_plugin_builder.validators.schemas import SchemaV1 diff --git a/fuel_plugin_builder/validators/validator_v2.py b/fuel_plugin_builder/validators/validator_v2.py index 43de703..cc3378f 100644 --- a/fuel_plugin_builder/validators/validator_v2.py +++ b/fuel_plugin_builder/validators/validator_v2.py @@ -14,9 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. -import logging from os.path import join as join_path +from oslo_log import log as logging + from fuel_plugin_builder import utils from fuel_plugin_builder.validators.base import LegacyBaseValidator from fuel_plugin_builder.validators.schemas import SchemaV2 diff --git a/fuel_plugin_builder/validators/validator_v3.py b/fuel_plugin_builder/validators/validator_v3.py index 3439655..fbc3daf 100644 --- a/fuel_plugin_builder/validators/validator_v3.py +++ b/fuel_plugin_builder/validators/validator_v3.py @@ -14,9 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. -import logging from os.path import join as join_path +from oslo_log import log as logging + from fuel_plugin_builder import errors from fuel_plugin_builder import utils from fuel_plugin_builder.validators.schemas import SchemaV3 diff --git a/fuel_plugin_builder/validators/validator_v4.py b/fuel_plugin_builder/validators/validator_v4.py index 45839e6..ba8be26 100644 --- a/fuel_plugin_builder/validators/validator_v4.py +++ b/fuel_plugin_builder/validators/validator_v4.py @@ -14,9 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. -import logging from os.path import join as join_path +from oslo_log import log as logging + from fuel_plugin_builder import errors from fuel_plugin_builder import utils from fuel_plugin_builder.validators.formatchecker import FormatChecker diff --git a/requirements.txt b/requirements.txt index 2a977bb..eb028d3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,3 +7,4 @@ six>=1.5.2 Mako==0.9.1 PyYAML==3.10 jsonschema==2.4.0 +oslo.log>=3.11.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index d791da9..3165d4e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,3 +3,4 @@ mock==1.0 nose==1.1.2 nose2==0.4.1 nose-timer==0.2.0 +oslo.log>=3.11.0 # Apache-2.0