X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Fpg_rspec.py;h=a2033cdc2746e4f4bdbc27f3b19b2a2737e564f4;hb=b4d3c48e1f55ef03042a03173dcdf8e9ef425937;hp=a151b0a68a68360ac700ef430052dc4232033675;hpb=a267816cecd4a5dce57ad57769509269079e0fec;p=sfa.git

diff --git a/sfa/rspecs/pg_rspec.py b/sfa/rspecs/pg_rspec.py
index a151b0a6..a2033cdc 100755
--- a/sfa/rspecs/pg_rspec.py
+++ b/sfa/rspecs/pg_rspec.py
@@ -6,7 +6,6 @@ from sfa.util.xrn import *
 from sfa.util.plxrn import hostname_to_urn
 from sfa.util.config import Config  
 
-
 class PGRSpec(RSpec):
     header = '<?xml version="1.0"?>\n'
     template = """<rspec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.protogeni.net/resources/rspec/0.2" xsi:schemaLocation="http://www.protogeni.net/resources/rspec/0.2 http://www.protogeni.net/resources/rspec/0.2/ad.xsd"></rspec>"""
@@ -16,6 +15,7 @@ class PGRSpec(RSpec):
     schemas =  {'xsi': 'http://www.protogeni.net/resources/rspec/0.2 http://www.protogeni.net/resources/rspec/0.2/ad.xsd'
             }
     format = 'pg'
+    format = 'protogeni'
     xml = None
 
     def get_network(self):
@@ -26,7 +26,7 @@ class PGRSpec(RSpec):
         return network
 
     def get_networks(self):
-        networks = self.xml.xpath('//rspecv2:node[@component_manager_uuid]/@component_manager_uuid')
+        networks = self.xml.xpath('//rspecv2:node[@component_manager_uuid]/@component_manager_uuid', namespaces=self.namespaces)
         return set(networks)
 
     def get_node_elements(self):
@@ -34,13 +34,13 @@ class PGRSpec(RSpec):
         return nodes
 
     def get_nodes(self, network=None):
-        return self.xml.xpath('//rspecv2:node[@component_uuid]/@component_uuid', namespaces=self.namespaces) 
+        return self.xml.xpath('//rspecv2:node[@component_name]/@component_name', namespaces=self.namespaces) 
 
     def get_nodes_with_slivers(self, network=None):
         if network:
-            return self.xml.xpath('//node[@component_manager_uuid="%s"][sliver_type]/@component_uuid' % network, namespaces=self.namespaces)
+            return self.xml.xpath('//rspecv2:node[@component_manager_id="%s"][sliver_type]/@component_name' % network, namespaces=self.namespaces)
         else:
-            return self.xml.xpath('//node[sliver_type]/@component_uuid' % network, namespaces=self.namespaces)
+            return self.xml.xpath('//rspecv2:node[rspecv2:sliver_type]/@component_name', namespaces=self.namespaces)
 
     def get_nodes_without_slivers(self, network=None):
         pass
@@ -56,12 +56,12 @@ class PGRSpec(RSpec):
                 continue
                 
             node_tag = etree.SubElement(self.xml, 'node')
-            if 'network' in node:
-                node_tag.set('component_manager_id', node['network'])
+            if 'network_urn' in node:
+                node_tag.set('component_manager_id', node['network_urn'])
             if 'urn' in node:
                 node_tag.set('component_id', node['urn'])
             if 'hostname' in node:
-                node_tag.set('name', node['hostname'])
+                node_tag.set('component_name', node['hostname'])
             node_type_tag = etree.SubElement(node_tag, 'node_type', type_name='pcvm', type_slots='100')
             available_tag = etree.SubElement(node_tag, 'available').text = 'true'
             exclusive_tag = etree.SubElement(node_tag, 'exclusive').text = 'false'
@@ -75,7 +75,19 @@ class PGRSpec(RSpec):
             
 
     def add_slivers(self, slivers, check_for_dupes=False): 
-        pass
+        if not isinstance(slivers, list):
+            slivers = [slivers]
+
+        nodes_with_slivers = self.get_nodes_with_slivers()
+        for sliver in slivers:
+            hostname = sliver['hostname']
+            if hostname in nodes_with_slivers:
+                continue
+            nodes = self.xml.xpath('//rspecv2:node[@component_name="%s"] | //node[@component_name="%s"]' % (hostname, hostname), namespaces=self.namespaces)
+            if nodes:
+                node = nodes[0]
+                node.set('client_id', hostname)
+                etree.SubElement(node, 'sliver_type', name='planetlab-vnode')
 
     def add_interfaces(self, interfaces, check_for_dupes=False):
         pass