fix merge problem

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

diff --git a/sfa/rspecs/elements/versions/pgv2Link.py b/sfa/rspecs/elements/versions/pgv2Link.py
index c1efcce..db28f6c 100644 (file)
--- a/sfa/rspecs/elements/versions/pgv2Link.py
+++ b/sfa/rspecs/elements/versions/pgv2Link.py
@@ -1,25 +1,28 @@
 from lxml import etree
+from sfa.util.plxrn import PlXrn
+from sfa.util.xrn import Xrn
 from sfa.rspecs.elements.link import Link
 from sfa.rspecs.elements.interface import Interface
+from sfa.rspecs.elements.link_type import LinkType
+from sfa.rspecs.elements.component_manager import ComponentManager
+from sfa.rspecs.elements.property import Property    
 from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements
 
 class PGv2Link:
-
     elements = {
         'link': RSpecElement(RSpecElements.LINK, '//default:link | //link'),
         'component_manager': RSpecElement(RSpecElements.COMPONENT_MANAGER, './default:component_manager | ./component_manager'),
         'link_type': RSpecElement(RSpecElements.LINK_TYPE, './default:link_type | ./link_type'),
         'property': RSpecElement(RSpecElements.PROPERTY, './default:property | ./property'),
-        'interface_ref': RSpecElement(RSpecElements.INTERFACE_REF, './default:interface_ref | ./interface_ref') 
+        'interface_ref': RSpecElement(RSpecElements.INTERFACE_REF, './default:interface_ref | ./interface_ref'), 
     }
     
     @staticmethod
     def add_links(xml, links):
-        root = xml.root
         for link in links:
-            link_elem = etree.SubElement(root, 'link')
+            link_elem = etree.SubElement(xml, 'link')
             for attrib in ['component_name', 'component_id', 'client_id']:
-                if attrib in link and link[attrib]:
+                if attrib in link and link[attrib] is not None:
                     link_elem.set(attrib, link[attrib])
             if 'component_manager' in link and link['component_manager']:
                 cm_element = etree.SubElement(link_elem, 'component_manager', name=link['component_manager'])
@@ -36,15 +39,13 @@ class PGv2Link:
                 latency=link['latency'], packet_loss=link['packet_loss'])
             if 'type' in link and link['type']:
                 type_elem = etree.SubElement(link_elem, 'link_type', name=link['type'])             
-   
     @staticmethod 
     def get_links(xml):
         links = []
         link_elems = xml.xpath(PGv2Link.elements['link'].path, namespaces=xml.namespaces)
         for link_elem in link_elems:
             # set client_id, component_id, component_name
-            link = Link(link_elem.attrib)
-            link['_element'] = link_elem
+            link = Link(link_elem.attrib, link_elem)
             # set component manager
             cm = link_elem.xpath('./default:component_manager', namespaces=xml.namespaces)
             if len(cm) >  0:
@@ -70,7 +71,7 @@ class PGv2Link:
             if_elems = link_elem.xpath(PGv2Link.elements['interface_ref'].path, namespaces=xml.namespaces)
             ifs = []
             for if_elem in if_elems:
-                if_ref = Interface(if_elem.attrib)                 
+                if_ref = Interface(if_elem.attrib, if_elem)
                 ifs.append(if_ref)
             if len(ifs) > 1:
                 link['interface1'] = ifs[0]
@@ -78,7 +79,42 @@ class PGv2Link:
             links.append(link)
         return links 
 
+    @staticmethod
+    def add_link_requests(xml, link_tuples, append=False):
+        if not isinstance(link_tuples, set):
+            link_tuples = set(link_tuples)
+
+        available_links = PGv2Link.get_links(xml)
+        recently_added = []
+        for link in available_links:
+            if_name1 =  Xrn(link['interface1']['component_id']).get_leaf()
+            if_name2 =  Xrn(link['interface2']['component_id']).get_leaf()
+             
+            requested_link = None
+            l_tup_1 = (if_name1, if_name2)
+            l_tup_2 = (if_name2, if_name1)
+            if link_tuples.issuperset([(if_name1, if_name2)]):
+                requested_link = (if_name1, if_name2)        
+            elif link_tuples.issuperset([(if_name2, if_name2)]):
+                requested_link = (if_name2, if_name1)
+            if requested_link:
+                # add client id to link ane interface elements 
+                link.element.set('client_id', link['component_name'])
+                link['interface1'].element.set('client_id', Xrn(link['interface1']['component_id']).get_leaf()) 
+                link['interface2'].element.set('client_id', Xrn(link['interface2']['component_id']).get_leaf()) 
+                recently_added.append(link['component_name'])
 
-    def add_link_requests(xml, links_tuple):
-        available_links = PGv2Link.get_links(xml) 
-           
+        if not append:
+            # remove all links that don't have a client id 
+            for link in PGv2Link.get_links(xml):
+                if not link['client_id'] or link['component_name'] not in recently_added:
+                    parent = link.element.getparent()
+                    parent.remove(link.element)                  
+             
+    @staticmethod
+    def get_link_requests(xml):
+        link_requests = []
+        for link in PGv2Link.get_links(xml):
+            if link['client_id'] != None:
+                link_requests.append(link)
+        return link_requests