x/quark
Code Issues Proposed changes

Moved base model from neutron.db to neutron_lib.db

Browse Source 
Deprecation warnings indicated that model_base and NeutronBaseV2 had
moved to neutron_lib.db.model_base. Fixed imports to prevent future
packaging issues.

JIRA:NCP-2107
Change-Id: Ie0fb0e35eb85939662c1cc6682d109cfcd62caab
This commit is contained in:
Kyle Haley
2016-11-16 11:42:45 -08:00
parent 2dac6968f7
commit 97f45f791b
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
quark/db/models.py
View File

@@ -18,12 +18,11 @@ import json
import netaddr import netaddr
# NOTE(asadoughi): noqa import lines fix neutron DB changes breaking tests # NOTE(asadoughi): noqa import lines fix neutron DB changes breaking tests
from neutron.db import agentschedulers_db # noqa from neutron.db import agentschedulers_db # noqa
import neutron.db.model_base
from neutron.db import model_base as base_mod
from neutron.db import models_v2 as models
from neutron.db.qos import models as qos_models # noqa from neutron.db.qos import models as qos_models # noqa
from neutron.db import rbac_db_models # noqa from neutron.db import rbac_db_models # noqa
from neutron.db import segments_db # noqa from neutron.db import segments_db # noqa
import neutron_lib.db.model_base
from neutron_lib.db import model_base as base_mod
from oslo_log import log as logging from oslo_log import log as logging
from oslo_utils import timeutils from oslo_utils import timeutils
import sqlalchemy as sa import sqlalchemy as sa
@@ -40,7 +39,7 @@ from quark.db import ip_types
# DO NOT DELETE IT!!! # DO NOT DELETE IT!!!
from quark import quota_driver # noqa from quark import quota_driver # noqa
HasId = models.HasId HasId = base_mod.HasId
HasTenant = base_mod.HasProject HasTenant = base_mod.HasProject
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@@ -62,7 +61,7 @@ def _default_list_getset(collection_class, proxy):
return getter, setter return getter, setter
class QuarkBase(neutron.db.model_base.NeutronBaseV2): class QuarkBase(neutron_lib.db.model_base.NeutronBaseV2):
created_at = sa.Column(sa.DateTime(), default=timeutils.utcnow) created_at = sa.Column(sa.DateTime(), default=timeutils.utcnow)
__table_args__ = TABLE_KWARGS __table_args__ = TABLE_KWARGS