From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Fri, 16 Dec 2011 10:47:01 +0000 (+0100)
Subject: Renamed OARRspec class into SlabAggregate class.
X-Git-Tag: sfa-2.1-24~3^2~253
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=be95fa0044b4aaf732ef87c66d3973445aaf8ea0;p=sfa.git

Renamed OARRspec class into SlabAggregate class.
Renamed the file OARRspec.py into slabaggregate.py.
---

diff --git a/sfa/managers/aggregate_manager_slab.py b/sfa/managers/aggregate_manager_slab.py
index 7ae633c5..22604e6f 100644
--- a/sfa/managers/aggregate_manager_slab.py
+++ b/sfa/managers/aggregate_manager_slab.py
@@ -16,7 +16,7 @@ from sfa.rspecs.version_manager import VersionManager
 from sfa.rspecs.rspec import RSpec
 
 from sfa.server.sfaapi import SfaApi
-from sfa.senslab.OARrspec import OARrspec
+from sfa.senslab.slabaggregate import SlabAggregate
 import sfa.plc.peers as peers
 #from sfa.plc.aggregate import Aggregate
 from sfa.senslab.slices import SlabSlices
@@ -180,7 +180,7 @@ class AggregateManager:
         """
         call_id = options.get('call_id')
         if Callids().already_handled(call_id): return ""
-        aggregate = OARrspec(api)
+        aggregate = SlabAggregate(api)
         #aggregate = Aggregate(api)
         slices = SlabSlices(api)
         (hrn, _) = urn_to_hrn(slice_xrn)
@@ -339,7 +339,7 @@ class AggregateManager:
     
         #panos: passing user-defined options
         #print "manager options = ",options
-        aggregate = OARrspec(api)
+        aggregate = SlabAggregate(api)
         #aggregate = Aggregate(api)
         rspec =  aggregate.get_rspec(slice_xrn=xrn, version=rspec_version, options=options)
     
diff --git a/sfa/senslab/OARrspec.py b/sfa/senslab/slabaggregate.py
similarity index 97%
rename from sfa/senslab/OARrspec.py
rename to sfa/senslab/slabaggregate.py
index af5ab226..eb111303 100644
--- a/sfa/senslab/OARrspec.py
+++ b/sfa/senslab/slabaggregate.py
@@ -33,7 +33,7 @@ from sfa.util.sfatime import epochparse
 def hostname_to_hrn(root_auth,login_base,hostname):
     return PlXrn(auth=root_auth,hostname=login_base+'_'+hostname).get_hrn()
 
-class OARrspec:
+class SlabAggregate:
 
     
     sites = {}
@@ -51,7 +51,7 @@ class OARrspec:
 	self.OARImporter = OARapi()	
         self.driver = SlabDriver(Config())
 	self.api = api 
-	print >>sys.stderr,"\r\n \r\n \t\t_____________INIT OARRSPEC__ api : %s" %(api)
+	print >>sys.stderr,"\r\n \r\n \t\t_____________INIT Slabaggregate api : %s" %(api)
 
 
         
@@ -145,7 +145,7 @@ class OARrspec:
         
 #from plc/aggregate.py 
     def get_rspec(self, slice_xrn=None, version = None, options={}):
-	print>>sys.stderr, " \r\n OARrspec \t\t get_rspec **************\r\n" 
+	print>>sys.stderr, " \r\n SlabAggregate \t\t get_rspec **************\r\n" 
       
 	
         rspec = None