From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Sun, 30 Oct 2011 16:34:11 +0000 (-0400)
Subject: sfa/rspecs/elements/versions/pgv2Link.py
X-Git-Tag: sfa-1.1-3~103
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a155a11fbee6ba887f6bb2d77982b7d6232ea54a;p=sfa.git

sfa/rspecs/elements/versions/pgv2Link.py

links should be displayed inside the network tag
---

diff --git a/sfa/rspecs/versions/pgv2.py b/sfa/rspecs/versions/pgv2.py
index af5b367e..b57cd9bb 100644
--- a/sfa/rspecs/versions/pgv2.py
+++ b/sfa/rspecs/versions/pgv2.py
@@ -99,10 +99,10 @@ class PGv2(BaseVersion):
         return PGv2Link.get_link_requests(self.xml)  
 
     def add_links(self, links):
-        PGv2Link.add_links(self.xml, links)
+        PGv2Link.add_links(self.xml.root, links)
 
     def add_link_requests(self, link_tuples, append=False):
-        PGv2Link.add_link_requests(self.xml, link_tuples, append)
+        PGv2Link.add_link_requests(self.xml.root, link_tuples, append)
 
     def attributes_list(self, elem):
         opts = []
diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py
index 8f2c603f..c0033420 100644
--- a/sfa/rspecs/versions/sfav1.py
+++ b/sfa/rspecs/versions/sfav1.py
@@ -247,7 +247,20 @@ class SFAv1(BaseVersion):
         pass
 
     def add_links(self, links):
-        PGv2Link.add_links(self.xml, links)
+        networks = self.get_network_elements()
+        if len(networks) > 0:
+            xml = networks[0]
+        else:
+            xml = self.xml    
+        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)
 
     def add_slivers(self, slivers, network=None, sliver_urn=None, no_dupes=False, append=False):
         # add slice name to network tag