diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-09 06:06:29 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-09 06:06:29 -0700 |
| commit | b8aaebee171876ffd0e115ea3a19d4524ca16d99 (patch) | |
| tree | dbcf52eeabed107a6855bdc98dac795195e8ac4b | |
| parent | e6369486f43423e9649a7b4d046d3c92bf1c85e9 (diff) | |
| download | nova-b8aaebee171876ffd0e115ea3a19d4524ca16d99.tar.gz nova-b8aaebee171876ffd0e115ea3a19d4524ca16d99.tar.xz nova-b8aaebee171876ffd0e115ea3a19d4524ca16d99.zip | |
switch to using utcnow
| -rw-r--r-- | nova/compute/manager.py | 4 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 4 | ||||
| -rw-r--r-- | nova/tests/compute_unittest.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 4b29add2d..ae7099812 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -84,7 +84,7 @@ class ComputeManager(manager.Manager): try: yield self.driver.spawn(instance_ref) - now = datetime.datetime.now() + now = datetime.datetime.utcnow() self.db.instance_update(None, instance_id, {'launched_at': now}) except Exception: # pylint: disable-msg=W0702 logging.exception("instance %s: Failed to spawn", @@ -112,7 +112,7 @@ class ComputeManager(manager.Manager): power_state.NOSTATE, 'shutting_down') yield self.driver.destroy(instance_ref) - now = datetime.datetime.now() + now = datetime.datetime.utcnow() self.db.instance_update(None, instance_id, {'terminated_at': now}) # TODO(ja): should we keep it in a terminated state for a bit? diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index d460fbb4b..4977fc0f1 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -46,8 +46,8 @@ class NovaBase(object): __table_args__ = {'mysql_engine': 'InnoDB'} __table_initialized__ = False __prefix__ = 'none' - created_at = Column(DateTime, default=func.now()) - updated_at = Column(DateTime, onupdate=datetime.datetime.now) + created_at = Column(DateTime, default=datetime.datetime.utcnow) + updated_at = Column(DateTime, onupdate=datetime.datetime.utcnow) deleted_at = Column(DateTime) deleted = Column(Boolean, default=False) diff --git a/nova/tests/compute_unittest.py b/nova/tests/compute_unittest.py index e5da6b054..8a7f7b649 100644 --- a/nova/tests/compute_unittest.py +++ b/nova/tests/compute_unittest.py @@ -88,12 +88,12 @@ class ComputeTestCase(test.TrialTestCase): instance_ref = db.instance_get(self.context, instance_id) self.assertEqual(instance_ref['launched_at'], None) self.assertEqual(instance_ref['terminated_at'], None) - launch = datetime.datetime.now() + launch = datetime.datetime.utcnow() yield self.compute.run_instance(self.context, instance_id) instance_ref = db.instance_get(self.context, instance_id) self.assert_(instance_ref['launched_at'] > launch) self.assertEqual(instance_ref['terminated_at'], None) - terminate = datetime.datetime.now() + terminate = datetime.datetime.utcnow() yield self.compute.terminate_instance(self.context, instance_id) instance_ref = db.instance_get({'deleted': True}, instance_id) self.assert_(instance_ref['launched_at'] < terminate) |