diff --git a/ironic/db/sqlalchemy/models.py b/ironic/db/sqlalchemy/models.py index 03382dcd9e..50cf9c885f 100644 --- a/ironic/db/sqlalchemy/models.py +++ b/ironic/db/sqlalchemy/models.py @@ -23,7 +23,6 @@ import json from oslo.config import cfg from oslo.db import options as db_options from oslo.db.sqlalchemy import models -from oslo.utils import timeutils import six.moves.urllib.parse as urlparse from sqlalchemy import Boolean, Column, DateTime from sqlalchemy import ForeignKey, Integer @@ -89,14 +88,8 @@ class JSONEncodedList(JsonEncodedType): type = list -class IronicBase(models.ModelBase): - # FIXME(akruilin): remove `created_at` and `updated_at` attributes and use - # TimestampMixin from oslo.db.sqlalchemy.models instead, when - # ironic and oslo.db will use timeutils from one place (oslo.utils). - # Related patch in oslo.db : https://review.openstack.org/#/c/111701/ - # Related bug: https://bugs.launchpad.net/ironic/+bug/1354443 - created_at = Column(DateTime, default=lambda: timeutils.utcnow()) - updated_at = Column(DateTime, onupdate=lambda: timeutils.utcnow()) +class IronicBase(models.TimestampMixin, + models.ModelBase): metadata = None