openstack/nova
Code Issues Proposed changes

Merge "sqlalchemy: Use built-in declarative"

Browse Source
This commit is contained in:
Zuul
2025-08-11 13:28:01 +00:00
committed by Gerrit Code Review
parent 507b45e893 4adde2c0ae
commit e1cb0ba0a6
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/db/api/models.py
View File

@@ -15,7 +15,6 @@ from oslo_db.sqlalchemy import models
from oslo_log import log as logging from oslo_log import log as logging
import sqlalchemy as sa import sqlalchemy as sa
import sqlalchemy.dialects.mysql import sqlalchemy.dialects.mysql
from sqlalchemy.ext import declarative
from sqlalchemy import orm from sqlalchemy import orm
from sqlalchemy import schema from sqlalchemy import schema
@@ -62,7 +61,7 @@ class _NovaAPIBase(models.ModelBase, models.TimestampMixin):
pass pass
BASE = declarative.declarative_base(cls=_NovaAPIBase) BASE = orm.declarative_base(cls=_NovaAPIBase)
class AggregateHost(BASE): class AggregateHost(BASE):

3
nova/db/main/models.py
View File

@@ -24,7 +24,6 @@ from oslo_db.sqlalchemy import models
from oslo_utils import timeutils from oslo_utils import timeutils
import sqlalchemy as sa import sqlalchemy as sa
import sqlalchemy.dialects.mysql import sqlalchemy.dialects.mysql
from sqlalchemy.ext import declarative
from sqlalchemy import orm from sqlalchemy import orm
from sqlalchemy import schema from sqlalchemy import schema
@@ -101,7 +100,7 @@ REMOVED_TABLES = {
# we don't configure 'cls' since we have models that don't use the # we don't configure 'cls' since we have models that don't use the
# TimestampMixin # TimestampMixin
BASE = declarative.declarative_base() BASE = orm.declarative_base()
class NovaBase(models.TimestampMixin, models.ModelBase): class NovaBase(models.TimestampMixin, models.ModelBase):