X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fpgv2Services.py;h=ff9e9d13235804d1089f6fb441a6381cc278348d;hb=1cc8e9613cab8b5b22478de369f259e591c54e6d;hp=9eb1ed9a79d0d864b569530b12eea273876a4a38;hpb=69fb221c274eb0b6e9f6ff6f895e5e6f90b17230;p=sfa.git

diff --git a/sfa/rspecs/elements/versions/pgv2Services.py b/sfa/rspecs/elements/versions/pgv2Services.py
index 9eb1ed9a..ff9e9d13 100644
--- a/sfa/rspecs/elements/versions/pgv2Services.py
+++ b/sfa/rspecs/elements/versions/pgv2Services.py
@@ -1,6 +1,7 @@
 from sfa.rspecs.elements.element import Element  
 from sfa.rspecs.elements.execute import Execute  
 from sfa.rspecs.elements.install import Install  
+from sfa.rspecs.elements.services import ServicesElement  
 from sfa.rspecs.elements.login import Login
 
 class PGv2Services:
@@ -8,21 +9,35 @@ class PGv2Services:
     def add_services(xml, services):
         if not services:
             return 
-
         for service in services:
             service_elem = xml.add_element('services')
-            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) 
+            child_elements = {'install': Install.fields,
+                              'execute': Execute.fields,
+                              'login': Login.fields}
+            for (name, fields) in child_elements.items():
+                child = service.get(name)
+                if not child: 
+                    continue
+                if isinstance(child, dict):
+                    service_elem.add_instance(name, child, fields)
+                elif isinstance(child, list):
+                    for obj in child:
+                        service_elem.add_instance(name, obj, 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_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)
+            service = ServicesElement(services_elem.attrib, services_elem)
+            # get install 
+            install_elems = xml.xpath('./default:install | ./install')
+            service['install'] = [install_elem.get_instance(Install) for install_elem in install_elems]
+            # get execute
+            execute_elems = xml.xpath('./default:execute | ./execute')
+            service['execute'] = [execute_elem.get_instance(Execute) for execute_elem in execute_elems]
+            # get login
+            login_elems = xml.xpath('./default:login | ./login')
+            service['login'] = [login_elem.get_instance(Login) for login_elem in login_elems]
             services.append(service)  
         return services