From 263511cb576c9d7a556acd67448b4749f4880f95 Mon Sep 17 00:00:00 2001
From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 21 Dec 2011 15:55:51 -0500
Subject: [PATCH] pl_expires and pl_last_contact should be timezoned
---
sfa/plc/pldriver.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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':
--
2.47.0