From: Tony Mack Date: Wed, 21 Dec 2011 20:55:51 +0000 (-0500) Subject: pl_expires and pl_last_contact should be timezoned X-Git-Tag: sfa-2.0-7~13^2~18 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=263511cb576c9d7a556acd67448b4749f4880f95;p=sfa.git pl_expires and pl_last_contact should be timezoned --- diff --git a/sfa/plc/pldriver.py b/sfa/plc/pldriver.py index fa97183c..1eaa7e37 100644 --- a/sfa/plc/pldriver.py +++ b/sfa/plc/pldriver.py @@ -6,7 +6,7 @@ from sfa.util.faults import MissingSfaInfo, UnknownSfaType, \ from sfa.util.sfalogging import logger from sfa.util.defaultdict import defaultdict -from sfa.util.sfatime import utcparse +from sfa.util.sfatime import utcparse, epochparse from sfa.util.xrn import hrn_to_urn, get_leaf, urn_to_sliver_id from sfa.util.cache import Cache @@ -626,7 +626,7 @@ class PlDriver (Driver): top_level_status = 'ready' result['geni_urn'] = slice_urn result['pl_login'] = slice['name'] - result['pl_expires'] = datetime.datetime.fromtimestamp(slice['expires']).ctime() + result['pl_expires'] = epochparse(slice['expires']) resources = [] for node in nodes: @@ -635,7 +635,7 @@ class PlDriver (Driver): res['pl_boot_state'] = node['boot_state'] res['pl_last_contact'] = node['last_contact'] if node['last_contact'] is not None: - res['pl_last_contact'] = datetime.datetime.fromtimestamp(node['last_contact']).ctime() + res['pl_last_contact'] = epochparse(node['last_contact']) sliver_id = urn_to_sliver_id(slice_urn, slice['slice_id'], node['node_id']) res['geni_urn'] = sliver_id if node['boot_state'] == 'boot':