X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Fversions%2Fnitosv1.py;h=60caf1d11f0cb53894b8e0115a159f9f4e1e786f;hb=fad16c7d54b658b37a9b42fbee47b0d4f51cb8ec;hp=72133ac1ccbe1862aca2c0a74172051acece3f84;hpb=ed21507f990ecf9c49887283fb44e9c92a8624f9;p=sfa.git

diff --git a/sfa/rspecs/versions/nitosv1.py b/sfa/rspecs/versions/nitosv1.py
index 72133ac1..60caf1d1 100644
--- a/sfa/rspecs/versions/nitosv1.py
+++ b/sfa/rspecs/versions/nitosv1.py
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 from copy import deepcopy
 from lxml import etree
 
@@ -60,7 +62,8 @@ class NITOSv1(RSpecVersion):
 
     # Slivers
    
-    def add_slivers(self, hostnames, attributes=[], sliver_urn=None, append=False):
+    def add_slivers(self, hostnames, attributes=None, sliver_urn=None, append=False):
+        if attributes is None: attributes=[]
         # add slice name to network tag
         network_tags = self.xml.xpath('//network')
         if network_tags:
@@ -173,21 +176,15 @@ class NITOSv1(RSpecVersion):
     # Links
 
     def get_links(self, network=None):
-        return PGv2Link.get_links(self.xml)
+        return []
 
     def get_link_requests(self):
-        return PGv2Link.get_link_requests(self.xml) 
+        return []
 
     def add_links(self, links):
-        networks = self.get_networks()
-        if len(networks) > 0:
-            xml = networks[0].element
-        else:
-            xml = self.xml
-        PGv2Link.add_links(xml, links)
-
+        pass
     def add_link_requests(self, links):
-        PGv2Link.add_link_requests(self.xml, links)
+        pass
 
     # utility
 
@@ -223,7 +220,8 @@ class NITOSv1(RSpecVersion):
     def get_leases(self, filter=None):
         return NITOSv1Lease.get_leases(self.xml, filter)
 
-    def add_leases(self, leases, channels, network = None, no_dupes=False):
+    def add_leases(self, leases_channels, network = None, no_dupes=False):
+        leases, channels = leases_channels
         NITOSv1Lease.add_leases(self.xml, leases, channels)
 
     # Spectrum
@@ -241,4 +239,4 @@ if __name__ == '__main__':
     from sfa.rspecs.rspec_elements import *
     r = RSpec('/tmp/resources.rspec')
     r.load_rspec_elements(SFAv1.elements)
-    print r.get(RSpecElements.NODE)
+    print(r.get(RSpecElements.NODE))