Merge branch 'master' of ssh://git.planet-lab.org/git/sfa

[sfa.git] / sfa / rspecs / versions / pgv2.py

diff --git a/sfa/rspecs/versions/pgv2.py b/sfa/rspecs/versions/pgv2.py
index 27401d7..1bf922d 100644 (file)
--- a/sfa/rspecs/versions/pgv2.py
+++ b/sfa/rspecs/versions/pgv2.py
@@ -129,7 +129,7 @@ class PGv2(BaseVersion):
             node_type_tag = etree.SubElement(node_tag, 'hardware_type', name='plab-pc')
             node_type_tag = etree.SubElement(node_tag, 'hardware_type', name='pc')
             available_tag = etree.SubElement(node_tag, 'available', now='true')
-            sliver_type_tag = etree.SubElement(node_tag, 'sliver_type', name='plab-vnode')
+            sliver_type_tag = etree.SubElement(node_tag, 'sliver_type', name='plab-vserver')
 
             pl_initscripts = node.get('pl_initscripts', {})
             for pl_initscript in pl_initscripts.values():
@@ -149,7 +149,7 @@ class PGv2(BaseVersion):
         # this is untested
         self.xml.root.append(deepcopy(source_node_tag))
 
-    def add_slivers(self, slivers, sliver_urn=None, no_dupes=False):
+    def add_slivers(self, slivers, sliver_urn=None, no_dupes=False, append=False):
 
         # all nodes hould already be present in the rspec. Remove all
         # nodes that done have slivers
@@ -164,31 +164,46 @@ class PGv2(BaseVersion):
         for node in nodes:
             urn = node.get('component_id')
             hostname = xrn_to_hostname(urn)
-            if hostname not in slivers_dict:
+            if hostname not in slivers_dict and not append:
                 parent = node.getparent()
                 parent.remove(node)
             else:
                 sliver_info = slivers_dict[hostname]
-                node.set('client_id', hostname)
-                if sliver_urn:
-                    slice_id = sliver_info.get('slice_id', -1)
-                    node_id = sliver_info.get('node_id', -1)
-                    sliver_id = urn_to_sliver_id(sliver_urn, slice_id, node_id)
-                    node.set('sliver_id', sliver_id)
-
-                # remove existing sliver_type tags,it needs to be recreated
-                sliver_elem = node.xpath('./default:sliver_type | ./sliver_type', namespaces=self.namespaces)
-                if sliver_elem and isinstance(sliver_elem, list):
-                    sliver_elem = sliver_elem[0]
-                    node.remove(sliver_elem)
-
-                sliver_elem = etree.SubElement(node, 'sliver_type', name='plab-vnode')
-                for tag in sliver_info.get('tags', []):
-                    if tag['tagname'] == 'flack_info':
-                        e = etree.SubElement(sliver_elem, '{%s}info' % self.namespaces['flack'], attrib=eval(tag['value']))
-                    elif tag['tagname'] == 'initscript':
-                        e = etree.SubElement(sliver_elem, '{%s}initscript' % self.namespaces['planetlab'], attrib={'name': tag['value']})
-
+                sliver_type_elements = node.xpath('./default:sliver_type', namespaces=self.namespaces)
+                available_sliver_types = [element.attrib['name'] for element in sliver_type_elements]
+                valid_sliver_types = ['emulab-openvz', 'raw-pc', 'plab-vserver', 'plab-vnode']
+                requested_sliver_type = None
+                for valid_sliver_type in valid_sliver_types:
+                    if valid_sliver_type in available_sliver_types:
+                        requested_sliver_type = valid_sliver_type
+                if requested_sliver_type:
+                    # remove existing sliver_type tags,it needs to be recreated
+                    sliver_elem = node.xpath('./default:sliver_type | ./sliver_type', namespaces=self.namespaces)
+                    if sliver_elem and isinstance(sliver_elem, list):
+                        sliver_elem = sliver_elem[0]
+                        node.remove(sliver_elem)
+                    # set the client id
+                    node.set('client_id', hostname)
+                    if sliver_urn:
+                        # set the sliver id
+                        slice_id = sliver_info.get('slice_id', -1)
+                        node_id = sliver_info.get('node_id', -1)
+                        sliver_id = urn_to_sliver_id(sliver_urn, slice_id, node_id)
+                        node.set('sliver_id', sliver_id)
+
+                    # add the sliver element
+                    sliver_elem = etree.SubElement(node, 'sliver_type', name=requested_sliver_type)
+                    for tag in sliver_info.get('tags', []):
+                        if tag['tagname'] == 'flack_info':
+                            e = etree.SubElement(sliver_elem, '{%s}info' % self.namespaces['flack'], attrib=eval(tag['value']))
+                        elif tag['tagname'] == 'initscript':
+                            e = etree.SubElement(sliver_elem, '{%s}initscript' % self.namespaces['planetlab'], attrib={'name': tag['value']})                
+                else:
+                    # node isn't usable. just remove it from the request     
+                    parent = node.getparent()
+                    parent.remove(node)
+
+    
 
     def remove_slivers(self, slivers, network=None, no_dupes=False):
         for sliver in slivers:
