X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fsfav1Sliver.py;h=7e9282f22b577f7ca6dc453f2407d924365992b6;hb=4a2337e7f70cef81a8de37829aa63fc941c4b96e;hp=207a4a7834b1e2ce406e9b006ad919395ec86c0d;hpb=5daf08641a6363cb0c05d3c92cdf2bf95dd09366;p=sfa.git diff --git a/sfa/rspecs/elements/versions/sfav1Sliver.py b/sfa/rspecs/elements/versions/sfav1Sliver.py index 207a4a78..7e9282f2 100644 --- a/sfa/rspecs/elements/versions/sfav1Sliver.py +++ b/sfa/rspecs/elements/versions/sfav1Sliver.py @@ -1,9 +1,11 @@ from sfa.util.xrn import Xrn from sfa.util.xml import XmlElement + from sfa.rspecs.elements.element import Element from sfa.rspecs.elements.sliver import Sliver from sfa.rspecs.elements.versions.sfav1PLTag import SFAv1PLTag + class SFAv1Sliver: @staticmethod @@ -18,11 +20,6 @@ class SFAv1Sliver: if tags: for tag in tags: SFAv1Sliver.add_sliver_attribute(sliver_elem, tag['tagname'], tag['value']) - if sliver.get('sliver_id'): - sliver_id_leaf = Xrn(sliver.get('sliver_id')).get_leaf() - sliver_id_parts = sliver_id_leaf.split(':') - name = sliver_id_parts[0] - sliver_elem.set('name', name) @staticmethod def add_sliver_attribute(xml, name, value): @@ -35,14 +32,15 @@ class SFAv1Sliver: for elem in xml.iterchildren(): if elem.tag not in Sliver.fields: xml_element = XmlElement(elem, xml.namespaces) - instance = Element(xml_element) + instance = Element(fields=xml_element, element=elem) instance['name'] = elem.tag instance['value'] = elem.text attribs.append(instance) 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 = []