From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 11 Jun 2010 11:08:39 +0000 (+0200)
Subject: use more compact slice names pslc<x> and fslc<x> for plc- and sfa- based slices resp.
X-Git-Tag: tests-5.0-6~15
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a3050922573f1c5ce0275d36bf08f09b7a451f42;p=tests.git

use more compact slice names pslc<x> and fslc<x> for plc- and sfa- based slices resp.
---

diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py
index 970a9f8..06ac260 100644
--- a/system/TestSliceSfa.py
+++ b/system/TestSliceSfa.py
@@ -37,18 +37,18 @@ class TestSliceSfa:
     def create_slice(self):
 	auth=self.test_plc.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH']
 	return \
-	self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ create %s.main.sfaslicea1 slice.rspec"%auth)==0
+	self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ create %s.main.fslc1 slice.rspec"%auth)==0
 
     def update_slice(self):
 	auth=self.test_plc.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH']
 	return \
-	self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ create %s.main.sfaslicea1 slice.rspec"%auth)==0
+	self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ create %s.main.fslc1 slice.rspec"%auth)==0
 
     def delete_slice(self):
 	auth=self.test_plc.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH']
-	self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ delete %s.main.sfaslicea1"%auth)
+	self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ delete %s.main.fslc1"%auth)
 	return \
-	self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ remove -t slice %s.main.sfaslicea1"%auth)==0
+	self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ remove -t slice %s.main.fslc1"%auth)==0
 
     def check_slice_sfa(self,options,timeout_minutes=40,silent_minutes=30,period=15):
         timeout = datetime.datetime.now()+datetime.timedelta(minutes=timeout_minutes)
diff --git a/system/config_default.py b/system/config_default.py
index cb5fe0d..37a740f 100644
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -145,7 +145,7 @@ def initscripts(options,index):
     return initscripts
 
 def slices (options,index):
-    return [ { 'slice_fields': {'name':'main_slicetest%d'%index,
+    return [ { 'slice_fields': {'name':'main_pslc%d'%index,
                                 'instantiation':'plc-instantiated',
                                 'url':'http://foo%d@foo.com'%index,
                                 'description':'testslice number %d'%index,
@@ -166,18 +166,18 @@ def tcp_tests (options,index):
         return [
             # local test
             { 'server_node': 'node1',
-              'server_slice' : 'main_slicetest1',
+              'server_slice' : 'main_pslc1',
               'client_node' : 'node1',
-              'client_slice' : 'main_slicetest1',
+              'client_slice' : 'main_pslc1',
               'port' : 2000,
               }]
     elif index == 2:
         return [
             # remote test
             { 'server_node': 'node1',
-              'server_slice' : 'main_slicetest1',
+              'server_slice' : 'main_pslc1',
               'client_node' : 'node2',
-              'client_slice' : 'main_slicetest2',
+              'client_slice' : 'main_pslc2',
               'port' : 4000,
               },
             ]
@@ -239,7 +239,7 @@ def sfa (options,index) :
     }
 
 def slices_sfa (options,index):
-    return [ { 'slice_fields': {'name':'main_sfaslicea1',
+    return [ { 'slice_fields': {'name':'main_fslc1',
                                 'url':'http://foo%d@foo.com'%index,
                                 'description':'SFA-testing',
                                 'max_nodes':2,
@@ -251,10 +251,10 @@ def slices_sfa (options,index):
 
 def sfa_slice_xml(options,index):
     if index==1:
-	hrn='plc.main.sfaslicea1'
+	hrn='plc.main.fslc1'
 	researcher='plc.main.fake-pi1'
     else:
-	hrn='ple.main.sfaslicea1'
+	hrn='ple.main.fslc1'
 	researcher='ple.main.fake-pi1'
 
     return  ["""<record hrn="%s" type="slice" description="SFA-testing" url="http://anil.onelab.eu/"><researcher>%s</researcher></record>"""%(hrn, researcher)]