Get initscripts from pgv2 and geniv3 rspecs

[sfa.git] / sfa / rspecs / elements / versions / pgv2Node.py

diff --git a/sfa/rspecs/elements/versions/pgv2Node.py b/sfa/rspecs/elements/versions/pgv2Node.py
index 5db9ba9..f14e1f8 100644 (file)
--- a/sfa/rspecs/elements/versions/pgv2Node.py
+++ b/sfa/rspecs/elements/versions/pgv2Node.py
@@ -69,7 +69,7 @@ class PGv2Node:
             if tags:
                for tag in tags:
                     tag['name'] = tag.pop('tagname')
-                    node_elem.add_instance('attribute', tag, ['name', 'value'])
+                    node_elem.add_instance('{%s}attribute' % xml.namespaces['planetlab'], tag, ['name', 'value'])
 
         return node_elems
 
@@ -119,15 +119,33 @@ class PGv2Node:
             
             # get slivers
             node['slivers'] = PGv2SliverType.get_slivers(node_elem)    
-            available_elems = node_elem.xpath('./default:available | ./available')
-            if len(available_elems) > 0 and 'name' in available_elems[0].attrib:
+            
+            # get initscripts
+            initscript_elems = node_elem.xpath('./planetlab:initscript | ./initscript')
+            if len(initscript_elems) > 0:
+                for initscript_elem in initscript_elems:
+                    if 'name' in initscript_elem.attrib:
+                        node['pl_initscripts']= initscript_elem.attrib
+                        
+                    
+            # get boot state
+           available_elems = node_elem.xpath('./default:available | ./available')
+            if len(available_elems) > 0 and 'now' in available_elems[0].attrib:
                 if available_elems[0].attrib.get('now', '').lower() == 'true': 
                     node['boot_state'] = 'boot'
                 else: 
                     node['boot_state'] = 'disabled' 
 
+            # get initscripts
+            node['pl_initscripts'] = []
+            initscript_elems = node_elem.xpath('./default:sliver_type/planetlab:initscript | ./sliver_type/initscript')
+            if len(initscript_elems) > 0:
+                for initscript_elem in initscript_elems:
+                    if 'name' in initscript_elem.attrib:
+                        node['pl_initscripts'].append(initscript_elem.attrib)
+
             # get node tags
-            tag_elems = node_elem.xpath('./default:attribute | ./attribute')
+            tag_elems = node_elem.xpath('./planetlab:attribute | ./attribute')
             node['tags'] = []
             if len(tag_elems) > 0:
                 for tag_elem in tag_elems: