Merge "Replace deprecated datetime.datetime.utcnow"

Author: Zuul

cloudkitty/tests/test_state.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-import datetime
+from oslo_utils import timeutils
 
 from cloudkitty import state
 from cloudkitty import tests
@@ -29,14 +29,14 @@ def test_gen_name(self):
         self.assertEqual(name, 'testuser_osrtf')
 
     def test_state_access(self):
-        now = datetime.datetime.utcnow()
+        now = timeutils.utcnow()
         self.sm.set_state(now)
         result = self.sm.get_state()
         self.assertEqual(result, str(now))
 
     def test_metadata_access(self):
         metadata = {'foo': 'bar'}
-        now = datetime.datetime.utcnow()
+        now = timeutils.utcnow()
         self.sm.set_state(now)
         self.sm.set_metadata(metadata)
         result = self.sm.get_metadata()

contrib/ci/csv_writer.py

@@ -22,6 +22,8 @@
 import sys
 import uuid
 
+from oslo_utils import timeutils
+
 from cloudkitty import json_utils as json
 
 
@@ -588,7 +590,7 @@ def main():
     generators = [compute, image, volume, net_bw, floating]
 
     # Date
-    now = datetime.datetime.utcnow()
+    now = timeutils.utcnow()
     hour_delta = datetime.timedelta(hours=1)
     cur_date = now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
     cur_month = cur_date.month