X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fsfav1Lease.py;h=039d2d131b5cbfbce0df0f2a6bd005fdf4156304;hb=538de454d777f6aa3f25177f20255297e337cfb5;hp=03a43422eab55c1615896fc72f80f7a3e6060137;hpb=5c5160de04ce99d940b5b6bfef94ab3d3060a601;p=sfa.git

diff --git a/sfa/rspecs/elements/versions/sfav1Lease.py b/sfa/rspecs/elements/versions/sfav1Lease.py
index 03a43422..039d2d13 100644
--- a/sfa/rspecs/elements/versions/sfav1Lease.py
+++ b/sfa/rspecs/elements/versions/sfav1Lease.py
@@ -1,9 +1,10 @@
 from sfa.util.sfalogging import logger
 from sfa.util.xml import XpathFilter
 from sfa.util.xrn import Xrn
+from sfa.util.sfatime import utcparse, datetime_to_string, datetime_to_epoch
 
 from sfa.rspecs.elements.element import Element
-from sfa.rspecs.elements.node import Node
+from sfa.rspecs.elements.node import NodeElement
 from sfa.rspecs.elements.sliver import Sliver
 from sfa.rspecs.elements.location import Location
 from sfa.rspecs.elements.hardware_type import HardwareType
@@ -16,7 +17,6 @@ from sfa.rspecs.elements.versions.sfav1PLTag import SFAv1PLTag
 from sfa.rspecs.elements.versions.pgv2Services import PGv2Services
 from sfa.rspecs.elements.lease import Lease
 
-from sfa.planetlab.plxrn import xrn_to_hostname
 
 class SFAv1Lease:
 
@@ -52,7 +52,8 @@ class SFAv1Lease:
 
         lease_elems = []
         for lease in grouped_leases:
-            #lease_fields = ['lease_id', 'component_id', 'slice_id', 'start_time', 'duration']
+            #lease[0]['start_time'] = datetime_to_string(utcparse(lease[0]['start_time']))
+
             lease_fields = ['slice_id', 'start_time', 'duration']
             lease_elem = network_elem.add_instance('lease', lease[0], lease_fields)
             lease_elems.append(lease_elem)
@@ -85,7 +86,8 @@ class SFAv1Lease:
             for node_elem in node_elems:
                  lease = Lease(lease_elem.attrib, lease_elem)
                  lease['slice_id'] = lease_elem.attrib['slice_id']
-                 lease['start_time'] = lease_elem.attrib['start_time']
+                 #lease['start_time'] = datetime_to_epoch(utcparse(lease_elem.attrib['start_time']))
+                 lease['start_time'] = lease_elem.attrib['start_time']               
                  lease['duration'] = lease_elem.attrib['duration']
                  lease['component_id'] = node_elem.attrib['component_id']
                  leases.append(lease)