diff --git a/fuel_health/common/log.py b/fuel_health/common/log.py index ba09085e..d9e51d1b 100644 --- a/fuel_health/common/log.py +++ b/fuel_health/common/log.py @@ -22,7 +22,10 @@ import logging.config import os import re -from oslo.config import cfg +try: + from oslo.config import cfg +except ImportError: + from oslo_config import cfg _DEFAULT_LOG_FORMAT = "%(asctime)s %(levelname)8s [%(name)s] %(message)s" diff --git a/fuel_health/config.py b/fuel_health/config.py index a60dd924..0456e525 100644 --- a/fuel_health/config.py +++ b/fuel_health/config.py @@ -23,7 +23,10 @@ import traceback import unittest2 import keystoneclient -from oslo.config import cfg +try: + from oslo.config import cfg +except ImportError: + from oslo_config import cfg import requests from fuel_health.common import log as logging diff --git a/fuel_health/glancemanager.py b/fuel_health/glancemanager.py index 727722e6..9692b235 100644 --- a/fuel_health/glancemanager.py +++ b/fuel_health/glancemanager.py @@ -14,7 +14,10 @@ # under the License. import logging -from oslo.serialization import jsonutils +try: + from oslo.serialization import jsonutils +except ImportError: + from oslo_serialization import jsonutils import random import StringIO diff --git a/fuel_health/muranomanager.py b/fuel_health/muranomanager.py index bbbb197d..91fe20fb 100644 --- a/fuel_health/muranomanager.py +++ b/fuel_health/muranomanager.py @@ -21,7 +21,10 @@ import time import traceback import zipfile -from oslo.serialization import jsonutils +try: + from oslo.serialization import jsonutils +except ImportError: + from oslo_serialization import jsonutils import muranoclient.common.exceptions as exceptions import requests diff --git a/fuel_plugin/ostf_adapter/config.py b/fuel_plugin/ostf_adapter/config.py index 757eaf43..6396b9aa 100644 --- a/fuel_plugin/ostf_adapter/config.py +++ b/fuel_plugin/ostf_adapter/config.py @@ -15,7 +15,10 @@ import logging import os -from oslo.config import cfg +try: + from oslo.config import cfg +except ImportError: + from oslo_config import cfg LOG = logging.getLogger(__name__) diff --git a/fuel_plugin/ostf_adapter/mixins.py b/fuel_plugin/ostf_adapter/mixins.py index 00391310..932d8585 100644 --- a/fuel_plugin/ostf_adapter/mixins.py +++ b/fuel_plugin/ostf_adapter/mixins.py @@ -14,7 +14,11 @@ import logging -from oslo.config import cfg +try: + from oslo.config import cfg +except ImportError: + from oslo_config import cfg + import requests from sqlalchemy.orm import joinedload diff --git a/fuel_plugin/ostf_adapter/nose_plugin/nose_adapter.py b/fuel_plugin/ostf_adapter/nose_plugin/nose_adapter.py index f4b5b2a9..9d8d53a8 100644 --- a/fuel_plugin/ostf_adapter/nose_plugin/nose_adapter.py +++ b/fuel_plugin/ostf_adapter/nose_plugin/nose_adapter.py @@ -17,7 +17,10 @@ import logging import os import signal -from oslo.config import cfg +try: + from oslo.config import cfg +except ImportError: + from oslo_config import cfg from fuel_plugin.ostf_adapter.logger import ResultsLogger from fuel_plugin.ostf_adapter.nose_plugin import nose_storage_plugin diff --git a/fuel_plugin/ostf_adapter/nose_plugin/nose_storage_plugin.py b/fuel_plugin/ostf_adapter/nose_plugin/nose_storage_plugin.py index 35f441cd..5af7c585 100644 --- a/fuel_plugin/ostf_adapter/nose_plugin/nose_storage_plugin.py +++ b/fuel_plugin/ostf_adapter/nose_plugin/nose_storage_plugin.py @@ -17,7 +17,10 @@ import os import time from nose import plugins -from oslo.config import cfg +try: + from oslo.config import cfg +except ImportError: + from oslo_config import cfg from fuel_plugin.ostf_adapter.nose_plugin import nose_utils from fuel_plugin.ostf_adapter.storage import models diff --git a/fuel_plugin/ostf_adapter/nose_plugin/nose_utils.py b/fuel_plugin/ostf_adapter/nose_plugin/nose_utils.py index 02c26bbe..6af88b8d 100644 --- a/fuel_plugin/ostf_adapter/nose_plugin/nose_utils.py +++ b/fuel_plugin/ostf_adapter/nose_plugin/nose_utils.py @@ -23,7 +23,10 @@ import traceback from nose import case from nose.suite import ContextSuite -from oslo.serialization import jsonutils +try: + from oslo.serialization import jsonutils +except ImportError: + from oslo_serialization import jsonutils LOG = logging.getLogger(__name__) diff --git a/fuel_plugin/ostf_adapter/server.py b/fuel_plugin/ostf_adapter/server.py index 42d4054a..74f5a9ed 100644 --- a/fuel_plugin/ostf_adapter/server.py +++ b/fuel_plugin/ostf_adapter/server.py @@ -19,7 +19,10 @@ import signal import sys from gevent import pywsgi -from oslo.config import cfg +try: + from oslo.config import cfg +except ImportError: + from oslo_config import cfg from fuel_plugin.ostf_adapter import config as ostf_config from fuel_plugin.ostf_adapter import logger diff --git a/fuel_plugin/ostf_adapter/storage/alembic_cli.py b/fuel_plugin/ostf_adapter/storage/alembic_cli.py index bc028b1c..c3948a7d 100644 --- a/fuel_plugin/ostf_adapter/storage/alembic_cli.py +++ b/fuel_plugin/ostf_adapter/storage/alembic_cli.py @@ -17,7 +17,11 @@ import os from alembic import command from alembic import config -from oslo.config import cfg + +try: + from oslo.config import cfg +except ImportError: + from oslo_config import cfg log = logging.getLogger(__name__) diff --git a/fuel_plugin/ostf_adapter/storage/fields.py b/fuel_plugin/ostf_adapter/storage/fields.py index 17c955e6..6f474854 100644 --- a/fuel_plugin/ostf_adapter/storage/fields.py +++ b/fuel_plugin/ostf_adapter/storage/fields.py @@ -14,7 +14,10 @@ from sqlalchemy.types import TypeDecorator, VARCHAR -from oslo.serialization import jsonutils +try: + from oslo.serialization import jsonutils +except ImportError: + from oslo_serialization import jsonutils class JsonField(TypeDecorator): diff --git a/fuel_plugin/ostf_adapter/wsgi/access_control.py b/fuel_plugin/ostf_adapter/wsgi/access_control.py index 626a5f7f..c0a93d86 100644 --- a/fuel_plugin/ostf_adapter/wsgi/access_control.py +++ b/fuel_plugin/ostf_adapter/wsgi/access_control.py @@ -13,7 +13,10 @@ # under the License. from keystonemiddleware import auth_token -from oslo.config import cfg +try: + from oslo.config import cfg +except ImportError: + from oslo_config import cfg def setup(app): diff --git a/fuel_plugin/ostf_adapter/wsgi/app.py b/fuel_plugin/ostf_adapter/wsgi/app.py index 8c36f36a..6dc4b1ef 100644 --- a/fuel_plugin/ostf_adapter/wsgi/app.py +++ b/fuel_plugin/ostf_adapter/wsgi/app.py @@ -12,7 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +try: + from oslo.config import cfg +except ImportError: + from oslo_config import cfg import pecan from fuel_plugin.ostf_adapter.storage import engine diff --git a/fuel_plugin/ostf_adapter/wsgi/controllers.py b/fuel_plugin/ostf_adapter/wsgi/controllers.py index 85d5c270..b8b029de 100644 --- a/fuel_plugin/ostf_adapter/wsgi/controllers.py +++ b/fuel_plugin/ostf_adapter/wsgi/controllers.py @@ -14,8 +14,14 @@ import logging -from oslo.config import cfg -from oslo.serialization import jsonutils +try: + from oslo.config import cfg +except ImportError: + from oslo_config import cfg +try: + from oslo.serialization import jsonutils +except ImportError: + from oslo_serialization import jsonutils from pecan import abort from pecan import expose from pecan import request diff --git a/fuel_plugin/ostf_client/client.py b/fuel_plugin/ostf_client/client.py index 3489502e..ec7147dc 100644 --- a/fuel_plugin/ostf_client/client.py +++ b/fuel_plugin/ostf_client/client.py @@ -15,7 +15,10 @@ import requests import time -from oslo.serialization import jsonutils +try: + from oslo.serialization import jsonutils +except ImportError: + from oslo_serialization import jsonutils class TestingAdapterClient(object): diff --git a/fuel_plugin/testing/fixture/dummy_tests/config_test.py b/fuel_plugin/testing/fixture/dummy_tests/config_test.py index 0fa1342d..1ee60f7f 100644 --- a/fuel_plugin/testing/fixture/dummy_tests/config_test.py +++ b/fuel_plugin/testing/fixture/dummy_tests/config_test.py @@ -12,7 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +try: + from oslo.config import cfg +except ImportError: + from oslo_config import cfg + import unittest opts = [