X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fsfav1Sliver.py;h=a9d17e2c44f0796452c189758fc51b1257daed87;hb=04a3f20dc71bf8b3f96b1e3172623aa346a638a7;hp=a2b07a1366adb1d67610fe61bc132a7af8d49dcb;hpb=6768452369c6e82f731239fc474b497d1b3ac8ab;p=sfa.git diff --git a/sfa/rspecs/elements/versions/sfav1Sliver.py b/sfa/rspecs/elements/versions/sfav1Sliver.py index a2b07a13..a9d17e2c 100644 --- a/sfa/rspecs/elements/versions/sfav1Sliver.py +++ b/sfa/rspecs/elements/versions/sfav1Sliver.py @@ -19,13 +19,14 @@ class SFAv1Sliver: tags = sliver.get('tags', []) if tags: for tag in tags: - SFAv1Sliver.add_sliver_attribute(sliver_elem, tag['tagname'], tag['value']) + SFAv1Sliver.add_sliver_attribute( + sliver_elem, tag['tagname'], tag['value']) @staticmethod def add_sliver_attribute(xml, name, value): elem = xml.add_element(name) elem.set_text(value) - + @staticmethod def get_sliver_attributes(xml): attribs = [] @@ -36,18 +37,19 @@ class SFAv1Sliver: instance['name'] = elem.tag instance['value'] = elem.text attribs.append(instance) - return attribs - + return attribs + @staticmethod - def get_slivers(xml, filter={}): + def get_slivers(xml, filter=None): + 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'] = SFAv1Sliver.get_sliver_attributes(sliver_elem) slivers.append(sliver) - return slivers - + return slivers