huge cleanup for removing mutables used as default

[sfa.git] / sfa / rspecs / elements / versions / iotlabv1Lease.py

diff --git a/sfa/rspecs/elements/versions/iotlabv1Lease.py b/sfa/rspecs/elements/versions/iotlabv1Lease.py
index 7840f08..bfc503a 100644 (file)
--- a/sfa/rspecs/elements/versions/iotlabv1Lease.py
+++ b/sfa/rspecs/elements/versions/iotlabv1Lease.py
@@ -1,11 +1,7 @@
 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.versions.sfav1PLTag import SFAv1PLTag
-#from sfa.rspecs.elements.versions.pgv2Services import PGv2Services
 from sfa.rspecs.elements.lease import Lease
 
 
@@ -26,7 +22,6 @@ class Iotlabv1Lease:
 
         lease_elems = []
         for lease in leases:
-            lease['start_time'] = datetime_to_string(utcparse(lease['start_time']))
 
             lease_fields = ['lease_id', 'component_id', 'slice_id', 'start_time', 'duration']
             lease_elem = network_elem.add_instance('lease', lease, lease_fields)
@@ -34,7 +29,8 @@ class Iotlabv1Lease:
 
 
     @staticmethod
-    def get_leases(xml, filter={}):
+    def get_leases(xml, filter=None):
+        if filter is None: filter={}
         xpath = '//lease%s | //default:lease%s' % (XpathFilter.xpath(filter), XpathFilter.xpath(filter))
         lease_elems = xml.xpath(xpath)
         return Iotlabv1Lease.get_lease_objs(lease_elems)
@@ -48,7 +44,7 @@ class Iotlabv1Lease:
             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'] = lease_elem.attrib['start_time']
                  lease['duration'] = lease_elem.attrib['duration']
                  lease['component_id'] = node_elem.attrib['component_id']
                  leases.append(lease)