Remove imports from oslo namespaces
Oslo team is recommending everyone to use the direct imports and not use the Oslo namespaces. So switch all our code to use oslo_* instead of "from oslo." or "import oslo" or "from oslo" NOTE: some of the tests still have mocks referring to oslo.utils @mock.patch('oslo.utils.timeutils.utcnow') as the tests break otherwise. We should do this later. Closes-bug: #1419385 Change-Id: I8e3fbeb833cddc3f55674a0e781ffe69d5033ad4
This commit is contained in:
parent
23ec6b700d
commit
17c5711c55
|
@ -10,7 +10,7 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
import pecan
|
import pecan
|
||||||
|
|
||||||
from magnum.api import auth
|
from magnum.api import auth
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
"""Access Control Lists (ACL's) control access the API server."""
|
"""Access Control Lists (ACL's) control access the API server."""
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from magnum.api.middleware import auth_token
|
from magnum.api.middleware import auth_token
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
# 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.utils import strutils
|
from oslo_utils import strutils
|
||||||
import wsme
|
import wsme
|
||||||
from wsme import types as wtypes
|
from wsme import types as wtypes
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import jsonpatch
|
import jsonpatch
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
import wsme
|
import wsme
|
||||||
|
|
||||||
from magnum.openstack.common._i18n import _
|
from magnum.openstack.common._i18n import _
|
||||||
|
|
|
@ -15,8 +15,8 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.utils import importutils
|
from oslo_utils import importutils
|
||||||
from pecan import hooks
|
from pecan import hooks
|
||||||
|
|
||||||
from magnum.common import context
|
from magnum.common import context
|
||||||
|
|
|
@ -19,7 +19,7 @@ import os
|
||||||
import sys
|
import sys
|
||||||
from wsgiref import simple_server
|
from wsgiref import simple_server
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from magnum.api import app as api_app
|
from magnum.api import app as api_app
|
||||||
from magnum.common import service
|
from magnum.common import service
|
||||||
|
|
|
@ -18,7 +18,7 @@ import logging as std_logging
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from magnum.common import rpc_service as service
|
from magnum.common import rpc_service as service
|
||||||
from magnum.conductor.handlers import bay_k8s_heat
|
from magnum.conductor.handlers import bay_k8s_heat
|
||||||
|
|
|
@ -15,9 +15,9 @@
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.db import options
|
from oslo_db import options
|
||||||
from oslo.db.sqlalchemy.migration_cli import manager
|
from oslo_db.sqlalchemy.migration_cli import manager
|
||||||
|
|
||||||
from magnum.openstack.common import log as logging
|
from magnum.openstack.common import log as logging
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from heatclient.v1 import client as heatclient
|
from heatclient.v1 import client as heatclient
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from magnum.common import exception
|
from magnum.common import exception
|
||||||
from magnum.common import magnum_keystoneclient
|
from magnum.common import magnum_keystoneclient
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
# 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
|
from oslo_config import cfg
|
||||||
|
|
||||||
from magnum.common import rpc
|
from magnum.common import rpc
|
||||||
from magnum import version
|
from magnum import version
|
||||||
|
|
|
@ -23,8 +23,8 @@ import sys
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from keystoneclient import exceptions as keystone_exceptions
|
from keystoneclient import exceptions as keystone_exceptions
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.utils import excutils
|
from oslo_utils import excutils
|
||||||
import pecan
|
import pecan
|
||||||
import six
|
import six
|
||||||
import wsme
|
import wsme
|
||||||
|
|
|
@ -16,8 +16,8 @@ import copy
|
||||||
|
|
||||||
import keystoneclient.exceptions as kc_exception
|
import keystoneclient.exceptions as kc_exception
|
||||||
from keystoneclient.v3 import client as kc_v3
|
from keystoneclient.v3 import client as kc_v3
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.utils import importutils
|
from oslo_utils import importutils
|
||||||
|
|
||||||
from magnum.common import context
|
from magnum.common import context
|
||||||
from magnum.common import exception
|
from magnum.common import exception
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
PATH_OPTS = [
|
PATH_OPTS = [
|
||||||
cfg.StrOpt('pybasedir',
|
cfg.StrOpt('pybasedir',
|
||||||
|
|
|
@ -27,8 +27,8 @@ __all__ = [
|
||||||
'TRANSPORT_ALIASES',
|
'TRANSPORT_ALIASES',
|
||||||
]
|
]
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo import messaging
|
import oslo_messaging as messaging
|
||||||
from oslo_serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
|
|
||||||
from magnum.common import context as magnum_context
|
from magnum.common import context as magnum_context
|
||||||
|
|
|
@ -15,8 +15,8 @@
|
||||||
"""Common RPC service and API tools for Magnum."""
|
"""Common RPC service and API tools for Magnum."""
|
||||||
|
|
||||||
import eventlet
|
import eventlet
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo import messaging
|
import oslo_messaging as messaging
|
||||||
|
|
||||||
import magnum.common.context
|
import magnum.common.context
|
||||||
from magnum.objects import base as objects_base
|
from magnum.objects import base as objects_base
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from magnum.openstack.common import log as logging
|
from magnum.openstack.common import log as logging
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
"""Utility for fetching a resource (e.g. a manifest) from a URL."""
|
"""Utility for fetching a resource (e.g. a manifest) from a URL."""
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
import requests
|
import requests
|
||||||
from requests import exceptions
|
from requests import exceptions
|
||||||
from six.moves import urllib
|
from six.moves import urllib
|
||||||
|
|
|
@ -29,9 +29,9 @@ import tempfile
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
import netaddr
|
import netaddr
|
||||||
from oslo.config import cfg
|
|
||||||
from oslo.utils import excutils
|
|
||||||
from oslo_concurrency import processutils
|
from oslo_concurrency import processutils
|
||||||
|
from oslo_config import cfg
|
||||||
|
from oslo_utils import excutils
|
||||||
import paramiko
|
import paramiko
|
||||||
import six
|
import six
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
"""API for interfacing with Magnum Backend."""
|
"""API for interfacing with Magnum Backend."""
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from magnum.common import rpc_service
|
from magnum.common import rpc_service
|
||||||
from magnum import objects
|
from magnum import objects
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
"""Config options for Magnum Backend service."""
|
"""Config options for Magnum Backend service."""
|
||||||
|
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
SERVICE_OPTS = [
|
SERVICE_OPTS = [
|
||||||
cfg.StrOpt('topic',
|
cfg.StrOpt('topic',
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
from heatclient.common import template_utils
|
from heatclient.common import template_utils
|
||||||
from heatclient import exc
|
from heatclient import exc
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from magnum.common import clients
|
from magnum.common import clients
|
||||||
from magnum.common import short_id
|
from magnum.common import short_id
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
from docker import client
|
from docker import client
|
||||||
from docker import tls
|
from docker import tls
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from magnum.openstack.common import log as logging
|
from magnum.openstack.common import log as logging
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
"""Magnum Docker RPC handler."""
|
"""Magnum Docker RPC handler."""
|
||||||
|
|
||||||
from docker import errors
|
from docker import errors
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from magnum.common import docker_utils
|
from magnum.common import docker_utils
|
||||||
from magnum.conductor.handlers.common import docker_client
|
from magnum.conductor.handlers.common import docker_client
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
"""Magnum Kubernetes RPC handler."""
|
"""Magnum Kubernetes RPC handler."""
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from magnum.common import clients
|
from magnum.common import clients
|
||||||
from magnum.conductor.handlers.common import kube_utils
|
from magnum.conductor.handlers.common import kube_utils
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
"""Magnum specific config handling."""
|
"""Magnum specific config handling."""
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from magnum import version
|
from magnum import version
|
||||||
|
|
||||||
|
|
|
@ -19,8 +19,8 @@ Base classes for storage engines
|
||||||
|
|
||||||
import abc
|
import abc
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.db import api as db_api
|
from oslo_db import api as db_api
|
||||||
import six
|
import six
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
"""Database setup and migration commands."""
|
"""Database setup and migration commands."""
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from stevedore import driver
|
from stevedore import driver
|
||||||
|
|
||||||
_IMPL = None
|
_IMPL = None
|
||||||
|
@ -25,7 +25,7 @@ _IMPL = None
|
||||||
def get_backend():
|
def get_backend():
|
||||||
global _IMPL
|
global _IMPL
|
||||||
if not _IMPL:
|
if not _IMPL:
|
||||||
cfg.CONF.import_opt('backend', 'oslo.db.options', group='database')
|
cfg.CONF.import_opt('backend', 'oslo_db.options', group='database')
|
||||||
_IMPL = driver.DriverManager("magnum.database.migration_backend",
|
_IMPL = driver.DriverManager("magnum.database.migration_backend",
|
||||||
cfg.CONF.database.backend).driver
|
cfg.CONF.database.backend).driver
|
||||||
return _IMPL
|
return _IMPL
|
||||||
|
|
|
@ -16,11 +16,11 @@
|
||||||
|
|
||||||
"""SQLAlchemy storage backend."""
|
"""SQLAlchemy storage backend."""
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.db import exception as db_exc
|
from oslo_db import exception as db_exc
|
||||||
from oslo.db.sqlalchemy import session as db_session
|
from oslo_db.sqlalchemy import session as db_session
|
||||||
from oslo.db.sqlalchemy import utils as db_utils
|
from oslo_db.sqlalchemy import utils as db_utils
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
from sqlalchemy.orm.exc import NoResultFound
|
from sqlalchemy.orm.exc import NoResultFound
|
||||||
|
|
||||||
from magnum.common import exception
|
from magnum.common import exception
|
||||||
|
|
|
@ -19,7 +19,7 @@ import os
|
||||||
import alembic
|
import alembic
|
||||||
from alembic import config as alembic_config
|
from alembic import config as alembic_config
|
||||||
import alembic.migration as alembic_migration
|
import alembic.migration as alembic_migration
|
||||||
from oslo.db import exception as db_exc
|
from oslo_db import exception as db_exc
|
||||||
|
|
||||||
from magnum.db.sqlalchemy import api as sqla_api
|
from magnum.db.sqlalchemy import api as sqla_api
|
||||||
from magnum.db.sqlalchemy import models
|
from magnum.db.sqlalchemy import models
|
||||||
|
|
|
@ -20,9 +20,9 @@ SQLAlchemy models for container service
|
||||||
|
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.db import options as db_options
|
from oslo_db import options as db_options
|
||||||
from oslo.db.sqlalchemy import models
|
from oslo_db.sqlalchemy import models
|
||||||
import six.moves.urllib.parse as urlparse
|
import six.moves.urllib.parse as urlparse
|
||||||
from sqlalchemy import Column
|
from sqlalchemy import Column
|
||||||
from sqlalchemy.ext.declarative import declarative_base
|
from sqlalchemy.ext.declarative import declarative_base
|
||||||
|
|
|
@ -17,8 +17,8 @@
|
||||||
import collections
|
import collections
|
||||||
import copy
|
import copy
|
||||||
|
|
||||||
from oslo import messaging
|
|
||||||
from oslo_context import context
|
from oslo_context import context
|
||||||
|
import oslo_messaging as messaging
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from magnum.common import exception
|
from magnum.common import exception
|
||||||
|
|
|
@ -19,7 +19,7 @@ import datetime
|
||||||
|
|
||||||
import iso8601
|
import iso8601
|
||||||
import netaddr
|
import netaddr
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from magnum.openstack.common._i18n import _
|
from magnum.openstack.common._i18n import _
|
||||||
|
|
|
@ -28,7 +28,7 @@ import traceback
|
||||||
import eventlet
|
import eventlet
|
||||||
import eventlet.backdoor
|
import eventlet.backdoor
|
||||||
import greenlet
|
import greenlet
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from magnum.openstack.common._i18n import _LI
|
from magnum.openstack.common._i18n import _LI
|
||||||
from magnum.openstack.common import log as logging
|
from magnum.openstack.common import log as logging
|
||||||
|
|
|
@ -38,9 +38,9 @@ import socket
|
||||||
import sys
|
import sys
|
||||||
import traceback
|
import traceback
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
from oslo.utils import importutils
|
from oslo_utils import importutils
|
||||||
import six
|
import six
|
||||||
from six import moves
|
from six import moves
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ import copy
|
||||||
import random
|
import random
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from magnum.openstack.common._i18n import _, _LE, _LI
|
from magnum.openstack.common._i18n import _, _LE, _LI
|
||||||
|
|
|
@ -35,7 +35,7 @@ except ImportError:
|
||||||
|
|
||||||
import eventlet
|
import eventlet
|
||||||
from eventlet import event
|
from eventlet import event
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from magnum.openstack.common import eventlet_backdoor
|
from magnum.openstack.common import eventlet_backdoor
|
||||||
from magnum.openstack.common._i18n import _LE, _LI, _LW
|
from magnum.openstack.common._i18n import _LE, _LI, _LW
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
import os
|
import os
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
import pecan
|
import pecan
|
||||||
from pecan import testing
|
from pecan import testing
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
# NOTE(deva): import auth_token so we can override a config option
|
# NOTE(deva): import auth_token so we can override a config option
|
||||||
from keystonemiddleware import auth_token # noqa
|
from keystonemiddleware import auth_token # noqa
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
import pecan
|
import pecan
|
||||||
import pecan.testing
|
import pecan.testing
|
||||||
from six.moves.urllib import parse as urlparse
|
from six.moves.urllib import parse as urlparse
|
||||||
|
|
|
@ -13,8 +13,8 @@
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
from six.moves.urllib import parse as urlparse
|
from six.moves.urllib import parse as urlparse
|
||||||
from wsme import types as wtypes
|
from wsme import types as wtypes
|
||||||
|
|
||||||
|
@ -130,7 +130,7 @@ class TestPatch(api_base.FunctionalTest):
|
||||||
name='bay_example_A',
|
name='bay_example_A',
|
||||||
node_count=3)
|
node_count=3)
|
||||||
|
|
||||||
@mock.patch.object(timeutils, 'utcnow')
|
@mock.patch('oslo.utils.timeutils.utcnow')
|
||||||
def test_replace_ok(self, mock_utcnow):
|
def test_replace_ok(self, mock_utcnow):
|
||||||
name = 'bay_example_B'
|
name = 'bay_example_B'
|
||||||
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
||||||
|
@ -293,7 +293,7 @@ class TestPost(api_base.FunctionalTest):
|
||||||
bay.create()
|
bay.create()
|
||||||
return bay
|
return bay
|
||||||
|
|
||||||
@mock.patch.object(timeutils, 'utcnow')
|
@mock.patch('oslo.utils.timeutils.utcnow')
|
||||||
def test_create_bay(self, mock_utcnow):
|
def test_create_bay(self, mock_utcnow):
|
||||||
bdict = apiutils.bay_post_data()
|
bdict = apiutils.bay_post_data()
|
||||||
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
||||||
|
|
|
@ -13,8 +13,8 @@
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
from six.moves.urllib import parse as urlparse
|
from six.moves.urllib import parse as urlparse
|
||||||
from wsme import types as wtypes
|
from wsme import types as wtypes
|
||||||
|
|
||||||
|
@ -138,7 +138,7 @@ class TestPatch(api_base.FunctionalTest):
|
||||||
self.assertEqual('application/json', response.content_type)
|
self.assertEqual('application/json', response.content_type)
|
||||||
self.assertTrue(response.json['error_message'])
|
self.assertTrue(response.json['error_message'])
|
||||||
|
|
||||||
@mock.patch.object(timeutils, 'utcnow')
|
@mock.patch('oslo.utils.timeutils.utcnow')
|
||||||
def test_replace_singular(self, mock_utcnow):
|
def test_replace_singular(self, mock_utcnow):
|
||||||
name = 'bay_model_example_B'
|
name = 'bay_model_example_B'
|
||||||
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
||||||
|
@ -249,7 +249,7 @@ class TestPost(api_base.FunctionalTest):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestPost, self).setUp()
|
super(TestPost, self).setUp()
|
||||||
|
|
||||||
@mock.patch.object(timeutils, 'utcnow')
|
@mock.patch('oslo.utils.timeutils.utcnow')
|
||||||
def test_create_baymodel(self, mock_utcnow):
|
def test_create_baymodel(self, mock_utcnow):
|
||||||
cdict = apiutils.baymodel_post_data()
|
cdict = apiutils.baymodel_post_data()
|
||||||
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
||||||
|
|
|
@ -13,8 +13,8 @@
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
from six.moves.urllib import parse as urlparse
|
from six.moves.urllib import parse as urlparse
|
||||||
from wsme import types as wtypes
|
from wsme import types as wtypes
|
||||||
|
|
||||||
|
@ -120,7 +120,7 @@ class TestPatch(api_base.FunctionalTest):
|
||||||
super(TestPatch, self).setUp()
|
super(TestPatch, self).setUp()
|
||||||
self.node = obj_utils.create_test_node(self.context, image_id='Fedora')
|
self.node = obj_utils.create_test_node(self.context, image_id='Fedora')
|
||||||
|
|
||||||
@mock.patch.object(timeutils, 'utcnow')
|
@mock.patch('oslo.utils.timeutils.utcnow')
|
||||||
def test_replace_ok(self, mock_utcnow):
|
def test_replace_ok(self, mock_utcnow):
|
||||||
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
||||||
mock_utcnow.return_value = test_time
|
mock_utcnow.return_value = test_time
|
||||||
|
@ -199,7 +199,7 @@ class TestPatch(api_base.FunctionalTest):
|
||||||
|
|
||||||
class TestPost(api_base.FunctionalTest):
|
class TestPost(api_base.FunctionalTest):
|
||||||
|
|
||||||
@mock.patch.object(timeutils, 'utcnow')
|
@mock.patch('oslo.utils.timeutils.utcnow')
|
||||||
def test_create_node(self, mock_utcnow):
|
def test_create_node(self, mock_utcnow):
|
||||||
node_dict = apiutils.node_post_data()
|
node_dict = apiutils.node_post_data()
|
||||||
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
||||||
|
|
|
@ -13,8 +13,8 @@
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
from six.moves.urllib import parse as urlparse
|
from six.moves.urllib import parse as urlparse
|
||||||
from wsme import types as wtypes
|
from wsme import types as wtypes
|
||||||
|
|
||||||
|
@ -129,7 +129,7 @@ class TestPatch(api_base.FunctionalTest):
|
||||||
desc='pod_example_A_desc',
|
desc='pod_example_A_desc',
|
||||||
status='Running')
|
status='Running')
|
||||||
|
|
||||||
@mock.patch.object(timeutils, 'utcnow')
|
@mock.patch('oslo.utils.timeutils.utcnow')
|
||||||
def test_replace_ok(self, mock_utcnow):
|
def test_replace_ok(self, mock_utcnow):
|
||||||
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
||||||
mock_utcnow.return_value = test_time
|
mock_utcnow.return_value = test_time
|
||||||
|
@ -293,7 +293,7 @@ class TestPost(api_base.FunctionalTest):
|
||||||
pod.create()
|
pod.create()
|
||||||
return pod
|
return pod
|
||||||
|
|
||||||
@mock.patch.object(timeutils, 'utcnow')
|
@mock.patch('oslo.utils.timeutils.utcnow')
|
||||||
def test_create_pod(self, mock_utcnow):
|
def test_create_pod(self, mock_utcnow):
|
||||||
pdict = apiutils.pod_post_data()
|
pdict = apiutils.pod_post_data()
|
||||||
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
||||||
|
|
|
@ -13,8 +13,8 @@
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
from six.moves.urllib import parse as urlparse
|
from six.moves.urllib import parse as urlparse
|
||||||
from wsme import types as wtypes
|
from wsme import types as wtypes
|
||||||
|
|
||||||
|
@ -129,7 +129,7 @@ class TestPatch(api_base.FunctionalTest):
|
||||||
self.rc = obj_utils.create_test_rc(self.context,
|
self.rc = obj_utils.create_test_rc(self.context,
|
||||||
images=['rc_example_A_image'])
|
images=['rc_example_A_image'])
|
||||||
|
|
||||||
@mock.patch.object(timeutils, 'utcnow')
|
@mock.patch('oslo.utils.timeutils.utcnow')
|
||||||
def test_replace_ok(self, mock_utcnow):
|
def test_replace_ok(self, mock_utcnow):
|
||||||
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
||||||
mock_utcnow.return_value = test_time
|
mock_utcnow.return_value = test_time
|
||||||
|
@ -269,7 +269,7 @@ class TestPost(api_base.FunctionalTest):
|
||||||
rc.create(self.context)
|
rc.create(self.context)
|
||||||
return rc
|
return rc
|
||||||
|
|
||||||
@mock.patch.object(timeutils, 'utcnow')
|
@mock.patch('oslo.utils.timeutils.utcnow')
|
||||||
def test_create_rc(self, mock_utcnow):
|
def test_create_rc(self, mock_utcnow):
|
||||||
rc_dict = apiutils.rc_post_data()
|
rc_dict = apiutils.rc_post_data()
|
||||||
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
||||||
|
|
|
@ -13,8 +13,8 @@
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
from six.moves.urllib import parse as urlparse
|
from six.moves.urllib import parse as urlparse
|
||||||
from wsme import types as wtypes
|
from wsme import types as wtypes
|
||||||
|
|
||||||
|
@ -225,7 +225,7 @@ class TestPost(api_base.FunctionalTest):
|
||||||
service.create()
|
service.create()
|
||||||
return service
|
return service
|
||||||
|
|
||||||
@mock.patch.object(timeutils, 'utcnow')
|
@mock.patch('oslo.utils.timeutils.utcnow')
|
||||||
def test_create_service(self, mock_utcnow):
|
def test_create_service(self, mock_utcnow):
|
||||||
sdict = apiutils.service_post_data()
|
sdict = apiutils.service_post_data()
|
||||||
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
||||||
|
|
|
@ -18,7 +18,7 @@ import wsme
|
||||||
from magnum.api.controllers.v1 import utils
|
from magnum.api.controllers.v1 import utils
|
||||||
from magnum.tests.api import base
|
from magnum.tests.api import base
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo.config import fixture
|
from oslo_config import fixture
|
||||||
|
|
||||||
from magnum.api import auth
|
from magnum.api import auth
|
||||||
from magnum.tests import base
|
from magnum.tests import base
|
||||||
|
|
|
@ -16,8 +16,8 @@
|
||||||
import json
|
import json
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo import messaging
|
import oslo_messaging as messaging
|
||||||
|
|
||||||
from magnum.api.controllers import root
|
from magnum.api.controllers import root
|
||||||
from magnum.api import hooks
|
from magnum.api import hooks
|
||||||
|
|
|
@ -19,7 +19,7 @@ import copy
|
||||||
import os
|
import os
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
import pecan
|
import pecan
|
||||||
from pecan import testing
|
from pecan import testing
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
cfg.CONF.import_group('keystone_authtoken',
|
cfg.CONF.import_group('keystone_authtoken',
|
||||||
'keystonemiddleware.auth_token')
|
'keystonemiddleware.auth_token')
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from mock import patch
|
from mock import patch
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from magnum.common import urlfetch
|
from magnum.common import urlfetch
|
||||||
from magnum.tests import base
|
from magnum.tests import base
|
||||||
|
|
|
@ -23,8 +23,8 @@ import uuid
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
import netaddr
|
import netaddr
|
||||||
from oslo.config import cfg
|
|
||||||
from oslo_concurrency import processutils
|
from oslo_concurrency import processutils
|
||||||
|
from oslo_config import cfg
|
||||||
import six
|
import six
|
||||||
import six.moves.builtins as __builtin__
|
import six.moves.builtins as __builtin__
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
# 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
|
from oslo_config import cfg
|
||||||
|
|
||||||
from magnum.conductor.handlers import kube
|
from magnum.conductor.handlers import kube
|
||||||
from magnum import objects
|
from magnum import objects
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import fixtures
|
import fixtures
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from magnum.common import config
|
from magnum.common import config
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ import os
|
||||||
import shutil
|
import shutil
|
||||||
|
|
||||||
import fixtures
|
import fixtures
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from magnum.common import paths
|
from magnum.common import paths
|
||||||
from magnum.db import api as dbapi
|
from magnum.db import api as dbapi
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
"""Tests for custom SQLAlchemy types via Magnum DB."""
|
"""Tests for custom SQLAlchemy types via Magnum DB."""
|
||||||
|
|
||||||
from oslo.db import exception as db_exc
|
from oslo_db import exception as db_exc
|
||||||
|
|
||||||
from magnum.common import utils as magnum_utils
|
from magnum.common import utils as magnum_utils
|
||||||
from magnum.db import api as dbapi
|
from magnum.db import api as dbapi
|
||||||
|
|
|
@ -17,7 +17,7 @@ import gettext
|
||||||
|
|
||||||
import iso8601
|
import iso8601
|
||||||
import netaddr
|
import netaddr
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from magnum.common import context
|
from magnum.common import context
|
||||||
|
|
|
@ -15,8 +15,8 @@
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
||||||
import fixtures
|
import fixtures
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.db import options
|
from oslo_db import options
|
||||||
|
|
||||||
from magnum.common import context
|
from magnum.common import context
|
||||||
from magnum.db import api as db_api
|
from magnum.db import api as db_api
|
||||||
|
|
Loading…
Reference in New Issue