diff options
Diffstat (limited to 'nova/volume')
| -rw-r--r-- | nova/volume/api.py | 4 | ||||
| -rw-r--r-- | nova/volume/manager.py | 3 | ||||
| -rw-r--r-- | nova/volume/utils.py | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/nova/volume/api.py b/nova/volume/api.py index 29be25440..d8dbd4a6b 100644 --- a/nova/volume/api.py +++ b/nova/volume/api.py @@ -26,10 +26,10 @@ from nova.db import base from nova import exception from nova import flags from nova import log as logging +from nova.openstack.common import timeutils import nova.policy from nova import quota from nova import rpc -from nova import utils FLAGS = flags.FLAGS flags.DECLARE('storage_availability_zone', 'nova.volume.manager') @@ -136,7 +136,7 @@ class API(base.Base): msg = _("Volume still has %d dependent snapshots") % len(snapshots) raise exception.InvalidVolume(reason=msg) - now = utils.utcnow() + now = timeutils.utcnow() self.db.volume_update(context, volume_id, {'status': 'deleting', 'terminated_at': now}) host = volume['host'] diff --git a/nova/volume/manager.py b/nova/volume/manager.py index ef651bc38..972c4b5ec 100644 --- a/nova/volume/manager.py +++ b/nova/volume/manager.py @@ -46,6 +46,7 @@ from nova import manager from nova.openstack.common import cfg from nova.openstack.common import excutils from nova.openstack.common import importutils +from nova.openstack.common import timeutils from nova import quota from nova import utils from nova.volume import utils as volume_utils @@ -149,7 +150,7 @@ class VolumeManager(manager.SchedulerDependentManager): self.db.volume_update(context, volume_ref['id'], {'status': 'error'}) - now = utils.utcnow() + now = timeutils.utcnow() volume_ref = self.db.volume_update(context, volume_ref['id'], {'status': 'available', 'launched_at': now}) diff --git a/nova/volume/utils.py b/nova/volume/utils.py index ccdd15a4e..7efd7f23a 100644 --- a/nova/volume/utils.py +++ b/nova/volume/utils.py @@ -19,6 +19,7 @@ from nova import flags from nova import log as logging from nova.notifier import api as notifier_api +from nova.openstack.common import timeutils from nova import utils @@ -35,7 +36,7 @@ def notify_usage_exists(context, volume_ref, current_period=False): begin, end = utils.last_completed_audit_period() if current_period: audit_start = end - audit_end = utils.utcnow() + audit_end = timeutils.utcnow() else: audit_start = begin audit_end = end |