Fix oslo imports

sed -i 's/oslo\./oslo_/g' $f

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

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
 

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

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_config import cfg
-from oslo.utils import timeutils
 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

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
 

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
 

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
 

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

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

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

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
 
 

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_config import cfg
-from oslo.utils import timeutils
 from oslo_log import log as logging
+from oslo_utils import timeutils
 from sqlalchemy import and_, or_, func
 
 from quark.db import models

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

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

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

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

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
 

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

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_config import cfg
-from oslo.utils import importutils
 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

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
 

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

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_config import cfg
-from oslo.utils import importutils
 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

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
 

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_config import cfg
-from oslo.utils import importutils
-from oslo.utils import timeutils
 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

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

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

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

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

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

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

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

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

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_config import cfg
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 from quark.db import api as db_api
 import quark.ipam

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

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
 

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,
+            do_not_use=do_not_use,
-                 _cidr=cidr,
+            _cidr=cidr,
-                 network_id=network_id,
+            network_id=network_id,
-                 ip_version=ip_version,
+            ip_version=ip_version,
-                 segment_id=segment_id,
+            segment_id=segment_id,
-                 id=id,
+            id=id,
-                 ip_policy_id=ip_policy_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=address,
-                 address_readable=address_readable,
+            address_readable=address_readable,
-                 subnet_id=subnet_id,
+            subnet_id=subnet_id,
-                 _deallocated=deallocated,
+            _deallocated=deallocated,
-                 deallocated_at=deallocated_at))
+            deallocated_at=deallocated_at,
+            created_at=EPOCH)
 
     def _default(self):
         self._insert_ip_policy()

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

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

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

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

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

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
 
 

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

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

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

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

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

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

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)

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