git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
back to epoch date format in leases
[sfa.git]
/
sfa
/
rspecs
/
elements
/
versions
/
pgv2Lease.py
diff --git
a/sfa/rspecs/elements/versions/pgv2Lease.py
b/sfa/rspecs/elements/versions/pgv2Lease.py
index
1d08d5a
..
68c44f0
100644
(file)
--- a/
sfa/rspecs/elements/versions/pgv2Lease.py
+++ b/
sfa/rspecs/elements/versions/pgv2Lease.py
@@
-15,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.rspecs.elements.versions.pgv2Interface import PGv2Interface
from sfa.rspecs.elements.lease import Lease
-from sfa.planetlab.plxrn import xrn_to_hostname
class PGv2Lease:
@staticmethod
class PGv2Lease:
@staticmethod
@@
-40,7
+39,7
@@
class PGv2Lease:
lease_elems = []
for lease in grouped_leases:
lease_elems = []
for lease in grouped_leases:
- lease[0]['start_time'] = datetime_to_string(utcparse(lease[0]['start_time']))
+
#
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_fields = ['slice_id', 'start_time', 'duration']
lease_elem = xml.add_instance('lease', lease[0], lease_fields)
@@
-67,7
+66,8
@@
class PGv2Lease:
for node_elem in node_elems:
lease = Lease(lease_elem.attrib, lease_elem)
lease['slice_id'] = lease_elem.attrib['slice_id']
for node_elem in node_elems:
lease = Lease(lease_elem.attrib, lease_elem)
lease['slice_id'] = lease_elem.attrib['slice_id']
- lease['start_time'] = datetime_to_epoch(utcparse(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)
lease['duration'] = lease_elem.attrib['duration']
lease['component_id'] = node_elem.attrib['component_id']
leases.append(lease)