Support for new oslo namespaces
Compatible with CentOS6 & CentOS7 master node Blueprint: master-on-centos7 Related-Bug: #1516621 Change-Id: I06bf0dc8406ac6551632702f90b427f5a42f8088
This commit is contained in:
parent
fc6648be21
commit
a98973482f
|
@ -22,7 +22,10 @@ import logging.config
|
||||||
import os
|
import os
|
||||||
import re
|
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"
|
_DEFAULT_LOG_FORMAT = "%(asctime)s %(levelname)8s [%(name)s] %(message)s"
|
||||||
|
|
|
@ -23,7 +23,10 @@ import traceback
|
||||||
import unittest2
|
import unittest2
|
||||||
|
|
||||||
import keystoneclient
|
import keystoneclient
|
||||||
from oslo.config import cfg
|
try:
|
||||||
|
from oslo.config import cfg
|
||||||
|
except ImportError:
|
||||||
|
from oslo_config import cfg
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
from fuel_health.common import log as logging
|
from fuel_health.common import log as logging
|
||||||
|
|
|
@ -14,7 +14,10 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
from oslo.serialization import jsonutils
|
try:
|
||||||
|
from oslo.serialization import jsonutils
|
||||||
|
except ImportError:
|
||||||
|
from oslo_serialization import jsonutils
|
||||||
import random
|
import random
|
||||||
import StringIO
|
import StringIO
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,10 @@ import time
|
||||||
import traceback
|
import traceback
|
||||||
import zipfile
|
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 muranoclient.common.exceptions as exceptions
|
||||||
import requests
|
import requests
|
||||||
|
|
|
@ -15,7 +15,10 @@
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from oslo.config import cfg
|
try:
|
||||||
|
from oslo.config import cfg
|
||||||
|
except ImportError:
|
||||||
|
from oslo_config import cfg
|
||||||
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
|
@ -14,7 +14,11 @@
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from oslo.config import cfg
|
try:
|
||||||
|
from oslo.config import cfg
|
||||||
|
except ImportError:
|
||||||
|
from oslo_config import cfg
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
from sqlalchemy.orm import joinedload
|
from sqlalchemy.orm import joinedload
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,10 @@ import logging
|
||||||
import os
|
import os
|
||||||
import signal
|
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.logger import ResultsLogger
|
||||||
from fuel_plugin.ostf_adapter.nose_plugin import nose_storage_plugin
|
from fuel_plugin.ostf_adapter.nose_plugin import nose_storage_plugin
|
||||||
|
|
|
@ -17,7 +17,10 @@ import os
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from nose import plugins
|
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.nose_plugin import nose_utils
|
||||||
from fuel_plugin.ostf_adapter.storage import models
|
from fuel_plugin.ostf_adapter.storage import models
|
||||||
|
|
|
@ -23,7 +23,10 @@ import traceback
|
||||||
from nose import case
|
from nose import case
|
||||||
from nose.suite import ContextSuite
|
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__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,10 @@ import signal
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from gevent import pywsgi
|
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 config as ostf_config
|
||||||
from fuel_plugin.ostf_adapter import logger
|
from fuel_plugin.ostf_adapter import logger
|
||||||
|
|
|
@ -17,7 +17,11 @@ import os
|
||||||
|
|
||||||
from alembic import command
|
from alembic import command
|
||||||
from alembic import config
|
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__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
|
@ -14,7 +14,10 @@
|
||||||
|
|
||||||
from sqlalchemy.types import TypeDecorator, VARCHAR
|
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):
|
class JsonField(TypeDecorator):
|
||||||
|
|
|
@ -13,7 +13,10 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from keystonemiddleware import auth_token
|
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):
|
def setup(app):
|
||||||
|
|
|
@ -12,7 +12,10 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo.config import cfg
|
try:
|
||||||
|
from oslo.config import cfg
|
||||||
|
except ImportError:
|
||||||
|
from oslo_config import cfg
|
||||||
import pecan
|
import pecan
|
||||||
|
|
||||||
from fuel_plugin.ostf_adapter.storage import engine
|
from fuel_plugin.ostf_adapter.storage import engine
|
||||||
|
|
|
@ -14,8 +14,14 @@
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from oslo.config import cfg
|
try:
|
||||||
from oslo.serialization import jsonutils
|
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 abort
|
||||||
from pecan import expose
|
from pecan import expose
|
||||||
from pecan import request
|
from pecan import request
|
||||||
|
|
|
@ -15,7 +15,10 @@
|
||||||
import requests
|
import requests
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from oslo.serialization import jsonutils
|
try:
|
||||||
|
from oslo.serialization import jsonutils
|
||||||
|
except ImportError:
|
||||||
|
from oslo_serialization import jsonutils
|
||||||
|
|
||||||
|
|
||||||
class TestingAdapterClient(object):
|
class TestingAdapterClient(object):
|
||||||
|
|
|
@ -12,7 +12,11 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo.config import cfg
|
try:
|
||||||
|
from oslo.config import cfg
|
||||||
|
except ImportError:
|
||||||
|
from oslo_config import cfg
|
||||||
|
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
opts = [
|
opts = [
|
||||||
|
|
Loading…
Reference in New Issue