X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fpgv2Lease.py;h=89892759b4a84376ec8ec5482669a5a1996f48fd;hb=6768452369c6e82f731239fc474b497d1b3ac8ab;hp=8ba53cbc1c74b1205e59ee4aecaee824a25400c9;hpb=1cc8e9613cab8b5b22478de369f259e591c54e6d;p=sfa.git diff --git a/sfa/rspecs/elements/versions/pgv2Lease.py b/sfa/rspecs/elements/versions/pgv2Lease.py index 8ba53cbc..89892759 100644 --- a/sfa/rspecs/elements/versions/pgv2Lease.py +++ b/sfa/rspecs/elements/versions/pgv2Lease.py @@ -1,7 +1,8 @@ from sfa.util.xrn import Xrn from sfa.util.xml import XpathFilter +from sfa.util.sfatime import utcparse, datetime_to_string, datetime_to_epoch -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 @@ -14,7 +15,6 @@ from sfa.rspecs.elements.versions.pgv2SliverType import PGv2SliverType from sfa.rspecs.elements.versions.pgv2Interface import PGv2Interface from sfa.rspecs.elements.lease import Lease -from sfa.planetlab.plxrn import xrn_to_hostname class PGv2Lease: @staticmethod @@ -39,6 +39,8 @@ class PGv2Lease: lease_elems = [] for lease in grouped_leases: + lease[0]['start_time'] = datetime_to_string(utcparse(lease[0]['start_time'])) + lease_fields = ['slice_id', 'start_time', 'duration'] lease_elem = xml.add_instance('lease', lease[0], lease_fields) lease_elems.append(lease_elem) @@ -64,7 +66,7 @@ class PGv2Lease: 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['duration'] = lease_elem.attrib['duration'] lease['component_id'] = node_elem.attrib['component_id'] leases.append(lease)