Merge "Switch from deprecated timeutils.isotime"

2 files changed, 10 insertions, 9 deletions

diff --git a/ironic/objects/utils.py b/ironic/objects/utils.py
index 1edc07d89..f732d731f 100644
--- a/ironic/objects/utils.py
+++ b/ironic/objects/utils.py
@@ -13,6 +13,7 @@
 #    under the License.
 
 """Utility methods for objects"""
+from datetime import datetime
 
 from oslo_utils import timeutils
 
@@ -21,7 +22,7 @@ def dt_serializer(name):
     """Return a datetime serializer for a named attribute."""
     def serializer(self, name=name):
         if getattr(self, name) is not None:
-            return timeutils.isotime(getattr(self, name))
+            return datetime.isoformat(getattr(self, name))
         else:
             return None
     return serializer
diff --git a/ironic/tests/objects/test_objects.py b/ironic/tests/objects/test_objects.py
index 58fa4206e..3f29fb392 100644
--- a/ironic/tests/objects/test_objects.py
+++ b/ironic/tests/objects/test_objects.py
@@ -15,6 +15,7 @@
 import contextlib
 import datetime
 import gettext
+import iso8601
 
 from oslo_context import context
 from oslo_utils import timeutils
@@ -128,17 +129,16 @@ class TestUtils(test_base.TestCase):
             foo = utils.dt_serializer('bar')
 
         obj = Obj()
-        obj.bar = timeutils.parse_isotime('1955-11-05T00:00:00Z')
-        self.assertEqual('1955-11-05T00:00:00Z', obj.foo())
+        obj.bar = timeutils.parse_isotime('1955-11-05T00:00:00+00:00')
+        self.assertEqual('1955-11-05T00:00:00+00:00', obj.foo())
         obj.bar = None
         self.assertIsNone(obj.foo())
         obj.bar = 'foo'
-        self.assertRaises(AttributeError, obj.foo)
+        self.assertRaises(TypeError, obj.foo)
 
     def test_dt_deserializer(self):
         dt = timeutils.parse_isotime('1955-11-05T00:00:00Z')
-        self.assertEqual(utils.dt_deserializer(None, timeutils.isotime(dt)),
-                         dt)
+        self.assertEqual(utils.dt_deserializer(None, dt.isoformat()), dt)
         self.assertIsNone(utils.dt_deserializer(None, None))
         self.assertRaises(ValueError, utils.dt_deserializer, None, 'foo')
 
@@ -358,7 +358,7 @@ class _TestObject(object):
         self.assertRemotes()
 
     def test_base_attributes(self):
-        dt = datetime.datetime(1955, 11, 5)
+        dt = datetime.datetime(1955, 11, 5, 0, 0, tzinfo=iso8601.iso8601.Utc())
         obj = MyObj(self.context)
         obj.created_at = dt
         obj.updated_at = dt
@@ -368,8 +368,8 @@ class _TestObject(object):
                     'ironic_object.changes':
                         ['created_at', 'updated_at'],
                     'ironic_object.data':
-                        {'created_at': timeutils.isotime(dt),
-                         'updated_at': timeutils.isotime(dt),
+                        {'created_at': dt.isoformat(),
+                         'updated_at': dt.isoformat(),
                          }
                     }
         actual = obj.obj_to_primitive()