X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sla%2Fslaclient%2Fxmlconverter.py;fp=sla%2Fslaclient%2Fxmlconverter.py;h=d32a591faac849868c2de86e8feaf718bfa9971c;hb=aed78ef2aa329dbc3d15aa9dca4795e5cc4464ed;hp=54b365effbbdb8405a4a7104ae43d4e717ace423;hpb=f7308899def626ccdb7218a2fc504bf50cd5cafc;p=unfold.git diff --git a/sla/slaclient/xmlconverter.py b/sla/slaclient/xmlconverter.py index 54b365ef..d32a591f 100755 --- a/sla/slaclient/xmlconverter.py +++ b/sla/slaclient/xmlconverter.py @@ -28,6 +28,8 @@ try: except ImportError: from xml.etree import ElementTree +from xml.etree.ElementTree import QName + import dateutil.parser from wsag_model import Agreement @@ -198,12 +200,17 @@ class AgreementConverter(Converter): :param Element xmlroot: root element of xml to convert. :rtype: wsag_model.Agreement """ + for name, value in xmlroot.attrib.items(): + print '{0}="{1}"'.format(name, value) + if xmlroot.tag in self.agreement_tags: result = Agreement() - result.agreement_id = xmlroot.attrib["AgreementId"] + agreementId = str(QName(self._namespaces["wsag"], "AgreementId")) + result.agreement_id = xmlroot.attrib[agreementId] elif xmlroot.tag in self.template_tags: result = Template() - result.template_id = xmlroot.attrib["TemplateId"] + templateId = str(QName(self._namespaces["wsag"], "TemplateId")) + result.template_id = xmlroot.attrib[templateId] else: raise ValueError("Not valid root element name: " + xmlroot.tag) @@ -311,7 +318,6 @@ class AgreementConverter(Converter): return name, result def _parse_guarantees(self, elements): - result = {} for element in elements: key, value = self._parse_guarantee(element)