From: Sandrine Avakian <sandrine.avakian@inria.fr> Date: Wed, 17 Oct 2012 13:15:12 +0000 (+0200) Subject: Added lease modification feature when adding/removing X-Git-Tag: sfa-2.1-24~3^2~60 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4fc754f442ee8520018d26475236c5d1e17d382a;p=sfa.git Added lease modification feature when adding/removing nodes from a slice/lease in Rspec. WARNING: Not working if at least 2experminents scheduled in OAR. --- diff --git a/sfa/rspecs/elements/versions/sfav1Lease.py b/sfa/rspecs/elements/versions/sfav1Lease.py index 6275121b..180673c0 100644 --- a/sfa/rspecs/elements/versions/sfav1Lease.py +++ b/sfa/rspecs/elements/versions/sfav1Lease.py @@ -75,11 +75,13 @@ class SFAv1Lease: def get_leases(xml, filter={}): xpath = '//lease%s | //default:lease%s' % (XpathFilter.xpath(filter), XpathFilter.xpath(filter)) lease_elems = xml.xpath(xpath) + logger.debug("SFAV1LEASE \t get_leases lease_elems %s" %(lease_elems)) return SFAv1Lease.get_lease_objs(lease_elems) @staticmethod def get_lease_objs(lease_elems): leases = [] + logger.debug("SFAV1LEASE \t get_lease_objs OHGET_LEAQSE_OBJS lease_elems %s "%(lease_elems)) for lease_elem in lease_elems: #get nodes node_elems = lease_elem.xpath('./default:node | ./node') @@ -89,6 +91,7 @@ class SFAv1Lease: lease['start_time'] = lease_elem.attrib['start_time'] lease['duration'] = lease_elem.attrib['duration'] lease['component_id'] = node_elem.attrib['component_id'] + logger.debug("SFAV1LEASE \t get_lease_objs lease %s" %(lease)) leases.append(lease) return leases