Support for new oslo namespaces

Compatible with CentOS6 & CentOS7 master node

Blueprint: master-on-centos7

Related-Bug: #1516621

Change-Id: I06bf0dc8406ac6551632702f90b427f5a42f8088

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"

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

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
 

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

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__)

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
 

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

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

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__)
 

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

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__)

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):

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):

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

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

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):

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 = [