X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fsfav1Sliver.py;h=a2b07a1366adb1d67610fe61bc132a7af8d49dcb;hb=6768452369c6e82f731239fc474b497d1b3ac8ab;hp=d1519e9fa3aae219e113734f3af29ab276ec1289;hpb=de46e2cf9793a28dcf5e5d9b128da3e9abc1755d;p=sfa.git diff --git a/sfa/rspecs/elements/versions/sfav1Sliver.py b/sfa/rspecs/elements/versions/sfav1Sliver.py index d1519e9f..a2b07a13 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 @@ -14,13 +16,10 @@ class SFAv1Sliver: slivers = [slivers] for sliver in slivers: sliver_elem = xml.add_instance('sliver', sliver, ['name']) - for tag in sliver.get('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) + tags = sliver.get('tags', []) + if tags: + for tag in tags: + SFAv1Sliver.add_sliver_attribute(sliver_elem, tag['tagname'], tag['value']) @staticmethod def add_sliver_attribute(xml, name, value): @@ -33,7 +32,7 @@ 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)