diff --git a/quark/agent/agent.py b/quark/agent/agent.py index d3800fd..8d991ee 100644 --- a/quark/agent/agent.py +++ b/quark/agent/agent.py @@ -19,7 +19,7 @@ import time from neutron.common import config from neutron.common import utils as n_utils -from oslo.config import cfg +from oslo_config import cfg from oslo_log import log as logging from quark.agent import xapi diff --git a/quark/agent/xapi.py b/quark/agent/xapi.py index 2cda51c..f3c7b48 100644 --- a/quark/agent/xapi.py +++ b/quark/agent/xapi.py @@ -16,7 +16,7 @@ from collections import namedtuple import contextlib -from oslo.config import cfg +from oslo_config import cfg from oslo_log import log as logging import XenAPI diff --git a/quark/cache/redis_base.py b/quark/cache/redis_base.py index 9a30ac8..7f5e222 100644 --- a/quark/cache/redis_base.py +++ b/quark/cache/redis_base.py @@ -19,7 +19,7 @@ from random import shuffle import string import netaddr -from oslo.config import cfg +from oslo_config import cfg from oslo_log import log as logging import redis import redis.sentinel diff --git a/quark/db/api.py b/quark/db/api.py index 34e7be2..ea1131b 100644 --- a/quark/db/api.py +++ b/quark/db/api.py @@ -19,9 +19,9 @@ import inspect import json import netaddr from neutron.db.sqlalchemyutils import paginate_query -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg from oslo_log import log as logging +from oslo_utils import timeutils from oslo_utils import uuidutils from sqlalchemy import event from sqlalchemy import func as sql_func diff --git a/quark/db/migration/alembic/versions/2748e48cee3a_truncate_ip_policy_cidr.py b/quark/db/migration/alembic/versions/2748e48cee3a_truncate_ip_policy_cidr.py index 85e38b6..4031d18 100644 --- a/quark/db/migration/alembic/versions/2748e48cee3a_truncate_ip_policy_cidr.py +++ b/quark/db/migration/alembic/versions/2748e48cee3a_truncate_ip_policy_cidr.py @@ -15,7 +15,7 @@ import logging from alembic import op from sqlalchemy.sql import column, select, table import netaddr -from oslo.utils import timeutils +from oslo_utils import timeutils from oslo_utils import uuidutils import sqlalchemy as sa diff --git a/quark/db/migration/alembic/versions/45a07fac3d38_ensure_default_policy_with_policy.py b/quark/db/migration/alembic/versions/45a07fac3d38_ensure_default_policy_with_policy.py index 8cc29db..f816b2d 100644 --- a/quark/db/migration/alembic/versions/45a07fac3d38_ensure_default_policy_with_policy.py +++ b/quark/db/migration/alembic/versions/45a07fac3d38_ensure_default_policy_with_policy.py @@ -15,7 +15,7 @@ import logging from alembic import op from sqlalchemy.sql import column, select, table import netaddr -from oslo.utils import timeutils +from oslo_utils import timeutils from oslo_utils import uuidutils import sqlalchemy as sa diff --git a/quark/db/migration/alembic/versions/552b213c2b8c_default_policy_without_policy.py b/quark/db/migration/alembic/versions/552b213c2b8c_default_policy_without_policy.py index f64e6a7..f48b2a1 100644 --- a/quark/db/migration/alembic/versions/552b213c2b8c_default_policy_without_policy.py +++ b/quark/db/migration/alembic/versions/552b213c2b8c_default_policy_without_policy.py @@ -16,7 +16,7 @@ from quark.plugin_modules import ip_policies from alembic import op from sqlalchemy.sql import column, select, table -from oslo.utils import timeutils +from oslo_utils import timeutils from oslo_utils import uuidutils import sqlalchemy as sa diff --git a/quark/db/models.py b/quark/db/models.py index 8dc1bb8..a0e272e 100644 --- a/quark/db/models.py +++ b/quark/db/models.py @@ -18,8 +18,8 @@ import json import netaddr import neutron.db.model_base from neutron.db import models_v2 as models -from oslo.utils import timeutils from oslo_log import log as logging +from oslo_utils import timeutils import sqlalchemy as sa from sqlalchemy.ext import associationproxy from sqlalchemy.ext import declarative diff --git a/quark/drivers/nvp_driver.py b/quark/drivers/nvp_driver.py index 0438c05..dc1493f 100644 --- a/quark/drivers/nvp_driver.py +++ b/quark/drivers/nvp_driver.py @@ -22,7 +22,7 @@ import random import aiclib from neutron.extensions import securitygroup as sg_ext -from oslo.config import cfg +from oslo_config import cfg from oslo_log import log as logging from quark.drivers import base diff --git a/quark/drivers/unicorn_driver.py b/quark/drivers/unicorn_driver.py index 8ae5a4d..bd632dd 100644 --- a/quark/drivers/unicorn_driver.py +++ b/quark/drivers/unicorn_driver.py @@ -21,7 +21,7 @@ import json import netaddr import requests -from oslo.config import cfg +from oslo_config import cfg from oslo_log import log as logging from quark import exceptions as ex diff --git a/quark/gunicorn_server.py b/quark/gunicorn_server.py index bae2761..b89f423 100644 --- a/quark/gunicorn_server.py +++ b/quark/gunicorn_server.py @@ -6,7 +6,7 @@ from gunicorn import config as gconfig from neutron.common import config from neutron.common import utils from neutron import service # noqa For api_workers config value -from oslo.config import cfg +from oslo_config import cfg from oslo_log import log as logging diff --git a/quark/ip_availability.py b/quark/ip_availability.py index 55c9b06..9b091d9 100755 --- a/quark/ip_availability.py +++ b/quark/ip_availability.py @@ -21,9 +21,9 @@ import sys import netaddr from neutron.common import config from neutron.db import api as neutron_db_api -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg from oslo_log import log as logging +from oslo_utils import timeutils from sqlalchemy import and_, or_, func from quark.db import models diff --git a/quark/ipam.py b/quark/ipam.py index f9026ee..468db1e 100644 --- a/quark/ipam.py +++ b/quark/ipam.py @@ -26,11 +26,11 @@ import uuid import netaddr from neutron.common import exceptions from neutron.common import rpc as n_rpc -from oslo.config import cfg -from oslo.utils import timeutils from oslo_concurrency import lockutils +from oslo_config import cfg from oslo_db import exception as db_exception from oslo_log import log as logging +from oslo_utils import timeutils from quark.db import api as db_api from quark.db import ip_types diff --git a/quark/network_strategy.py b/quark/network_strategy.py index 23278ba..36f2e65 100644 --- a/quark/network_strategy.py +++ b/quark/network_strategy.py @@ -16,7 +16,7 @@ import json from neutron.common import exceptions -from oslo.config import cfg +from oslo_config import cfg from oslo_log import log as logging LOG = logging.getLogger(__name__) diff --git a/quark/plugin.py b/quark/plugin.py index f2f1d45..7761a69 100644 --- a/quark/plugin.py +++ b/quark/plugin.py @@ -20,7 +20,7 @@ v2 Neutron Plug-in API Quark Implementation from neutron.extensions import securitygroup as sg_ext from neutron import neutron_plugin_base_v2 from neutron import quota -from oslo.config import cfg +from oslo_config import cfg from oslo_log import log as logging from quark.api import extensions diff --git a/quark/plugin_modules/floating_ips.py b/quark/plugin_modules/floating_ips.py index d8cb6aa..698443c 100644 --- a/quark/plugin_modules/floating_ips.py +++ b/quark/plugin_modules/floating_ips.py @@ -14,7 +14,7 @@ # under the License. from neutron.common import exceptions -from oslo.config import cfg +from oslo_config import cfg from oslo_log import log as logging from quark.db import api as db_api diff --git a/quark/plugin_modules/ip_addresses.py b/quark/plugin_modules/ip_addresses.py index 3320a7b..4202060 100644 --- a/quark/plugin_modules/ip_addresses.py +++ b/quark/plugin_modules/ip_addresses.py @@ -15,7 +15,7 @@ from neutron.common import exceptions from neutron import quota -from oslo.config import cfg +from oslo_config import cfg from oslo_log import log as logging import webob diff --git a/quark/plugin_modules/ip_policies.py b/quark/plugin_modules/ip_policies.py index b2053be..31d15b5 100644 --- a/quark/plugin_modules/ip_policies.py +++ b/quark/plugin_modules/ip_policies.py @@ -15,7 +15,7 @@ import netaddr from neutron.common import exceptions -from oslo.config import cfg +from oslo_config import cfg from oslo_log import log as logging from quark import allocation_pool diff --git a/quark/plugin_modules/networks.py b/quark/plugin_modules/networks.py index a39fb06..b52ccaf 100644 --- a/quark/plugin_modules/networks.py +++ b/quark/plugin_modules/networks.py @@ -18,9 +18,9 @@ from neutron.common import exceptions from neutron.db import quota_db as qdb from neutron.extensions import providernet as pnet from neutron import quota -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg from oslo_log import log as logging +from oslo_utils import importutils from oslo_utils import uuidutils from quark.db import api as db_api diff --git a/quark/plugin_modules/ports.py b/quark/plugin_modules/ports.py index b3abe5b..4cd6181 100644 --- a/quark/plugin_modules/ports.py +++ b/quark/plugin_modules/ports.py @@ -17,7 +17,7 @@ import netaddr from neutron.common import exceptions from neutron.extensions import securitygroup as sg_ext from neutron import quota -from oslo.config import cfg +from oslo_config import cfg from oslo_log import log as logging from oslo_utils import uuidutils diff --git a/quark/plugin_modules/router.py b/quark/plugin_modules/router.py index b3b3c68..5ee29b7 100644 --- a/quark/plugin_modules/router.py +++ b/quark/plugin_modules/router.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from oslo_log import log as logging CONF = cfg.CONF diff --git a/quark/plugin_modules/routes.py b/quark/plugin_modules/routes.py index 69a7cd5..f701da9 100644 --- a/quark/plugin_modules/routes.py +++ b/quark/plugin_modules/routes.py @@ -16,9 +16,9 @@ import netaddr from neutron.common import exceptions from neutron import quota -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg from oslo_log import log as logging +from oslo_utils import importutils from quark import allocation_pool from quark.db import api as db_api diff --git a/quark/plugin_modules/security_groups.py b/quark/plugin_modules/security_groups.py index f272c0a..09d0e0a 100644 --- a/quark/plugin_modules/security_groups.py +++ b/quark/plugin_modules/security_groups.py @@ -16,7 +16,7 @@ from neutron.common import exceptions from neutron.extensions import securitygroup as sg_ext from neutron import quota -from oslo.config import cfg +from oslo_config import cfg from oslo_log import log as logging from oslo_utils import uuidutils diff --git a/quark/plugin_modules/subnets.py b/quark/plugin_modules/subnets.py index 0808f55..1ff8ce6 100644 --- a/quark/plugin_modules/subnets.py +++ b/quark/plugin_modules/subnets.py @@ -19,10 +19,10 @@ from neutron.common import exceptions from neutron.common import rpc as n_rpc from neutron.db import quota_db as qdb from neutron import quota -from oslo.config import cfg -from oslo.utils import importutils -from oslo.utils import timeutils +from oslo_config import cfg from oslo_log import log as logging +from oslo_utils import importutils +from oslo_utils import timeutils from quark import allocation_pool from quark.db import api as db_api diff --git a/quark/plugin_views.py b/quark/plugin_views.py index 2ef0993..8544bab 100644 --- a/quark/plugin_views.py +++ b/quark/plugin_views.py @@ -18,7 +18,7 @@ View Helpers for Quark Plugin """ import netaddr -from oslo.config import cfg +from oslo_config import cfg from oslo_log import log as logging from quark.db import ip_types diff --git a/quark/protocols.py b/quark/protocols.py index a846f09..ec8f3a0 100644 --- a/quark/protocols.py +++ b/quark/protocols.py @@ -16,7 +16,7 @@ import netaddr from neutron.common import exceptions from neutron.extensions import securitygroup as sg_ext -from oslo.config import cfg +from oslo_config import cfg from oslo_log import log as logging from quark import exceptions as q_exc diff --git a/quark/tests/cache/test_redis_base.py b/quark/tests/cache/test_redis_base.py index 79b689c..022c118 100644 --- a/quark/tests/cache/test_redis_base.py +++ b/quark/tests/cache/test_redis_base.py @@ -19,7 +19,7 @@ import uuid import mock import netaddr -from oslo.config import cfg +from oslo_config import cfg import redis from quark.cache import redis_base diff --git a/quark/tests/cache/test_security_groups_client.py b/quark/tests/cache/test_security_groups_client.py index b2ecfdb..0f8830c 100644 --- a/quark/tests/cache/test_security_groups_client.py +++ b/quark/tests/cache/test_security_groups_client.py @@ -17,7 +17,7 @@ import json import mock import netaddr -from oslo.config import cfg +from oslo_config import cfg import redis from quark.agent.xapi import VIF diff --git a/quark/tests/functional/base.py b/quark/tests/functional/base.py index 3e85917..8d3206b 100644 --- a/quark/tests/functional/base.py +++ b/quark/tests/functional/base.py @@ -1,6 +1,6 @@ from neutron import context from neutron.db import api as neutron_db_api -from oslo.config import cfg +from oslo_config import cfg from sqlalchemy.orm import configure_mappers from quark.db import models diff --git a/quark/tests/functional/mysql/base.py b/quark/tests/functional/mysql/base.py index d2c7f50..4d91564 100644 --- a/quark/tests/functional/mysql/base.py +++ b/quark/tests/functional/mysql/base.py @@ -2,7 +2,7 @@ import os from neutron import context from neutron.db import api as neutron_db_api -from oslo.config import cfg +from oslo_config import cfg from sqlalchemy.orm import configure_mappers from quark.db import models diff --git a/quark/tests/functional/mysql/test_db_ip_reallocate.py b/quark/tests/functional/mysql/test_db_ip_reallocate.py index 4e4a863..4215203 100644 --- a/quark/tests/functional/mysql/test_db_ip_reallocate.py +++ b/quark/tests/functional/mysql/test_db_ip_reallocate.py @@ -1,7 +1,7 @@ import datetime import netaddr -from oslo.utils import timeutils +from oslo_utils import timeutils from quark.db import api as db_api from quark.plugin_modules import ip_policies diff --git a/quark/tests/functional/mysql/test_ip_addresses.py b/quark/tests/functional/mysql/test_ip_addresses.py index 5804e47..563d07b 100644 --- a/quark/tests/functional/mysql/test_ip_addresses.py +++ b/quark/tests/functional/mysql/test_ip_addresses.py @@ -3,7 +3,7 @@ import netaddr import contextlib -from oslo.config import cfg +from oslo_config import cfg from quark.db import ip_types import quark.ipam import quark.plugin diff --git a/quark/tests/functional/mysql/test_ipam.py b/quark/tests/functional/mysql/test_ipam.py index bc7d717..c649b82 100644 --- a/quark/tests/functional/mysql/test_ipam.py +++ b/quark/tests/functional/mysql/test_ipam.py @@ -5,8 +5,8 @@ import mock import netaddr from neutron.common import exceptions from neutron.common import rpc -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from quark.db import api as db_api import quark.ipam diff --git a/quark/tests/functional/plugin_modules/test_networks.py b/quark/tests/functional/plugin_modules/test_networks.py index 5a81259..5d7a769 100644 --- a/quark/tests/functional/plugin_modules/test_networks.py +++ b/quark/tests/functional/plugin_modules/test_networks.py @@ -19,7 +19,7 @@ import mock import netaddr from neutron.common import exceptions from neutron.common import rpc -from oslo.config import cfg +from oslo_config import cfg from quark.db import api as db_api import quark.ipam diff --git a/quark/tests/functional/plugin_modules/test_subnets.py b/quark/tests/functional/plugin_modules/test_subnets.py index 3ea43a8..7dedb17 100644 --- a/quark/tests/functional/plugin_modules/test_subnets.py +++ b/quark/tests/functional/plugin_modules/test_subnets.py @@ -16,7 +16,7 @@ import mock import netaddr from neutron.common import exceptions -from oslo.config import cfg +from oslo_config import cfg import contextlib diff --git a/quark/tests/functional/test_ip_availability.py b/quark/tests/functional/test_ip_availability.py index 2f02caf..6df9e90 100644 --- a/quark/tests/functional/test_ip_availability.py +++ b/quark/tests/functional/test_ip_availability.py @@ -3,13 +3,16 @@ import datetime import mock import netaddr from neutron.db import api as neutron_db_api -from oslo.config import cfg +from oslo_config import cfg from quark.db import models from quark import ip_availability as ip_avail from quark.tests.functional.base import BaseFunctionalTest +EPOCH = datetime.date(1970, 1, 1) + + class QuarkIpAvailabilityBaseFunctionalTest(BaseFunctionalTest): def setUp(self): super(QuarkIpAvailabilityBaseFunctionalTest, self).setUp() @@ -31,14 +34,15 @@ class QuarkIpAvailabilityBaseFunctionalTest(BaseFunctionalTest): excludes = (0, 255) self.connection.execute( self.ip_policy.insert(), - dict(id=id, size=len(excludes))) + id=id, size=len(excludes), created_at=EPOCH) self.connection.execute( self.ip_policy_cidr.insert(), - [dict(ip_policy_id=id, first_ip=x, last_ip=x) + [dict(ip_policy_id=id, first_ip=x, last_ip=x, created_at=EPOCH) for x in excludes]) def _insert_network(self, id="00000000-0000-0000-0000-000000000000"): - self.connection.execute(self.networks.insert(), dict(id=id)) + self.connection.execute(self.networks.insert(), + id=id, created_at=EPOCH) def _insert_subnet(self, do_not_use=0, @@ -50,13 +54,14 @@ class QuarkIpAvailabilityBaseFunctionalTest(BaseFunctionalTest): ip_version=4): self.connection.execute( self.subnets.insert(), - dict(do_not_use=do_not_use, - _cidr=cidr, - network_id=network_id, - ip_version=ip_version, - segment_id=segment_id, - id=id, - ip_policy_id=ip_policy_id)) + do_not_use=do_not_use, + _cidr=cidr, + network_id=network_id, + ip_version=ip_version, + segment_id=segment_id, + id=id, + ip_policy_id=ip_policy_id, + created_at=EPOCH) def _insert_ip_address(self, address=1, @@ -66,11 +71,12 @@ class QuarkIpAvailabilityBaseFunctionalTest(BaseFunctionalTest): deallocated_at=None): self.connection.execute( self.ip_addresses.insert(), - dict(address=address, - address_readable=address_readable, - subnet_id=subnet_id, - _deallocated=deallocated, - deallocated_at=deallocated_at)) + address=address, + address_readable=address_readable, + subnet_id=subnet_id, + _deallocated=deallocated, + deallocated_at=deallocated_at, + created_at=EPOCH) def _default(self): self._insert_ip_policy() diff --git a/quark/tests/plugin_modules/test_ip_addresses.py b/quark/tests/plugin_modules/test_ip_addresses.py index 3f38c59..6eb10f0 100644 --- a/quark/tests/plugin_modules/test_ip_addresses.py +++ b/quark/tests/plugin_modules/test_ip_addresses.py @@ -18,7 +18,7 @@ import contextlib import mock from mock import patch from neutron.common import exceptions -from oslo.config import cfg +from oslo_config import cfg import webob from quark.db import models diff --git a/quark/tests/plugin_modules/test_networks.py b/quark/tests/plugin_modules/test_networks.py index 2bd5269..a1c20fc 100644 --- a/quark/tests/plugin_modules/test_networks.py +++ b/quark/tests/plugin_modules/test_networks.py @@ -19,7 +19,7 @@ import json import mock from neutron.common import exceptions from neutron import context -from oslo.config import cfg +from oslo_config import cfg from quark.db import api as db_api from quark.db import models diff --git a/quark/tests/plugin_modules/test_ports.py b/quark/tests/plugin_modules/test_ports.py index 2911538..737a3fc 100644 --- a/quark/tests/plugin_modules/test_ports.py +++ b/quark/tests/plugin_modules/test_ports.py @@ -20,7 +20,7 @@ import mock import netaddr from neutron.api.v2 import attributes as neutron_attrs from neutron.common import exceptions -from oslo.config import cfg +from oslo_config import cfg from quark.db import models from quark import exceptions as q_exc diff --git a/quark/tests/plugin_modules/test_security_groups.py b/quark/tests/plugin_modules/test_security_groups.py index d8bcb97..1693d33 100644 --- a/quark/tests/plugin_modules/test_security_groups.py +++ b/quark/tests/plugin_modules/test_security_groups.py @@ -18,7 +18,7 @@ import contextlib import mock from neutron.common import exceptions from neutron.extensions import securitygroup as sg_ext -from oslo.config import cfg +from oslo_config import cfg from quark.db import models from quark import exceptions as q_exc diff --git a/quark/tests/plugin_modules/test_subnets.py b/quark/tests/plugin_modules/test_subnets.py index 4ee7ea8..1d55b90 100644 --- a/quark/tests/plugin_modules/test_subnets.py +++ b/quark/tests/plugin_modules/test_subnets.py @@ -22,7 +22,7 @@ import uuid import mock from neutron.api.v2 import attributes as neutron_attrs from neutron.common import exceptions -from oslo.config import cfg +from oslo_config import cfg from quark.db import models from quark import exceptions as q_exc @@ -1237,7 +1237,7 @@ class TestSubnetsQuotas(test_quark_plugin.TestQuarkPlugin): mock.patch("quark.db.api.subnet_create"), mock.patch("quark.db.api.subnet_delete"), mock.patch("neutron.common.rpc.get_notifier"), - mock.patch("oslo.utils.timeutils.utcnow"), + mock.patch("oslo_utils.timeutils.utcnow"), mock.patch("quark.plugin_modules.subnets._validate_subnet_cidr") ) as (get_subnets, sub_find, net_find, sub_create, sub_del, notify, time_func, sub_validate): @@ -1360,7 +1360,7 @@ class TestSubnetsNotification(test_quark_plugin.TestQuarkPlugin): mock.patch("quark.db.api.subnet_delete"), mock.patch("neutron.common.rpc.get_notifier"), mock.patch("neutron.quota.QUOTAS"), - mock.patch("oslo.utils.timeutils.utcnow"), + mock.patch("oslo_utils.timeutils.utcnow"), mock.patch("quark.plugin_modules.subnets._validate_subnet_cidr") ) as (get_subnets, sub_find, net_find, sub_create, sub_del, notify, quota_engine, time_func, sub_validate): diff --git a/quark/tests/test_base.py b/quark/tests/test_base.py index 0601700..1315ebb 100644 --- a/quark/tests/test_base.py +++ b/quark/tests/test_base.py @@ -17,7 +17,7 @@ import os from neutron.common import config from neutron import context -from oslo.config import cfg +from oslo_config import cfg import unittest2 diff --git a/quark/tests/test_environment.py b/quark/tests/test_environment.py index 2a47d5b..e49dc38 100644 --- a/quark/tests/test_environment.py +++ b/quark/tests/test_environment.py @@ -15,7 +15,7 @@ import contextlib -from oslo.config import cfg +from oslo_config import cfg from quark import environment as env from quark.tests import test_base diff --git a/quark/tests/test_ipam.py b/quark/tests/test_ipam.py index f79d9a5..e7c2164 100644 --- a/quark/tests/test_ipam.py +++ b/quark/tests/test_ipam.py @@ -20,7 +20,7 @@ import mock import netaddr from neutron.common import exceptions from neutron.common import rpc -from oslo.config import cfg +from oslo_config import cfg from oslo_db import exception as db_exc from quark.db import models @@ -1807,7 +1807,7 @@ class QuarkIPAddressAllocationNotifications(QuarkIpamBaseTest): mock.patch("quark.db.api.subnet_update_next_auto_assign_ip"), mock.patch("sqlalchemy.orm.session.Session.refresh"), mock.patch("neutron.common.rpc.get_notifier"), - mock.patch("oslo.utils.timeutils.utcnow"), + mock.patch("oslo_utils.timeutils.utcnow"), ) as (addr_find, addr_create, subnet_find, subnet_update, refresh, notify, timeutils): addrs_found = [] diff --git a/quark/tests/test_migrations.py b/quark/tests/test_migrations.py index e9a1ab5..3f55db9 100644 --- a/quark/tests/test_migrations.py +++ b/quark/tests/test_migrations.py @@ -98,7 +98,7 @@ class Test2748e48cee3a(BaseMigrationTest): with contextlib.nested( mock.patch("oslo_utils.uuidutils"), - mock.patch("oslo.utils.timeutils") + mock.patch("oslo_utils.timeutils") ) as (uuid, tu): tu.utcnow.return_value = datetime.datetime(2004, 2, 14) uuid.generate_uuid.return_value = "foo" @@ -123,7 +123,7 @@ class Test2748e48cee3a(BaseMigrationTest): with contextlib.nested( mock.patch("oslo_utils.uuidutils"), - mock.patch("oslo.utils.timeutils") + mock.patch("oslo_utils.timeutils") ) as (uuid, tu): tu.utcnow.return_value = datetime.datetime(2004, 2, 14) uuid.generate_uuid.return_value = "foo" @@ -170,7 +170,7 @@ class Test2748e48cee3a(BaseMigrationTest): with contextlib.nested( mock.patch("oslo_utils.uuidutils"), - mock.patch("oslo.utils.timeutils") + mock.patch("oslo_utils.timeutils") ) as (uuid, tu): tu.utcnow.return_value = datetime.datetime(2004, 2, 14) uuid.generate_uuid.return_value = "foo" @@ -204,7 +204,7 @@ class Test2748e48cee3a(BaseMigrationTest): with contextlib.nested( mock.patch("oslo_utils.uuidutils"), - mock.patch("oslo.utils.timeutils") + mock.patch("oslo_utils.timeutils") ) as (uuid, tu): tu.utcnow.return_value = datetime.datetime(2004, 2, 14) uuid.generate_uuid.return_value = "foo" @@ -278,7 +278,7 @@ class Test45a07fac3d38(BaseMigrationTest): ip_policy_id="111", cidr="192.168.10.13/32")) with contextlib.nested( mock.patch("oslo_utils.uuidutils"), - mock.patch("oslo.utils.timeutils") + mock.patch("oslo_utils.timeutils") ) as (uuid, tu): uuid.generate_uuid.side_effect = (1, 2, 3) tu.utcnow.return_value = datetime.datetime(1970, 1, 1) @@ -307,7 +307,7 @@ class Test45a07fac3d38(BaseMigrationTest): ip_policy_id="111", cidr="fd00::3/128")) with contextlib.nested( mock.patch("oslo_utils.uuidutils"), - mock.patch("oslo.utils.timeutils") + mock.patch("oslo_utils.timeutils") ) as (uuid, tu): uuid.generate_uuid.side_effect = (1, 2, 3) tu.utcnow.return_value = datetime.datetime(1970, 1, 1) @@ -481,7 +481,7 @@ class Test552b213c2b8c(BaseMigrationTest): ip_policy_id=None)) with contextlib.nested( mock.patch("oslo_utils.uuidutils"), - mock.patch("oslo.utils.timeutils") + mock.patch("oslo_utils.timeutils") ) as (uuid, tu): dt = datetime.datetime(1970, 1, 1) tu.utcnow.return_value = dt @@ -516,7 +516,7 @@ class Test552b213c2b8c(BaseMigrationTest): ip_policy_id=None)) with contextlib.nested( mock.patch("oslo_utils.uuidutils"), - mock.patch("oslo.utils.timeutils") + mock.patch("oslo_utils.timeutils") ) as (uuid, tu): dt = datetime.datetime(1970, 1, 1) tu.utcnow.return_value = dt @@ -565,7 +565,7 @@ class Test552b213c2b8c(BaseMigrationTest): with contextlib.nested( mock.patch("oslo_utils.uuidutils"), - mock.patch("oslo.utils.timeutils") + mock.patch("oslo_utils.timeutils") ) as (uuid, tu): tu.utcnow.return_value = dt uuid.generate_uuid.side_effect = ("5", "6", "7", "8", "9", "10") diff --git a/quark/tests/test_network_strategies.py b/quark/tests/test_network_strategies.py index 6323fa3..e521b69 100644 --- a/quark/tests/test_network_strategies.py +++ b/quark/tests/test_network_strategies.py @@ -16,7 +16,7 @@ import json from neutron.common import exceptions -from oslo.config import cfg +from oslo_config import cfg from quark import network_strategy from quark.tests import test_base diff --git a/quark/tests/test_nvp_driver.py b/quark/tests/test_nvp_driver.py index 05914f1..510081a 100644 --- a/quark/tests/test_nvp_driver.py +++ b/quark/tests/test_nvp_driver.py @@ -19,7 +19,7 @@ import contextlib import mock import neutron.extensions.securitygroup as sg_ext -from oslo.config import cfg +from oslo_config import cfg import quark.drivers.nvp_driver from quark import exceptions as q_exc diff --git a/quark/tests/test_quark_plugin.py b/quark/tests/test_quark_plugin.py index eb76504..c096ba4 100644 --- a/quark/tests/test_quark_plugin.py +++ b/quark/tests/test_quark_plugin.py @@ -15,7 +15,7 @@ import mock -from oslo.config import cfg +from oslo_config import cfg import quark.plugin from quark.tests.functional.base import BaseFunctionalTest diff --git a/quark/tests/tools/test_redis_sg_tool.py b/quark/tests/tools/test_redis_sg_tool.py index 7095031..6ebc7fb 100644 --- a/quark/tests/tools/test_redis_sg_tool.py +++ b/quark/tests/tools/test_redis_sg_tool.py @@ -37,7 +37,7 @@ class QuarkRedisSgToolBase(test_base.TestBase): def setUp(self): super(QuarkRedisSgToolBase, self).setUp() neutron_cfg_patch = mock.patch("neutron.common.config.init") - oslo_cfg_patch = mock.patch("oslo.config.cfg.CONF") + oslo_cfg_patch = mock.patch("oslo_config.cfg.CONF") neutron_cfg_patch.start() oslo_cfg_patch.start() self.addCleanup(neutron_cfg_patch.stop) diff --git a/quark/tools/redis_sg_tool.py b/quark/tools/redis_sg_tool.py index 8270a11..828bf1f 100755 --- a/quark/tools/redis_sg_tool.py +++ b/quark/tools/redis_sg_tool.py @@ -49,7 +49,7 @@ import docopt import netaddr from neutron.common import config import neutron.context -from oslo.config import cfg +from oslo_config import cfg from quark.cache import security_groups_client as sg_client from quark.db import api as db_api