@@ -204,7 +219,26 @@ class PGv2(BaseVersion):
         pass
 
     def add_links(self, links, no_dupes=False):
-        pass
+        for link in links:
+            link_elem = etree.SubElement(self.xml.root, 'link' )
+            link_elem.set('component_name', link.component_name) 
+            link_elem.set('component_id', link.component_id)
+            cm_elem = etree.SubElement(link_elem, 'component_manager')
+            cm_elem.set('name', link.component_manager_name)
+            for endpoint in [link.endpoint1, link.enpoint2]:
+                interface_ref = etree.SubElement(link_elem, 'interface_ref', component_id=endpoint.id)
+                
+            property_attrs = {'capicity': link.capacity, 
+                              'latency': link.latency, 
+                              'packet_loss': link.packet_loss}    
+            property1 = etree.SubElement(link_elem, 'property', source_id=link.endpoint1.id, \
+              dest_id = link.endpoint2.id, capacity = link.capacity, latency=link.latency, \
+              packet_loss = link.packet_loss)
+            
+            property2 = etree.SubElement(link_elem, 'property', source_id=link.endpoint2.id, \
+              dest_id = link.endpoint1.id, capacity = link.capacity, latency=link.latency, \
+              packet_loss = link.packet_loss)
+            link_type = etree.SubElement(link_elem, 'link_type', name=link.type)
 
     def merge(self, in_rspec):
         """
@@ -229,19 +263,20 @@ class PGv2Ad(PGv2):
     enabled = True
     content_type = 'ad'
     schema = 'http://www.protogeni.net/resources/rspec/2/ad.xsd'
-    template = '<rspec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.protogeni.net/resources/rspec/2" xsi:schemaLocation="http://www.protogeni.net/resources/rspec/2 http://www.protogeni.net/resources/rspec/2/ad.xsd" xmlns:flack="http://www.protogeni.net/resources/rspec/ext/flack/1" xmlns:planetlab="http://www.planet-lab.org/resources/sfa/ext/planetlab/1" />'
+    template = '<rspec type="advertisement" xmlns="http://www.protogeni.net/resources/rspec/2" xmlns:flack="http://www.protogeni.net/resources/rspec/ext/flack/1" xmlns:planetlab="http://www.planet-lab.org/resources/sfa/ext/planetlab/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.protogeni.net/resources/rspec/2 http://www.protogeni.net/resources/rspec/2/ad.xsd http://www.planet-lab.org/resources/sfa/ext/planetlab/1 http://www.planet-lab.org/resources/sfa/ext/planetlab/1/planetlab.xsd"/>'
 
 class PGv2Request(PGv2):
     enabled = True
     content_type = 'request'
     schema = 'http://www.protogeni.net/resources/rspec/2/request.xsd'
-    template = '<rspec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.protogeni.net/resources/rspec/2" xsi:schemaLocation="http://www.protogeni.net/resources/rspec/2 http://www.protogeni.net/resources/rspec/2/request.xsd" xmlns:flack="http://www.protogeni.net/resources/rspec/ext/flack/1" xmlns:planetlab="http://www.planet-lab.org/resources/sfa/ext/planetlab/1" />'
+    template = '<rspec type="request" xmlns="http://www.protogeni.net/resources/rspec/2" xmlns:flack="http://www.protogeni.net/resources/rspec/ext/flack/1" xmlns:planetlab="http://www.planet-lab.org/resources/sfa/ext/planetlab/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.protogeni.net/resources/rspec/2 http://www.protogeni.net/resources/rspec/2/request.xsd http://www.planet-lab.org/resources/sfa/ext/planetlab/1 http://www.planet-lab.org/resources/sfa/ext/planetlab/1/planetlab.xsd"/>'
 
 class PGv2Manifest(PGv2):
     enabled = True
     content_type = 'manifest'
     schema = 'http://www.protogeni.net/resources/rspec/2/manifest.xsd'
-    template = '<rspec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.protogeni.net/resources/rspec/2" xsi:schemaLocation="http://www.protogeni.net/resources/rspec/2 http://www.protogeni.net/resources/rspec/2/manifest.xsd" xmlns:flack="http://www.protogeni.net/resources/rspec/ext/flack/1" xmlns:planetlab="http://www.planet-lab.org/resources/sfa/ext/planetlab/1" />'
+    template = '<rspec type="manifest" xmlns="http://www.protogeni.net/resources/rspec/2" xmlns:flack="http://www.protogeni.net/resources/rspec/ext/flack/1" xmlns:planetlab="http://www.planet-lab.org/resources/sfa/ext/planetlab/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.protogeni.net/resources/rspec/2 http://www.protogeni.net/resources/rspec/2/manifest.xsd http://www.planet-lab.org/resources/sfa/ext/planetlab/1 http://www.planet-lab.org/resources/sfa/ext/planetlab/1/planetlab.xsd"/>'
+