openstack/heat
Code Issues Proposed changes

Use openstack.common.timeutils.isotime()

Browse Source 
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>
This commit is contained in:
Steven Dake 2012-09-16 17:00:56 -07:00
parent 77700c10bf
commit 1a98136a64
2 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
heat/common/utils.py
View File

@ -30,9 +30,6 @@ from eventlet import semaphore
from eventlet.green import subprocess from eventlet.green import subprocess
from heat.openstack.common import exception 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): def chunkreadable(iter, chunk_size=65536):
@ -69,18 +66,6 @@ def gen_uuid():
return uuid.uuid4() 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): class LoopingCallDone(Exception):
"""Exception to break out and stop a LoopingCall. """Exception to break out and stop a LoopingCall.

16
heat/engine/api.py
View File

@ -13,7 +13,7 @@
# under the License. # under the License.
import re 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 parser
from heat.engine import watchrule from heat.engine import watchrule
@ -90,8 +90,8 @@ def format_stack(stack):
info = { info = {
STACK_NAME: stack.name, STACK_NAME: stack.name,
STACK_ID: dict(stack.identifier()), STACK_ID: dict(stack.identifier()),
STACK_CREATION_TIME: heat_utils.strtime(stack.created_time), STACK_CREATION_TIME: timeutils.isotime(stack.created_time),
STACK_UPDATED_TIME: heat_utils.strtime(stack.updated_time), STACK_UPDATED_TIME: timeutils.isotime(stack.updated_time),
STACK_NOTIFICATION_TOPICS: [], # TODO Not implemented yet STACK_NOTIFICATION_TOPICS: [], # TODO Not implemented yet
STACK_PARAMETERS: stack.t[parser.PARAMETERS], STACK_PARAMETERS: stack.t[parser.PARAMETERS],
STACK_DESCRIPTION: stack.t[parser.DESCRIPTION], 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 last_updated_time = resource.updated_time or resource.created_time
res = { res = {
RES_DESCRIPTION: resource.parsed_template().get('Description', ''), 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_NAME: resource.name,
RES_PHYSICAL_ID: resource.instance_id or '', RES_PHYSICAL_ID: resource.instance_id or '',
RES_METADATA: resource.metadata, RES_METADATA: resource.metadata,
@ -168,7 +168,7 @@ def format_event(context, event):
EVENT_ID: event.id, EVENT_ID: event.id,
EVENT_STACK_ID: dict(stack.identifier()), EVENT_STACK_ID: dict(stack.identifier()),
EVENT_STACK_NAME: stack.name, 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_NAME: event.logical_resource_id,
EVENT_RES_PHYSICAL_ID: event.physical_resource_id, EVENT_RES_PHYSICAL_ID: event.physical_resource_id,
EVENT_RES_STATUS: event.name, EVENT_RES_STATUS: event.name,
@ -236,7 +236,7 @@ def format_watch(watch):
WATCH_ACTIONS_ENABLED: watch.rule.get(RULE_ACTIONS_ENABLED), WATCH_ACTIONS_ENABLED: watch.rule.get(RULE_ACTIONS_ENABLED),
WATCH_ALARM_ACTIONS: watch.rule.get(RULE_ALARM_ACTIONS), WATCH_ALARM_ACTIONS: watch.rule.get(RULE_ALARM_ACTIONS),
WATCH_TOPIC: watch.rule.get(RULE_TOPIC), 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_DESCRIPTION: watch.rule.get(RULE_DESCRIPTION),
WATCH_NAME: watch.name, WATCH_NAME: watch.name,
WATCH_COMPARISON: watch.rule.get(RULE_COMPARISON), WATCH_COMPARISON: watch.rule.get(RULE_COMPARISON),
@ -249,7 +249,7 @@ def format_watch(watch):
WATCH_PERIOD: watch.rule.get(RULE_PERIOD), WATCH_PERIOD: watch.rule.get(RULE_PERIOD),
WATCH_STATE_REASON: watch.rule.get(RULE_STATE_REASON), WATCH_STATE_REASON: watch.rule.get(RULE_STATE_REASON),
WATCH_STATE_REASON_DATA: watch.rule.get(RULE_STATE_REASON_DATA), 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.rule.get(RULE_STATE_UPDATED_TIME)),
WATCH_STATE_VALUE: watch.state, WATCH_STATE_VALUE: watch.state,
WATCH_STATISTIC: watch.rule.get(RULE_STATISTIC), WATCH_STATISTIC: watch.rule.get(RULE_STATISTIC),
@ -285,7 +285,7 @@ def format_watch_data(wd):
result = { result = {
WATCH_DATA_ALARM: wd.watch_rule.name, WATCH_DATA_ALARM: wd.watch_rule.name,
WATCH_DATA_METRIC: metric_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_NAMESPACE: namespace,
WATCH_DATA: metric_data WATCH_DATA: metric_data
} }