x/quark
Code Issues Proposed changes

Merge pull request #286 from jmeridth/fix_upstream_changes

Browse Source 
Fix upstream neutron changes, items removed from neutron.common
This commit is contained in:
Matt Dietz 2014-12-02 10:11:12 -06:00
commit 78bb87a9b8
15 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quark/__init__.py
View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from neutron.openstack.common.gettextutils import _
from neutron.i18n import _
from oslo.config import cfg
CONF = cfg.CONF

2
quark/db/api.py
View File

@ -18,9 +18,9 @@ import inspect
import netaddr
from neutron.openstack.common import log as logging
from neutron.openstack.common import timeutils
from neutron.openstack.common import uuidutils
from oslo.config import cfg
from oslo.utils import timeutils
from sqlalchemy import event
from sqlalchemy import func as sql_func
from sqlalchemy import and_, asc, desc, orm, or_, not_

2
quark/db/migration/alembic/versions/2748e48cee3a_truncate_ip_policy_cidr.py
View File

@ -15,8 +15,8 @@ import logging
from alembic import op
from sqlalchemy.sql import column, select, table
import netaddr
from neutron.openstack.common import timeutils
from neutron.openstack.common import uuidutils
from oslo.utils import timeutils
import sqlalchemy as sa
LOG = logging.getLogger("alembic.migration")

2
quark/db/migration/alembic/versions/45a07fac3d38_ensure_default_policy_with_policy.py
View File

@ -15,8 +15,8 @@ import logging
from alembic import op
from sqlalchemy.sql import column, select, table
import netaddr
from neutron.openstack.common import timeutils
from neutron.openstack.common import uuidutils
from oslo.utils import timeutils
import sqlalchemy as sa
LOG = logging.getLogger("alembic.migration")

2
quark/db/migration/alembic/versions/552b213c2b8c_default_policy_without_policy.py
View File

@ -16,8 +16,8 @@ from quark.plugin_modules import ip_policies
from alembic import op
from sqlalchemy.sql import column, select, table
from neutron.openstack.common import timeutils
from neutron.openstack.common import uuidutils
from oslo.utils import timeutils
import sqlalchemy as sa
LOG = logging.getLogger("alembic.migration")

2
quark/db/models.py
View File

@ -17,7 +17,7 @@ import netaddr
import neutron.db.model_base
from neutron.db import models_v2 as models
from neutron.openstack.common import log as logging
from neutron.openstack.common import timeutils
from oslo.utils import timeutils
import sqlalchemy as sa
from sqlalchemy.ext import associationproxy
from sqlalchemy.ext import declarative

3
quark/gunicorn_server.py
View File

