Merge branch 'master' of ssh://git.onelab.eu/git/sfa

diff --git a/sfa/rspecs/elements/attribute.py b/sfa/rspecs/elements/attribute.py
new file mode 100644 (file)
index 0000000..740083b
--- /dev/null
+++ b/sfa/rspecs/elements/attribute.py
@@ -0,0 +1,9 @@
+from sfa.rspecs.elements.element import Element
+
+class Attribute(Element):
+
+    fields = [
+        'name',
+        'value',
+    ]
+        

diff --git a/sfa/rspecs/elements/versions/pgv2Node.py b/sfa/rspecs/elements/versions/pgv2Node.py
index ad7bd3d..533e51a 100644 (file)
--- a/sfa/rspecs/elements/versions/pgv2Node.py
+++ b/sfa/rspecs/elements/versions/pgv2Node.py
@@ -12,7 +12,9 @@ from sfa.rspecs.elements.pltag import PLTag
 from sfa.rspecs.elements.versions.pgv2Services import PGv2Services     
 from sfa.rspecs.elements.versions.pgv2SliverType import PGv2SliverType     
 from sfa.rspecs.elements.versions.pgv2Interface import PGv2Interface     
+from sfa.rspecs.elements.versions.sfav1PLTag import SFAv1PLTag
 from sfa.rspecs.elements.granularity import Granularity
+from sfa.rspecs.elements.attribute import Attribute
 
 from sfa.planetlab.plxrn import xrn_to_hostname
 
@@ -69,12 +71,12 @@ class PGv2Node:
             tags = node.get('tags', [])
             if tags:
                for tag in tags:
-                        tag_elem = node_elem.add_element(tag['tagname'])
-                        tag_elem.set_text(tag['value'])
-            PGv2SliverType.add_slivers(node_elem, node.get('slivers', []))
+                    tag['name'] = tag.pop('tagname')
+                    node_elem.add_instance('{%s}attribute' % xml.namespaces['planetlab'], tag, ['name', 'value'])
 
         return node_elems
 
+
     @staticmethod
     def get_nodes(xml, filter={}):
         xpath = '//node%s | //default:node%s' % (XpathFilter.xpath(filter), XpathFilter.xpath(filter))
@@ -98,11 +100,11 @@ class PGv2Node:
             
             # get hardware types
             hardware_type_elems = node_elem.xpath('./default:hardware_type | ./hardware_type')
-            node['hardware_types'] = [hw_type.get_instance(HardwareType) for hw_type in hardware_type_elems]
+            node['hardware_types'] = [dict(hw_type.get_instance(HardwareType)) for hw_type in hardware_type_elems]
             
             # get location
             location_elems = node_elem.xpath('./default:location | ./location')
-            locations = [location_elem.get_instance(Location) for location_elem in location_elems]
+            locations = [dict(location_elem.get_instance(Location)) for location_elem in location_elems]
             if len(locations) > 0:
                 node['location'] = locations[0]
 
@@ -113,19 +115,38 @@ class PGv2Node:
 
             # get interfaces
             iface_elems = node_elem.xpath('./default:interface | ./interface')
-            node['interfaces'] = [iface_elem.get_instance(Interface) for iface_elem in iface_elems]
+            node['interfaces'] = [dict(iface_elem.get_instance(Interface)) for iface_elem in iface_elems]
 
             # get services
             node['services'] = PGv2Services.get_services(node_elem)
             
             # 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 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(dict(initscript_elem.attrib))
+
+            # get node tags
+            tag_elems = node_elem.xpath('./planetlab:attribute | ./attribute')
+            node['tags'] = []
+            if len(tag_elems) > 0:
+                for tag_elem in tag_elems:
+                    tag = dict(tag_elem.get_instance(Attribute))
+                    tag['tagname'] = tag.pop('name')
+                    node['tags'].append(tag)
         return nodes
 
 

diff --git a/sfa/rspecs/elements/versions/sfav1Node.py b/sfa/rspecs/elements/versions/sfav1Node.py
index 1b509cc..2f839c4 100644 (file)
--- a/sfa/rspecs/elements/versions/sfav1Node.py
+++ b/sfa/rspecs/elements/versions/sfav1Node.py
@@ -143,7 +143,7 @@ class SFAv1Node:
                 node['authority_id'] = node_elem.attrib['site_id']
             # get location
             location_elems = node_elem.xpath('./default:location | ./location')
-            locations = [loc_elem.get_instance(Location) for loc_elem in location_elems]  
+            locations = [dict(loc_elem.get_instance(Location)) for loc_elem in location_elems]  
             if len(locations) > 0:
                 node['location'] = locations[0]
             # get bwlimit
@@ -153,7 +153,7 @@ class SFAv1Node:
                 node['bwlimit'] = bwlimits[0]
             # get interfaces
             iface_elems = node_elem.xpath('./default:interface | ./interface')
-            ifaces = [iface_elem.get_instance(Interface) for iface_elem in iface_elems]
+            ifaces = [dict(iface_elem.get_instance(Interface)) for iface_elem in iface_elems]
             node['interfaces'] = ifaces
             # get services
             node['services'] = PGv2Services.get_services(node_elem) 
@@ -163,7 +163,7 @@ class SFAv1Node:
             node['tags'] =  SFAv1PLTag.get_pl_tags(node_elem, ignore=Node.fields+["hardware_type"])
             # get hardware types
             hardware_type_elems = node_elem.xpath('./default:hardware_type | ./hardware_type')
-            node['hardware_types'] = [hw_type.get_instance(HardwareType) for hw_type in hardware_type_elems]
+            node['hardware_types'] = [dict(hw_type.get_instance(HardwareType)) for hw_type in hardware_type_elems]
 
             # temporary... play nice with old slice manager rspec
             if not node['component_name']:

diff --git a/sfa/rspecs/elements/versions/sfav1PLTag.py b/sfa/rspecs/elements/versions/sfav1PLTag.py
index a17d502..b523124 100644 (file)
--- a/sfa/rspecs/elements/versions/sfav1PLTag.py
+++ b/sfa/rspecs/elements/versions/sfav1PLTag.py
@@ -14,6 +14,6 @@ class SFAv1PLTag:
         for elem in xml.iterchildren():
             if elem.tag not in ignore:
                 pl_tag = PLTag({'tagname': elem.tag, 'value': elem.text})
-                pl_tags.append(pl_tag)    
+                pl_tags.append(dict(pl_tag))    
         return pl_tags