fix bug

diff --git a/sfa/rspecs/elements/versions/pgv2Link.py b/sfa/rspecs/elements/versions/pgv2Link.py
index 851fd6e..aeef760 100644 (file)
--- a/sfa/rspecs/elements/versions/pgv2Link.py
+++ b/sfa/rspecs/elements/versions/pgv2Link.py
@@ -17,9 +17,8 @@ class PGv2Link:
     
     @staticmethod
     def add_links(xml, links):
     
     @staticmethod
     def add_links(xml, links):

-        root = xml.root

         for link in links:
         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] is not None:
                     link_elem.set(attrib, link[attrib])
             for attrib in ['component_name', 'component_id', 'client_id']:
                 if attrib in link and link[attrib] is not None:
                     link_elem.set(attrib, link[attrib])


@@ -86,18 +85,16 @@ class PGv2Link:
         available_links = PGv2Link.get_links(xml)
         recently_added = []
         for link in available_links:
         available_links = PGv2Link.get_links(xml)
         recently_added = []
         for link in available_links:

-            auth = Xrn(link['component_id']).get_authority_hrn()

             if_name1 =  Xrn(link['interface1']['component_id']).get_leaf()
             if_name2 =  Xrn(link['interface2']['component_id']).get_leaf()
             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)
             requested_link = None
             l_tup_1 = (if_name1, if_name2)

-            l_tup_2 = (if_name2, if_name1) 
+            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 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'])
             if requested_link:
                 # add client id to link ane interface elements 
                 link.element.set('client_id', link['component_name'])

diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py
index c003342..3917b39 100644 (file)
--- a/sfa/rspecs/versions/sfav1.py
+++ b/sfa/rspecs/versions/sfav1.py
@@ -255,12 +255,7 @@ class SFAv1(BaseVersion):
         PGv2Link.add_links(xml, links)
 
     def add_link_requests(self, links):
         PGv2Link.add_links(xml, links)
 
     def add_link_requests(self, links):

-        networks = self.get_network_elements()
-        if len(networks) > 0:
-            xml = networks[0]
-        else:
-            xml = self.xml 
-        PGv2Link.add_link_requests(xml, links)
+        PGv2Link.add_link_requests(self.xml, links)

 
     def add_slivers(self, slivers, network=None, sliver_urn=None, no_dupes=False, append=False):
         # add slice name to network tag
 
     def add_slivers(self, slivers, network=None, sliver_urn=None, no_dupes=False, append=False):
         # add slice name to network tag