3 files changed, 85 insertions, 8 deletions
diff --git a/trove/common/notification.py b/trove/common/notification.py
index 73ec7990..49a3aad5 100644
--- a/trove/common/notification.py
+++ b/trove/common/notification.py
@@ -18,11 +18,11 @@ import copy
 import traceback
 
 from oslo_log import log as logging
-from oslo_utils import timeutils
 
 from trove.common import cfg
 from trove.common.exception import TroveError
 from trove.common.i18n import _
+from trove.common import timeutils
 from trove.conductor import api as conductor_api
 from trove import rpc
 
diff --git a/trove/common/timeutils.py b/trove/common/timeutils.py
new file mode 100644
index 00000000..44a0b9ff
--- /dev/null
+++ b/trove/common/timeutils.py
@@ -0,0 +1,84 @@
+# Copyright 2016 Tesora Inc.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from datetime import datetime
+from datetime import timedelta
+from datetime import tzinfo
+
+
+class zulutime(tzinfo):
+    """A tzinfo class for zulu time"""
+
+    def utcoffset(self, dt):
+        return timedelta(0)
+
+    def tzname(self, dt):
+        return "Z"
+
+    def dst(self, dt):
+        return timedelta(0)
+
+
+def utcnow_aware():
+    """An aware utcnow() that uses zulutime for the tzinfo."""
+    return datetime.now(zulutime())
+
+
+def utcnow():
+    """A wrapper around datetime.datetime.utcnow(). We're doing this
+       because it is mock'ed in some places.
+    """
+    return datetime.utcnow()
+
+
+def isotime(tm=None, subsecond=False):
+    """Stringify a time and return it in an ISO 8601 format. Subsecond
+       information is only provided if the subsecond parameter is set
+       to True (default: False).
+
+       If a time (tm) is provided, it will be stringified. If tm is
+       not provided, the current UTC time is used instead.
+
+       The timezone for UTC time will be provided as 'Z' and not
+       [+-]00:00. Time zone differential for non UTC times will be
+       provided as the full six character string format provided by
+       datetime.datetime.isoformat() namely [+-]NN:NN.
+
+       If an invalid time is provided such that tm.utcoffset() causes
+       a ValueError, that exception will be propagated.
+    """
+
+    _dt = tm if tm else utcnow_aware()
+
+    if not subsecond:
+        _dt = _dt.replace(microsecond=0)
+
+    # might cause an exception if _dt has a bad utcoffset.
+    delta = _dt.utcoffset() if _dt.utcoffset() else timedelta(0)
+
+    ts = None
+
+    if delta == timedelta(0):
+        # either we are provided a naive time (tm) or no tm, or an
+        # aware UTC time. In any event, we want to use 'Z' for the
+        # timezone rather than the full 6 character offset.
+        _dt = _dt.replace(tzinfo=None)
+        ts = _dt.isoformat()
+        ts += 'Z'
+    else:
+        # an aware non-UTC time was provided
+        ts = _dt.isoformat()
+
+    return ts
diff --git a/trove/common/utils.py b/trove/common/utils.py
index 9a81be45..774cfc66 100644
--- a/trove/common/utils.py
+++ b/trove/common/utils.py
@@ -15,7 +15,6 @@
 """I totally stole most of this from melange, thx guys!!!"""
 
 import collections
-import datetime
 import inspect
 import os
 import shutil
@@ -29,7 +28,6 @@ from oslo_log import log as logging
 from oslo_service import loopingcall
 from oslo_utils import importutils
 from oslo_utils import strutils
-from oslo_utils import timeutils
 from passlib import pwd
 import six
 import six.moves.urllib.parse as urlparse
@@ -46,7 +44,6 @@ import_object = importutils.import_object
 import_module = importutils.import_module
 bool_from_string = strutils.bool_from_string
 execute = processutils.execute
-isotime = timeutils.isotime
 
 
 def build_jinja_environment():
@@ -99,10 +96,6 @@ def generate_uuid():
     return str(uuid.uuid4())
 
 
-def utcnow():
-    return datetime.datetime.utcnow()
-
-
 def raise_if_process_errored(process, exception):
     try:
         err = process.stderr.read()