X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sla%2Fslaclient%2Fxmlconverter.py;h=35dc58c31e2e4ec1e8913539cbfbb6d65570dbcb;hb=829c3ba3d1bcf6e1aae4e21a8f60ec72fc815340;hp=d32a591faac849868c2de86e8feaf718bfa9971c;hpb=36a55939d5f370f1ff2b6021796e31edad21d1ff;p=myslice.git diff --git a/sla/slaclient/xmlconverter.py b/sla/slaclient/xmlconverter.py index d32a591f..35dc58c3 100755 --- a/sla/slaclient/xmlconverter.py +++ b/sla/slaclient/xmlconverter.py @@ -21,6 +21,7 @@ root = ElementTree.parse("file.xml") c.convert(root.getroot()) """ +from myslice.settings import logger try: # Much faster and lighter library (C implementation) @@ -200,8 +201,8 @@ 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) + # for name, value in xmlroot.attrib.items(): + # logger.debug('SLA xmlconverter: {} = {}'.format(name, value)) if xmlroot.tag in self.agreement_tags: result = Agreement() @@ -280,7 +281,7 @@ class AgreementConverter(Converter): nss = self._namespaces for element in elements: servicename = _get_attribute(element, "ServiceName") - for var in element.findall("wsag:Variables/wsag:Variable", nss): + for var in element.findall("wsag:VariableSet/wsag:Variable", nss): key, value = self._parse_property(var, servicename) result[key] = value