Use utils.utcnow rather than datetime.utcnow

Fixes bug #1003587

Edit direct use of datetime.utcnow or datetime.now to utilize utils.utcnow

Change-Id: I1130f6e664f252fc5da7304f495dc9f980721224

8 files changed, 25 insertions, 26 deletions

diff --git a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
index e2a249a2f..f6e1fbcb6 100644
--- a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
+++ b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
@@ -13,8 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import datetime
-
 from lxml import etree
 
 from nova.api.openstack import common
@@ -156,7 +154,7 @@ class CloudpipesXMLSerializerTest(test.TestCase):
                         public_ip='1.2.3.4',
                         public_port='321',
                         instance_id='1234-1234-1234-1234',
-                        created_at=utils.isotime(datetime.datetime.utcnow()),
+                        created_at=utils.isotime(utils.utcnow()),
                         state='running')),
                 dict(cloudpipe=dict(
                         project_id='4321',
diff --git a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py b/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py
index 09b59a137..0c2ef0a26 100644
--- a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py
+++ b/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py
@@ -29,6 +29,7 @@ from nova import flags
 from nova import policy
 from nova import test
 from nova.tests.api.openstack import fakes
+from nova import utils
 
 
 FLAGS = flags.FLAGS
@@ -40,7 +41,7 @@ ROOT_GB = 10
 EPHEMERAL_GB = 20
 MEMORY_MB = 1024
 VCPUS = 2
-STOP = datetime.datetime.utcnow()
+STOP = utils.utcnow()
 START = STOP - datetime.timedelta(hours=HOURS)
 
 
@@ -211,7 +212,7 @@ class SimpleTenantUsageSerializerTest(test.TestCase):
 
     def test_serializer_show(self):
         serializer = simple_tenant_usage.SimpleTenantUsageTemplate()
-        today = datetime.datetime.now()
+        today = utils.utcnow()
         yesterday = today - datetime.timedelta(days=1)
         raw_usage = dict(
             tenant_id='tenant',
@@ -257,7 +258,7 @@ class SimpleTenantUsageSerializerTest(test.TestCase):
 
     def test_serializer_index(self):
         serializer = simple_tenant_usage.SimpleTenantUsagesTemplate()
-        today = datetime.datetime.now()
+        today = utils.utcnow()
         yesterday = today - datetime.timedelta(days=1)
         raw_usages = [dict(
                 tenant_id='tenant1',
diff --git a/nova/tests/api/openstack/compute/contrib/test_snapshots.py b/nova/tests/api/openstack/compute/contrib/test_snapshots.py
index a62ea84c1..f0a735ccd 100644
--- a/nova/tests/api/openstack/compute/contrib/test_snapshots.py
+++ b/nova/tests/api/openstack/compute/contrib/test_snapshots.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import datetime
 import json
 
 from lxml import etree
@@ -26,6 +25,7 @@ from nova import flags
 from nova import log as logging
 from nova import test
 from nova.tests.api.openstack import fakes
+from nova import utils
 from nova import volume
 
 FLAGS = flags.FLAGS
@@ -250,7 +250,7 @@ class SnapshotSerializerTest(test.TestCase):
             id='snap_id',
             status='snap_status',
             size=1024,
-            createdAt=datetime.datetime.now(),
+            createdAt=utils.utcnow(),
             displayName='snap_name',
             displayDescription='snap_desc',
             volumeId='vol_id',
@@ -268,7 +268,7 @@ class SnapshotSerializerTest(test.TestCase):
                 id='snap1_id',
                 status='snap1_status',
                 size=1024,
-                createdAt=datetime.datetime.now(),
+                createdAt=utils.utcnow(),
                 displayName='snap1_name',
                 displayDescription='snap1_desc',
                 volumeId='vol1_id',
@@ -277,7 +277,7 @@ class SnapshotSerializerTest(test.TestCase):
                 id='snap2_id',
                 status='snap2_status',
                 size=1024,
-                createdAt=datetime.datetime.now(),
+                createdAt=utils.utcnow(),
                 displayName='snap2_name',
                 displayDescription='snap2_desc',
                 volumeId='vol2_id',
diff --git a/nova/tests/api/openstack/compute/contrib/test_volumes.py b/nova/tests/api/openstack/compute/contrib/test_volumes.py
index 92382edc7..aee7260ef 100644
--- a/nova/tests/api/openstack/compute/contrib/test_volumes.py
+++ b/nova/tests/api/openstack/compute/contrib/test_volumes.py
@@ -27,6 +27,7 @@ import nova.db
 from nova import flags
 from nova import test
 from nova.tests.api.openstack import fakes
+from nova import utils
 from nova import volume
 from webob import exc
 
@@ -363,7 +364,7 @@ class VolumeSerializerTest(test.TestCase):
             status='vol_status',
             size=1024,
             availabilityZone='vol_availability',
-            createdAt=datetime.datetime.now(),
+            createdAt=utils.utcnow(),
             attachments=[dict(
                     id='vol_id',
                     volumeId='vol_id',
@@ -392,7 +393,7 @@ class VolumeSerializerTest(test.TestCase):
                 status='vol1_status',
                 size=1024,
                 availabilityZone='vol1_availability',
-                createdAt=datetime.datetime.now(),
+                createdAt=utils.utcnow(),
                 attachments=[dict(
                         id='vol1_id',
                         volumeId='vol1_id',
@@ -412,7 +413,7 @@ class VolumeSerializerTest(test.TestCase):
                 status='vol2_status',
                 size=1024,
                 availabilityZone='vol2_availability',
-                createdAt=datetime.datetime.now(),
+                createdAt=utils.utcnow(),
                 attachments=[dict(
                         id='vol2_id',
                         volumeId='vol2_id',
diff --git a/nova/tests/api/openstack/volume/test_snapshots.py b/nova/tests/api/openstack/volume/test_snapshots.py
index ac5e97cfa..ada6c42a1 100644
--- a/nova/tests/api/openstack/volume/test_snapshots.py
+++ b/nova/tests/api/openstack/volume/test_snapshots.py
@@ -13,8 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import datetime
-
 from lxml import etree
 import webob
 
@@ -24,6 +22,7 @@ from nova import flags
 from nova import log as logging
 from nova import test
 from nova.tests.api.openstack import fakes
+from nova import utils
 from nova import volume
 
 FLAGS = flags.FLAGS
@@ -171,7 +170,7 @@ class SnapshotSerializerTest(test.TestCase):
             id='snap_id',
             status='snap_status',
             size=1024,
-            created_at=datetime.datetime.now(),
+            created_at=utils.utcnow(),
             display_name='snap_name',
             display_description='snap_desc',
             volume_id='vol_id',
@@ -189,7 +188,7 @@ class SnapshotSerializerTest(test.TestCase):
                 id='snap1_id',
                 status='snap1_status',
                 size=1024,
-                created_at=datetime.datetime.now(),
+                created_at=utils.utcnow(),
                 display_name='snap1_name',
                 display_description='snap1_desc',
                 volume_id='vol1_id',
@@ -198,7 +197,7 @@ class SnapshotSerializerTest(test.TestCase):
                 id='snap2_id',
                 status='snap2_status',
                 size=1024,
-                created_at=datetime.datetime.now(),
+                created_at=utils.utcnow(),
                 display_name='snap2_name',
                 display_description='snap2_desc',
                 volume_id='vol2_id',
diff --git a/nova/tests/api/openstack/volume/test_volumes.py b/nova/tests/api/openstack/volume/test_volumes.py
index 2b96d15a3..8798d5274 100644
--- a/nova/tests/api/openstack/volume/test_volumes.py
+++ b/nova/tests/api/openstack/volume/test_volumes.py
@@ -22,6 +22,7 @@ from nova.api.openstack.volume import volumes
 from nova import flags
 from nova import test
 from nova.tests.api.openstack import fakes
+from nova import utils
 from nova.volume import api as volume_api
 
 
@@ -214,7 +215,7 @@ class VolumeSerializerTest(test.TestCase):
             status='vol_status',
             size=1024,
             availability_zone='vol_availability',
-            created_at=datetime.datetime.now(),
+            created_at=utils.utcnow(),
             attachments=[dict(
                     id='vol_id',
                     volume_id='vol_id',
@@ -243,7 +244,7 @@ class VolumeSerializerTest(test.TestCase):
                 status='vol1_status',
                 size=1024,
                 availability_zone='vol1_availability',
-                created_at=datetime.datetime.now(),
+                created_at=utils.utcnow(),
                 attachments=[dict(
                         id='vol1_id',
                         volume_id='vol1_id',
@@ -263,7 +264,7 @@ class VolumeSerializerTest(test.TestCase):
                 status='vol2_status',
                 size=1024,
                 availability_zone='vol2_availability',
-                created_at=datetime.datetime.now(),
+                created_at=utils.utcnow(),
                 attachments=[dict(
                         id='vol2_id',
                         volume_id='vol2_id',
diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py
index b16ffd335..8ce2ab6ee 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -96,7 +96,7 @@ class DbApiTestCase(test.TestCase):
         db.migration_update(ctxt, migration.id, {"status": "CONFIRMED"})
 
         # Ensure the new migration is not returned.
-        updated_at = datetime.datetime.utcnow()
+        updated_at = utils.utcnow()
         values = {"status": "finished", "updated_at": updated_at}
         migration = db.migration_create(ctxt, values)
         results = db.migration_get_all_unconfirmed(ctxt, 10)
@@ -120,7 +120,7 @@ class DbApiTestCase(test.TestCase):
         db.instance_update(ctxt, instance.id, {"task_state": None})
 
         # Ensure the newly rebooted instance is not returned.
-        updated_at = datetime.datetime.utcnow()
+        updated_at = utils.utcnow()
         values = {"task_state": "rebooting", "updated_at": updated_at}
         instance = db.instance_create(ctxt, values)
         results = db.instance_get_all_hung_in_rebooting(ctxt, 10)
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 3056661b4..ef0b04445 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -18,7 +18,6 @@
 
 import ast
 import contextlib
-import datetime
 import functools
 import os
 import re
@@ -43,6 +42,7 @@ from nova.tests import fake_network
 from nova.tests import fake_utils
 from nova.tests.glance import stubs as glance_stubs
 from nova.tests.xenapi import stubs
+from nova import utils
 from nova.virt.xenapi import connection as xenapi_conn
 from nova.virt.xenapi import fake as xenapi_fake
 from nova.virt.xenapi import vm_utils
@@ -1398,8 +1398,7 @@ class XenAPIBWUsageTestCase(test.TestCase):
                 self.name = "instance-0001"
                 self.uuid = "1-2-3-4-5"
 
-        result = self.conn.get_all_bw_usage([testinstance()],
-                datetime.datetime.utcnow())
+        result = self.conn.get_all_bw_usage([testinstance()], utils.utcnow())
         self.assertEqual(result, [])