openstack/cinder
Code Issues Proposed changes

Convert Cinder to use openstack-common timeutils

Browse Source 
This patch is part of effort to get Cinder to use openstack-common
package.  This part is to replace time related functions in utils.py
with 'timeutils' module.

Implement blueprint cinder-common-timeutils

Change-Id: Ic5e9e317a95a7399f0604823eec76b3642a0c1b1
This commit is contained in:
Zhiteng Huang
2012-07-13 13:58:25 +08:00
parent 008cad1428
commit 519bd2451d
14 changed files with 45 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cinder/db/sqlalchemy/models.py
View File

@@ -32,6 +32,7 @@ from cinder.db.sqlalchemy.session import get_session
from cinder import exception
from cinder import flags
from cinder import utils
from cinder.openstack.common import timeutils
FLAGS = flags.FLAGS
@@ -42,8 +43,8 @@ class CinderBase(object):
"""Base class for Cinder Models."""
__table_args__ = {'mysql_engine': 'InnoDB'}
__table_initialized__ = False
created_at = Column(DateTime, default=utils.utcnow)
updated_at = Column(DateTime, onupdate=utils.utcnow)
created_at = Column(DateTime, default=timeutils.utcnow)
updated_at = Column(DateTime, onupdate=timeutils.utcnow)
deleted_at = Column(DateTime)
deleted = Column(Boolean, default=False)
metadata = None
@@ -64,7 +65,7 @@ class CinderBase(object):
def delete(self, session=None):
"""Delete this object."""
self.deleted = True
self.deleted_at = utils.utcnow()
self.deleted_at = timeutils.utcnow()
self.save(session=session)
def __setitem__(self, key, value):