From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Fri, 11 Nov 2011 04:10:37 +0000 (-0500)
Subject: Element.add() and Element.get() were renamed
X-Git-Tag: sfa-1.1-3~40
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=45f9cbab604e8ea3d17e547e03c13a2b5f45e460;p=sfa.git

Element.add() and Element.get() were renamed
---

diff --git a/sfa/rspecs/elements/versions/pgv2Services.py b/sfa/rspecs/elements/versions/pgv2Services.py
index 6cb7ec9e..e0989638 100644
--- a/sfa/rspecs/elements/versions/pgv2Services.py
+++ b/sfa/rspecs/elements/versions/pgv2Services.py
@@ -7,19 +7,19 @@ class PGv2Services:
     @staticmethod
     def add_services(xml, services):
         for service in services:
-            service_elem = etree.SubElement(xml, 'service')
-            Element.add(service_elem, 'install', service.get('install', []), Install.fields) 
-            Element.add(service_elem, 'execute', service.get('execute', []), Execute.fields) 
-            Element.add(service_elem, 'login', service.get('login', []), Login.fields) 
+            service_elem = xml.add_element('service')
+            Element.add_elements(service_elem, 'install', service.get('install', []), Install.fields) 
+            Element.add_elements(service_elem, 'execute', service.get('execute', []), Execute.fields) 
+            Element.add_elements(service_elem, 'login', service.get('login', []), Login.fields) 
               
     @staticmethod
     def get_services(xml):
         services = []
         for services_elem in xml.xpath('./default:services | ./services'):
             service = Services(services_elem.attrib, services_elem)
-            service['install'] = Element.get(service_elem, './default:install | ./install', Install)
-            service['execute'] = Element.get(service_elem, './default:execute | ./execute', Execute)
-            service['login'] = Element.get(service_elem, './default:login | ./login', Login)
+            service['install'] = Element.get_elements(service_elem, './default:install | ./install', Install)
+            service['execute'] = Element.get_elements(service_elem, './default:execute | ./execute', Execute)
+            service['login'] = Element.get_elements(service_elem, './default:login | ./login', Login)
             services.append(service)  
         return services