X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fiotlabv1Lease.py;h=ea796b55dd6998e7e088b72e6db5488c382afff1;hp=bfc503aa420cb3193d67b7d3afcd25bf8521d4a7;hb=04a3f20dc71bf8b3f96b1e3172623aa346a638a7;hpb=c1c136b3042a24604823c6da135308b7c031c234 diff --git a/sfa/rspecs/elements/versions/iotlabv1Lease.py b/sfa/rspecs/elements/versions/iotlabv1Lease.py index bfc503aa..ea796b55 100644 --- a/sfa/rspecs/elements/versions/iotlabv1Lease.py +++ b/sfa/rspecs/elements/versions/iotlabv1Lease.py @@ -5,7 +5,6 @@ from sfa.util.xrn import Xrn from sfa.rspecs.elements.lease import Lease - class Iotlabv1Lease: @staticmethod @@ -15,23 +14,27 @@ class Iotlabv1Lease: if len(network_elems) > 0: network_elem = network_elems[0] elif len(leases) > 0: - network_urn = Xrn(leases[0]['component_id']).get_authority_urn().split(':')[0] - network_elem = xml.add_element('network', name = network_urn) + network_urn = Xrn(leases[0]['component_id'] + ).get_authority_urn().split(':')[0] + network_elem = xml.add_element('network', name=network_urn) else: network_elem = xml lease_elems = [] for lease in leases: - lease_fields = ['lease_id', 'component_id', 'slice_id', 'start_time', 'duration'] - lease_elem = network_elem.add_instance('lease', lease, lease_fields) + lease_fields = ['lease_id', 'component_id', + 'slice_id', 'start_time', 'duration'] + lease_elem = network_elem.add_instance( + 'lease', lease, lease_fields) lease_elems.append(lease_elem) - @staticmethod def get_leases(xml, filter=None): - if filter is None: filter={} - xpath = '//lease%s | //default:lease%s' % (XpathFilter.xpath(filter), XpathFilter.xpath(filter)) + 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) @@ -39,14 +42,14 @@ class Iotlabv1Lease: def get_lease_objs(lease_elems): leases = [] for lease_elem in lease_elems: - #get nodes + # get nodes node_elems = lease_elem.xpath('./default:node | ./node') 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['duration'] = lease_elem.attrib['duration'] - lease['component_id'] = node_elem.attrib['component_id'] - leases.append(lease) + lease = Lease(lease_elem.attrib, lease_elem) + lease['slice_id'] = lease_elem.attrib['slice_id'] + 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) return leases