From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 21 Oct 2011 07:46:38 +0000 (+0200)
Subject: cleanup unused/old slice.rspec
X-Git-Tag: tests-5.0-30~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=803c72244fe8e93805f83e660964b742ae7c6b26;p=tests.git

cleanup unused/old slice.rspec
---

diff --git a/system/Substrate.py b/system/Substrate.py
index 4b87605..9387579 100644
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -1060,9 +1060,6 @@ class Substrate:
         plc['sfa']['SFA_SM_HOST'] = plc['PLC_DB_HOST']
         plc['sfa']['SFA_PLC_DB_HOST'] = plc['PLC_DB_HOST']
         plc['sfa']['SFA_PLC_URL'] = 'https://' + plc['PLC_API_HOST'] + ':443/PLCAPI/' 
-        for site in plc['sites']:
-            for node in site['nodes']:
-                plc['sfa']['sfa_slice_rspec']['part4'] = node['node_fields']['hostname']
 	return plc
 
     #################### release:
diff --git a/system/TestPlc.py b/system/TestPlc.py
index 8d0a738..79580c7 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -1293,16 +1293,6 @@ class TestPlc:
             test_slice=TestSliceSfa(self,test_site,slice_spec)
             test_slice.sfi_config(dir_name)
 
-	file_name=dir_name + os.sep + 'slice.rspec'
-        fileconf=open(file_name,'w')
-	slice_rspec=''
-	for (key, value) in sfa_spec['sfa_slice_rspec'].items():
-	    slice_rspec +=value 
-	fileconf.write(slice_rspec)
-	fileconf.write('\n')
-        fileconf.close()
-        utils.header ("(Over)wrote %s"%file_name)
-        
         # push to the remote root's .sfi
         location = "root/.sfi"
         remote="/vservers/%s/%s"%(self.vservername,location)
diff --git a/system/config_default.py b/system/config_default.py
index e8ab943..96955a7 100644
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -299,9 +299,16 @@ def sfa (options,index) :
     piuser='fake-pi%d'%index
     regularuser='sfafakeuser%d'%index
     return { 
+        'login_base' : login_base(index),
+        'piuser' : piuser,
+        'regularuser':regularuser,
+        'domain':domain,
+        # the default is to use AMs in the various aggregates.xml
+        # stack config_sfamesh to point to SMs instead
+        'neighbours-port':12346,
+        ## global sfa-config-tty stuff
         'SFA_REGISTRY_ROOT_AUTH' : sfa_root(index),
         'SFA_INTERFACE_HRN' : sfa_root(index),
-#        'SFA_REGISTRY_LEVEL1_AUTH' : '',
 	'SFA_REGISTRY_HOST' : 'deferred-myplc-hostname',
 	'SFA_AGGREGATE_HOST': 'deferred-myplc-hostname',
 	'SFA_SM_HOST': 'deferred-myplc-hostname',
@@ -312,16 +319,8 @@ def sfa (options,index) :
         'SFA_PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq',
 	'SFA_PLC_URL' : 'deferred-myplc-api-url',
         'SFA_API_DEBUG': True,
-#        'sfa_slice_specs' : [ sfa_slice_spec(options,index,piuser,regularuser,i) for i in [0,1]],
+        # details of the slices to create
         'sfa_slice_specs' : [ sfa_slice_spec(options,index,piuser,regularuser,i) for i in [0]],
-	'sfa_slice_rspec' : sfa_slice_rspec(options,index),
-        'login_base' : login_base(index),
-        'piuser' : piuser,
-        'regularuser':regularuser,
-        'domain':domain,
-        # the default is to use AMs in the various aggregates.xml
-        # stack config_sfamesh to point to SMs instead
-        'neighbours-port':12346,
     }
 
 # subindex is 0 (pl slice) or 1 (pg slice)
@@ -359,17 +358,6 @@ last_name="Sfa" name="%(hrn)s" type="user">
              } 
 
 
-def sfa_slice_rspec(options,index):
-    node_name='deferred'
-
-    return { 
-        'part1' : '<?xml version="1.0" ?><Rspec><networks><NetSpec name=',
-        'part2' : '%s'%sfa_root(index),
-        'part3' : '><nodes><NodeSpec cpu_min="" cpu_pct="" cpu_share="" disk_max="" init_params="" name=\"',
-        'part4' : '%s'%node_name,
-        'part5' : '\" start_time="" type=""><net_if><IfSpec init_params="" ip_spoof="" max_kbyte="" max_rate="" min_rate="" name="True" type="ipv4"/></net_if></NodeSpec></nodes></NetSpec></networks></Rspec>',
-           }
-             
 def config (plc_specs,options):
     result=plc_specs
     for i in range (options.size):