Use openstack.common.timeutils.isotime()

Remove heat_utils.strftime() and replace callers with
openstack.common.timeutils.isotime().  They do similar activites, and
since its carried in common, makes more sense to use that version.

Change-Id: Icd919fb218a5f97be103eda7814a5fb56e1b0a02
Signed-off-by: Steven Dake <sdake@redhat.com>

diff --git a/heat/common/utils.py b/heat/common/utils.py
index 666d3ae4132df588e708f1c7bf3eae023eac30a2..d4e94ad97db61b9c39af94c0bc48ae122bd8bc5d 100644 (file)
--- a/heat/common/utils.py
+++ b/heat/common/utils.py
@@ -30,9 +30,6 @@ from eventlet import semaphore
 from eventlet.green import subprocess
 
 from heat.openstack.common import exception
-from heat.openstack.common import timeutils
-
-PERFECT_TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
 
 
 def chunkreadable(iter, chunk_size=65536):
@@ -69,18 +66,6 @@ def gen_uuid():
     return uuid.uuid4()
 
 
-def strtime(at=None, fmt=PERFECT_TIME_FORMAT):
-    """Returns formatted utcnow."""
-    if not at:
-        at = timeutils.utcnow()
-    return at.strftime(fmt)
-
-
-def parse_strtime(timestr, fmt=PERFECT_TIME_FORMAT):
-    """Turn a formatted time back into a datetime."""
-    return datetime.datetime.strptime(timestr, fmt)
-
-
 class LoopingCallDone(Exception):
     """Exception to break out and stop a LoopingCall.
 

diff --git a/heat/engine/api.py b/heat/engine/api.py
index 5c25e72c2110499fb2f15fdcc7b075dfd18c5f24..271e908c34ddee67f58ac71d7ec9514852c8c18b 100644 (file)
--- a/heat/engine/api.py
+++ b/heat/engine/api.py
@@ -13,7 +13,7 @@
 #    under the License.
 
 import re
-from heat.common import utils as heat_utils
+from heat.openstack.common import timeutils
 from heat.engine import parser
 from heat.engine import watchrule
 
@@ -90,8 +90,8 @@ def format_stack(stack):
     info = {
         STACK_NAME: stack.name,
         STACK_ID: dict(stack.identifier()),
-        STACK_CREATION_TIME: heat_utils.strtime(stack.created_time),
-        STACK_UPDATED_TIME: heat_utils.strtime(stack.updated_time),
+        STACK_CREATION_TIME: timeutils.isotime(stack.created_time),
+        STACK_UPDATED_TIME: timeutils.isotime(stack.updated_time),
         STACK_NOTIFICATION_TOPICS: [],  # TODO Not implemented yet
         STACK_PARAMETERS: stack.t[parser.PARAMETERS],
         STACK_DESCRIPTION: stack.t[parser.DESCRIPTION],
@@ -131,7 +131,7 @@ def format_stack_resource(resource):
     last_updated_time = resource.updated_time or resource.created_time
     res = {
         RES_DESCRIPTION: resource.parsed_template().get('Description', ''),
-        RES_UPDATED_TIME: heat_utils.strtime(last_updated_time),
+        RES_UPDATED_TIME: timeutils.isotime(last_updated_time),
         RES_NAME: resource.name,
         RES_PHYSICAL_ID: resource.instance_id or '',
         RES_METADATA: resource.metadata,
@@ -168,7 +168,7 @@ def format_event(context, event):
         EVENT_ID: event.id,
         EVENT_STACK_ID: dict(stack.identifier()),
         EVENT_STACK_NAME: stack.name,
-        EVENT_TIMESTAMP: heat_utils.strtime(event.created_at),
+        EVENT_TIMESTAMP: timeutils.isotime(event.created_at),
         EVENT_RES_NAME: event.logical_resource_id,
         EVENT_RES_PHYSICAL_ID: event.physical_resource_id,
         EVENT_RES_STATUS: event.name,
@@ -236,7 +236,7 @@ def format_watch(watch):
         WATCH_ACTIONS_ENABLED: watch.rule.get(RULE_ACTIONS_ENABLED),
         WATCH_ALARM_ACTIONS: watch.rule.get(RULE_ALARM_ACTIONS),
         WATCH_TOPIC: watch.rule.get(RULE_TOPIC),
-        WATCH_UPDATED_TIME: heat_utils.strtime(watch.updated_at),
+        WATCH_UPDATED_TIME: timeutils.isotime(watch.updated_at),
         WATCH_DESCRIPTION: watch.rule.get(RULE_DESCRIPTION),
         WATCH_NAME: watch.name,
         WATCH_COMPARISON: watch.rule.get(RULE_COMPARISON),
@@ -249,7 +249,7 @@ def format_watch(watch):
         WATCH_PERIOD: watch.rule.get(RULE_PERIOD),
         WATCH_STATE_REASON: watch.rule.get(RULE_STATE_REASON),
         WATCH_STATE_REASON_DATA: watch.rule.get(RULE_STATE_REASON_DATA),
-        WATCH_STATE_UPDATED_TIME: heat_utils.strtime(
+        WATCH_STATE_UPDATED_TIME: timeutils.isotime(
                                   watch.rule.get(RULE_STATE_UPDATED_TIME)),
         WATCH_STATE_VALUE: watch.state,
         WATCH_STATISTIC: watch.rule.get(RULE_STATISTIC),
@@ -285,7 +285,7 @@ def format_watch_data(wd):
     result = {
         WATCH_DATA_ALARM: wd.watch_rule.name,
         WATCH_DATA_METRIC: metric_name,
-        WATCH_DATA_TIME: heat_utils.strtime(wd.created_at),
+        WATCH_DATA_TIME: timeutils.isotime(wd.created_at),
         WATCH_DATA_NAMESPACE: namespace,
         WATCH_DATA: metric_data
     }