Merge "Import model_base from neutron-lib"
This commit is contained in:
commit
0ae7ff91f0
@ -17,7 +17,7 @@ import random
|
|||||||
|
|
||||||
from neutron.db import agents_db
|
from neutron.db import agents_db
|
||||||
from neutron.db import agentschedulers_db
|
from neutron.db import agentschedulers_db
|
||||||
from neutron.db import model_base
|
from neutron_lib.db import model_base
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
import six
|
import six
|
||||||
import sqlalchemy as sa
|
import sqlalchemy as sa
|
||||||
|
@ -14,9 +14,9 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from neutron.api.v2 import attributes as attr
|
from neutron.api.v2 import attributes as attr
|
||||||
from neutron.db import model_base
|
|
||||||
from neutron.db import models_v2
|
from neutron.db import models_v2
|
||||||
from neutron.db import servicetype_db as st_db
|
from neutron.db import servicetype_db as st_db
|
||||||
|
from neutron_lib.db import model_base
|
||||||
import sqlalchemy as sa
|
import sqlalchemy as sa
|
||||||
from sqlalchemy.ext import orderinglist
|
from sqlalchemy.ext import orderinglist
|
||||||
from sqlalchemy import orm
|
from sqlalchemy import orm
|
||||||
|
@ -25,9 +25,9 @@ These data models do provide methods for instantiation from SQLAlchemy models
|
|||||||
and also converting to dictionaries.
|
and also converting to dictionaries.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from neutron.db import model_base
|
|
||||||
from neutron.db import models_v2
|
from neutron.db import models_v2
|
||||||
from neutron.db import servicetype_db
|
from neutron.db import servicetype_db
|
||||||
|
from neutron_lib.db import model_base
|
||||||
import six
|
import six
|
||||||
from sqlalchemy.ext import orderinglist
|
from sqlalchemy.ext import orderinglist
|
||||||
from sqlalchemy.orm import collections
|
from sqlalchemy.orm import collections
|
||||||
|
Loading…
Reference in New Issue
Block a user