@ -6,7 +6,6 @@ from gunicorn import config as gconfig
from neutron.common import config
from neutron.common import legacy
from neutron.common import utils
from neutron.openstack.common import gettextutils
from neutron.openstack.common import log as logging
from neutron import service # noqa For api_workers config value
from oslo.config import cfg
@ -32,8 +31,6 @@ options = [
cfg.CONF.register_opts(options, 'gunicorn')
gettextutils.install('neutron', lazy=True)
LOG = logging.getLogger(__name__)

2
quark/ipam.py
View File

@ -27,9 +27,9 @@ from neutron.common import exceptions
from neutron.common import rpc as n_rpc
from neutron.openstack.common import lockutils
from neutron.openstack.common import log as logging
from neutron.openstack.common import timeutils
from oslo.config import cfg
from oslo.db import exception as db_exception
from oslo.utils import timeutils
from quark.db import api as db_api
from quark.db import ip_types

2
quark/plugin_modules/networks.py
View File

@ -17,11 +17,11 @@ import netaddr
from neutron.common import exceptions
from neutron.db import quota_db as qdb
from neutron.extensions import providernet as pnet
from neutron.openstack.common import importutils
from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron import quota
from oslo.config import cfg
from oslo.utils import importutils
from quark.db import api as db_api
from quark.drivers import registry

2
quark/plugin_modules/routes.py
View File

@ -15,10 +15,10 @@
import netaddr
from neutron.common import exceptions
from neutron.openstack.common import importutils
from neutron.openstack.common import log as logging
from neutron import quota
from oslo.config import cfg
from oslo.utils import importutils
from quark import allocation_pool
from quark.db import api as db_api

4
quark/plugin_modules/subnets.py
View File

@ -18,11 +18,11 @@ from neutron.common import config as neutron_cfg
from neutron.common import exceptions
from neutron.common import rpc as n_rpc
from neutron.db import quota_db as qdb
from neutron.openstack.common import importutils
from neutron.openstack.common import log as logging
from neutron.openstack.common import timeutils
from neutron import quota
from oslo.config import cfg
from oslo.utils import importutils
from oslo.utils import timeutils
from quark import allocation_pool
from quark.db import api as db_api

2
quark/tests/functional/test_ipam.py
View File

@ -20,8 +20,8 @@ import mock
import netaddr
from neutron.common import exceptions
from neutron.common import rpc
from neutron.openstack.common import timeutils
from oslo.config import cfg
from oslo.utils import timeutils
from quark.db import api as db_api
import quark.ipam

4
quark/tests/plugin_modules/test_subnets.py
View File

@ -1108,7 +1108,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("neutron.openstack.common.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):
@ -1231,7 +1231,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("neutron.openstack.common.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):

2
quark/tests/test_ipam.py
View File

@ -1629,7 +1629,7 @@ class QuarkIPAddressAllocationNotifications(QuarkIpamBaseTest):
mock.patch("quark.db.api.ip_address_create"),
mock.patch("quark.db.api.subnet_find_ordered_by_most_full"),
mock.patch("neutron.common.rpc.get_notifier"),
mock.patch("neutron.openstack.common.timeutils.utcnow"),
mock.patch("oslo.utils.timeutils.utcnow"),
) as (addr_find, addr_create, subnet_find, notify, time):
addrs_found = []
for a in addresses:

54
quark/tests/test_migrations.py
View File

@ -97,9 +97,9 @@ class Test2748e48cee3a(BaseMigrationTest):
ip_policy_id="111", cidr="192.168.10.0/16"))
with contextlib.nested(
mock.patch("neutron.openstack.common.timeutils"),
mock.patch("neutron.openstack.common.uuidutils")
) as (tu, uuid):
mock.patch("neutron.openstack.common.uuidutils"),
mock.patch("oslo.utils.timeutils")
) as (uuid, tu):
tu.utcnow.return_value = datetime.datetime(2004, 2, 14)
uuid.generate_uuid.return_value = "foo"
alembic_command.upgrade(self.config, '2748e48cee3a')
@ -122,9 +122,9 @@ class Test2748e48cee3a(BaseMigrationTest):
ip_policy_id="111", cidr="fd00::/7"))
with contextlib.nested(
mock.patch("neutron.openstack.common.timeutils"),
mock.patch("neutron.openstack.common.uuidutils")
) as (tu, uuid):
mock.patch("neutron.openstack.common.uuidutils"),
mock.patch("oslo.utils.timeutils")
) as (uuid, tu):
tu.utcnow.return_value = datetime.datetime(2004, 2, 14)
uuid.generate_uuid.return_value = "foo"
alembic_command.upgrade(self.config, '2748e48cee3a')
@ -169,9 +169,9 @@ class Test2748e48cee3a(BaseMigrationTest):
cidr="0.0.0.0/24"))
with contextlib.nested(
mock.patch("neutron.openstack.common.timeutils"),
mock.patch("neutron.openstack.common.uuidutils")
) as (tu, uuid):
mock.patch("neutron.openstack.common.uuidutils"),
mock.patch("oslo.utils.timeutils")
) as (uuid, tu):
tu.utcnow.return_value = datetime.datetime(2004, 2, 14)
uuid.generate_uuid.return_value = "foo"
alembic_command.upgrade(self.config, '2748e48cee3a')
@ -203,9 +203,9 @@ class Test2748e48cee3a(BaseMigrationTest):
ip_policy_id="111", cidr="192.168.10.0/23"))
with contextlib.nested(
mock.patch("neutron.openstack.common.timeutils"),
mock.patch("neutron.openstack.common.uuidutils")
) as (tu, uuid):
mock.patch("neutron.openstack.common.uuidutils"),
mock.patch("oslo.utils.timeutils")
) as (uuid, tu):
tu.utcnow.return_value = datetime.datetime(2004, 2, 14)
uuid.generate_uuid.return_value = "foo"
alembic_command.upgrade(self.config, '2748e48cee3a')
@ -277,9 +277,9 @@ class Test45a07fac3d38(BaseMigrationTest):
dict(id="222", created_at=datetime.date(1970, 1, 1),
ip_policy_id="111", cidr="192.168.10.13/32"))
with contextlib.nested(
mock.patch("neutron.openstack.common.timeutils"),
mock.patch("neutron.openstack.common.uuidutils")
) as (tu, uuid):
mock.patch("neutron.openstack.common.uuidutils"),
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)
alembic_command.upgrade(self.config, '45a07fac3d38')
@ -306,9 +306,9 @@ class Test45a07fac3d38(BaseMigrationTest):
dict(id="222", created_at=datetime.date(1970, 1, 1),
ip_policy_id="111", cidr="fd00::3/128"))
with contextlib.nested(
mock.patch("neutron.openstack.common.timeutils"),
mock.patch("neutron.openstack.common.uuidutils")
) as (tu, uuid):
mock.patch("neutron.openstack.common.uuidutils"),
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)
alembic_command.upgrade(self.config, '45a07fac3d38')
@ -480,9 +480,9 @@ class Test552b213c2b8c(BaseMigrationTest):
dict(id="000", tenant_id="foo", _cidr="192.168.10.0/24",
ip_policy_id=None))
with contextlib.nested(
mock.patch("neutron.openstack.common.timeutils"),
mock.patch("neutron.openstack.common.uuidutils")
) as (tu, uuid):
mock.patch("neutron.openstack.common.uuidutils"),
mock.patch("oslo.utils.timeutils")
) as (uuid, tu):
dt = datetime.datetime(1970, 1, 1)
tu.utcnow.return_value = dt
uuid.generate_uuid.side_effect = ("666", "667", "668")
@ -515,9 +515,9 @@ class Test552b213c2b8c(BaseMigrationTest):
dict(id="000", tenant_id="foo", _cidr="fd00::/64",
ip_policy_id=None))
with contextlib.nested(
mock.patch("neutron.openstack.common.timeutils"),
mock.patch("neutron.openstack.common.uuidutils")
) as (tu, uuid):
mock.patch("neutron.openstack.common.uuidutils"),
mock.patch("oslo.utils.timeutils")
) as (uuid, tu):
dt = datetime.datetime(1970, 1, 1)
tu.utcnow.return_value = dt
uuid.generate_uuid.side_effect = ("666", "667", "668")
@ -564,9 +564,9 @@ class Test552b213c2b8c(BaseMigrationTest):
ip_policy_id="111", cidr="192.168.10.13/32"))
with contextlib.nested(
mock.patch("neutron.openstack.common.timeutils"),
mock.patch("neutron.openstack.common.uuidutils")
) as (tu, uuid):
mock.patch("neutron.openstack.common.uuidutils"),
mock.patch("oslo.utils.timeutils")
) as (uuid, tu):
tu.utcnow.return_value = dt
uuid.generate_uuid.side_effect = ("5", "6", "7", "8", "9", "10")
alembic_command.upgrade(self.config, '552b213c2b8c')