From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Wed, 4 Jul 2012 14:04:28 +0000 (+0200)
Subject: Added lease support in slabv1 for listing leases using
X-Git-Tag: sfa-2.1-24~3^2~139
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5caac8c93b173b000afbc84f98d205c017d7e68d;p=sfa.git

Added lease support in slabv1 for listing leases using
slab based Rspec.`
---

diff --git a/sfa/rspecs/versions/slabv1.py b/sfa/rspecs/versions/slabv1.py
index 465eca55..b966feb8 100644
--- a/sfa/rspecs/versions/slabv1.py
+++ b/sfa/rspecs/versions/slabv1.py
@@ -1,12 +1,9 @@
 from copy import deepcopy
 
-#from StringIO import StringIO
-#from sfa.util.xrn import urn_to_sliver_id
-#from sfa.util.plxrn import hostname_to_urn, xrn_to_hostname 
 
 from sfa.rspecs.version import RSpecVersion
 import sys
-
+from sfa.rspecs.elements.versions.slabv1Lease import Slabv1Lease
 from sfa.rspecs.elements.versions.slabv1Node import Slabv1Node
 from sfa.rspecs.elements.versions.slabv1Sliver import Slabv1Sliver
 from sfa.rspecs.elements.versions.slabv1Timeslot import Slabv1Timeslot
@@ -221,7 +218,13 @@ class Slabv1(RSpecVersion):
         #for child in rspec.xml.iterchildren():
         #    self.xml.root.append(child)
         
-        
+    # Leases
+
+    def get_leases(self, lease_filter=None):
+        return Slabv1Lease.get_leases(self.xml, lease_filter)
+
+    def add_leases(self, leases, network = None, no_dupes=False):
+        Slabv1Lease.add_leases(self.xml, leases)    
 
     def cleanup(self):
         # remove unncecessary elements, attributes