From 109ff949511c0185ab1dd0beffeb03a8a3332005 Mon Sep 17 00:00:00 2001
From: Amrith Kumar <amrith@tesora.com>
Date: Tue, 7 Jun 2016 08:15:24 -0400
Subject: Handle isotime deprecation in oslo_utils.timeutils

oslo_utils.timeutils is deprecating isotime(). In reality they are
deprecating some other things as well but Trove doesn't (currently)
use any of those things.

Much has been written on the subject of this deprecation. I think the
proposal to merely replace isotime with datetime.datetime.isoformat()
is a little simplistic. Well intentioned, but nonetheless I believe
that it is simplistic.

The primary issue I could find with oslo_utils.timeutils.isotime() was
the fact that it was naive. I think it could well have been fixed in
oslo_utils but for whatever reason(s) oslo decided not to want to go
that route.

The primary challenge from Trove's perspective is that I want to
respect the existing API contract while at the same time get an
implementation of time handling that is not identical in its flaws
with oslo_utils.timeutils.isotime().

This change set attempts to address that by making
trove.common.timeutils.isotime() that is aware. It also implements a
utcnow_aware() function that is aware.

ISO 8601 allows for four representations of timezone and those are

<time>Z
<time>[+-]hh:mm
<time>[+-]hhmm
<time>[+-]hh

Trove conventionally used the first one, even if the time wasn't
really a UTC time. That's one of the things being fixed here.

In review cp16net asked whether this change removes the 'Z' at the end
of time strings generated by the isotime() function. The answer is
NO. The new isotime() function performs identical to the old and now
deprecated function in oslo_utils.timeutils for UTC (Z) times.

There was a utcnow() function in trove.common.utils which just wrapped
datetime.datetime.utcnow(). That has been moved now to
trove.common.timeutils with the other new time related functions.

There were a couple of places in Trove where code was using
datetime.now() which was not ideal. Those have been corrected now as
well.

Unit tests have been proposed for the new routines.

Closes-Bug: #1532120
Change-Id: Ic5abf6669edd4f1a9fd62e61f437565aa887aebe
---
 trove/tests/unittests/taskmanager/test_models.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'trove/tests/unittests/taskmanager/test_models.py')

diff --git a/trove/tests/unittests/taskmanager/test_models.py b/trove/tests/unittests/taskmanager/test_models.py
index 7fbba5dd..53bed50d 100644
--- a/trove/tests/unittests/taskmanager/test_models.py
+++ b/trove/tests/unittests/taskmanager/test_models.py
@@ -11,7 +11,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import datetime
 import os
 from tempfile import NamedTemporaryFile
 import uuid
@@ -23,7 +22,6 @@ from mock import Mock, MagicMock, patch, PropertyMock, call
 from novaclient import exceptions as nova_exceptions
 import novaclient.v2.flavors
 import novaclient.v2.servers
-from oslo_utils import timeutils
 from swiftclient.client import ClientException
 from testtools.matchers import Equals, Is
 
@@ -39,6 +37,7 @@ from trove.common.instance import ServiceStatuses
 from trove.common.notification import TroveInstanceModifyVolume
 from trove.common import remote
 import trove.common.template as template
+from trove.common import timeutils
 from trove.common import utils
 from trove.datastore import models as datastore_models
 import trove.db.models
@@ -651,8 +650,8 @@ class BuiltInstanceTasksTest(trove_testtools.TestCase):
                                  datastore_id='id-1',
                                  flavor_id='6',
                                  manager='mysql',
-                                 created=datetime.datetime.utcnow(),
-                                 updated=datetime.datetime.utcnow(),
+                                 created=timeutils.utcnow(),
+                                 updated=timeutils.utcnow(),
                                  compute_instance_id='computeinst-id-1',
                                  tenant_id='testresize-tenant-id',
                                  volume_size='1',
-- 
cgit v1.2.1