X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fnitosv1Sliver.py;fp=sfa%2Frspecs%2Felements%2Fversions%2Fnitosv1Sliver.py;h=6ceb87fc299a842f5ee0c336bd11421c360afe37;hb=04a3f20dc71bf8b3f96b1e3172623aa346a638a7;hp=feac8879f5c6f8dfb887d65c7dd8c4ca13aac6c3;hpb=c1c136b3042a24604823c6da135308b7c031c234;p=sfa.git diff --git a/sfa/rspecs/elements/versions/nitosv1Sliver.py b/sfa/rspecs/elements/versions/nitosv1Sliver.py index feac8879..6ceb87fc 100644 --- a/sfa/rspecs/elements/versions/nitosv1Sliver.py +++ b/sfa/rspecs/elements/versions/nitosv1Sliver.py @@ -7,6 +7,7 @@ from sfa.rspecs.elements.versions.nitosv1PLTag import NITOSv1PLTag #from sfa.planetlab.plxrn import PlXrn + class NITOSv1Sliver: @staticmethod @@ -20,16 +21,18 @@ class NITOSv1Sliver: tags = sliver.get('tags', []) if tags: for tag in tags: - NITOSv1Sliver.add_sliver_attribute(sliver_elem, tag['tagname'], tag['value']) + NITOSv1Sliver.add_sliver_attribute( + sliver_elem, tag['tagname'], tag['value']) if sliver.get('sliver_id'): - name = Xrn(xrn=sliver.get('sliver_id')).get_hrn().split('.')[-1] + name = Xrn(xrn=sliver.get('sliver_id') + ).get_hrn().split('.')[-1] sliver_elem.set('name', name) @staticmethod def add_sliver_attribute(xml, name, value): elem = xml.add_element(name) elem.set_text(value) - + @staticmethod def get_sliver_attributes(xml): attribs = [] @@ -40,19 +43,19 @@ class NITOSv1Sliver: instance['name'] = elem.tag instance['value'] = elem.text attribs.append(instance) - return attribs - + return attribs + @staticmethod def get_slivers(xml, filter=None): - if filter is None: filter={} + if filter is None: + filter = {} xpath = './default:sliver | ./sliver' sliver_elems = xml.xpath(xpath) slivers = [] for sliver_elem in sliver_elems: - sliver = Sliver(sliver_elem.attrib,sliver_elem) - if 'component_id' in xml.attrib: + sliver = Sliver(sliver_elem.attrib, sliver_elem) + if 'component_id' in xml.attrib: sliver['component_id'] = xml.attrib['component_id'] sliver['tags'] = NITOSv1Sliver.get_sliver_attributes(sliver_elem) slivers.append(sliver) - return slivers - + return slivers