From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Thu, 2 Aug 2012 13:05:58 +0000 (+0200)
Subject: Removed custom timeslot used for senslab Rspec.
X-Git-Tag: sfa-2.1-24~3^2~104
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=04f362fe47cac5057ce79f484e6b9cbfc1c85bad;p=sfa.git

Removed custom timeslot used for senslab Rspec.
---

diff --git a/sfa/rspecs/elements/timeslot.py b/sfa/rspecs/elements/timeslot.py
deleted file mode 100644
index 81b17b65..00000000
--- a/sfa/rspecs/elements/timeslot.py
+++ /dev/null
@@ -1,17 +0,0 @@
-###########################################################################
-#    Copyright (C) 2012 by                                       
-#    <savakian@sfa2.grenoble.senslab.info>                                                             
-#
-# Copyright: See COPYING file that comes with this distribution
-#
-###########################################################################
-from sfa.rspecs.elements.element import Element
-
-class Timeslot(Element):
-    
-    fields = [
-        'date',
-        'start_time',
-        'timezone',
-        'duration'
-    ]        
diff --git a/sfa/rspecs/elements/versions/slabv1Timeslot.py b/sfa/rspecs/elements/versions/slabv1Timeslot.py
deleted file mode 100644
index 6f6b8027..00000000
--- a/sfa/rspecs/elements/versions/slabv1Timeslot.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from sfa.rspecs.elements.element import Element
-from sfa.rspecs.elements.timeslot import Timeslot
-import sys
-
-class Slabv1Timeslot :
-    @staticmethod 
-    def get_slice_timeslot(xml, filter={}):
-        timeslot = None
-        print>>sys.stderr, "\r\n \r\n \t\t \t SLABV1TIMESLOT.pY >>>>>>>>>>>>>>>>>>>>>>>>>>>>> \t  get_slice_timeslot  "
-        xpath = '//default:timeslot | //timeslot' 
-        timeslot_elems = xml.xpath(xpath)  
-        print>>sys.stderr, "\r\n \r\n \t\t \t SLABV1TIMESLOT.pY >>>>>>>>>>>>>>>>>>>>>>>>>>>>> \t  get_slice_timeslot    timeslot_elems %s"%(timeslot_elems)
-        
-        for timeslot_elem in timeslot_elems:  
-            timeslot = Timeslot(timeslot_elem.attrib, timeslot_elem) 
-            print>>sys.stderr, "\r\n \r\n \t\t \t SLABV1TIMESLOT.pY >>>>>>>>>>>>>>>>>>>>>>>>>>>>> \t  get_slice_timeslot   timeslot  %s"%(timeslot)
-
-        return timeslot
\ No newline at end of file
diff --git a/sfa/rspecs/versions/slabv1.py b/sfa/rspecs/versions/slabv1.py
index bba44845..32872ac5 100644
--- a/sfa/rspecs/versions/slabv1.py
+++ b/sfa/rspecs/versions/slabv1.py
@@ -6,7 +6,7 @@ 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
+
 
 from sfa.rspecs.elements.versions.sfav1Lease import SFAv1Lease