diff --git a/nova/db/api/models.py b/nova/db/api/models.py index 5a236e98f16c..2abae49be949 100644 --- a/nova/db/api/models.py +++ b/nova/db/api/models.py @@ -15,7 +15,6 @@ from oslo_db.sqlalchemy import models from oslo_log import log as logging import sqlalchemy as sa import sqlalchemy.dialects.mysql -from sqlalchemy.ext import declarative from sqlalchemy import orm from sqlalchemy import schema @@ -62,7 +61,7 @@ class _NovaAPIBase(models.ModelBase, models.TimestampMixin): pass -BASE = declarative.declarative_base(cls=_NovaAPIBase) +BASE = orm.declarative_base(cls=_NovaAPIBase) class AggregateHost(BASE): diff --git a/nova/db/main/models.py b/nova/db/main/models.py index ee82b2ea1161..0727b0cc3fd4 100644 --- a/nova/db/main/models.py +++ b/nova/db/main/models.py @@ -24,7 +24,6 @@ from oslo_db.sqlalchemy import models from oslo_utils import timeutils import sqlalchemy as sa import sqlalchemy.dialects.mysql -from sqlalchemy.ext import declarative from sqlalchemy import orm from sqlalchemy import schema @@ -101,7 +100,7 @@ REMOVED_TABLES = { # we don't configure 'cls' since we have models that don't use the # TimestampMixin -BASE = declarative.declarative_base() +BASE = orm.declarative_base() class NovaBase(models.TimestampMixin, models.ModelBase):