From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 22 Mar 2011 09:22:30 +0000 (+0100)
Subject: rename initscript_body into initscript_code
X-Git-Tag: tests-5.0-26~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0ccf8f50f6bb79b0675f56642f275641bef88b07;p=tests.git

rename initscript_body into initscript_code
---

diff --git a/system/TestSlice.py b/system/TestSlice.py
index 682d4a0..a67d07d 100644
--- a/system/TestSlice.py
+++ b/system/TestSlice.py
@@ -55,11 +55,11 @@ class TestSlice:
             hostnames += [test_node.name()]
         utils.header("Adding %r in %s"%(hostnames,slice_name))
         self.test_plc.apiserver.AddSliceToNodes(auth, slice_name, hostnames)
-        # add initscript body or name as appropriate
-        if self.slice_spec.has_key('initscriptbody'):
-            isbody=self.slice_spec['initscriptbody']
-            utils.header("Adding initscript body %s in %s"%(isbody,slice_name))
-            self.test_plc.apiserver.AddSliceTag(self.test_plc.auth_root(), slice_name,'initscript_body',isbody)
+        # add initscript code or name as appropriate
+        if self.slice_spec.has_key('initscriptcode'):
+            iscode=self.slice_spec['initscriptcode']
+            utils.header("Adding initscript code %s in %s"%(iscode,slice_name))
+            self.test_plc.apiserver.AddSliceTag(self.test_plc.auth_root(), slice_name,'initscript_code',iscode)
         elif self.slice_spec.has_key('initscriptname'):
             isname=self.slice_spec['initscriptname']
             utils.header("Adding initscript name %s in %s"%(isname,slice_name))
diff --git a/system/config_default.py b/system/config_default.py
index 6700b76..70c3be6 100644
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -178,7 +178,7 @@ restart) restart ;;
 esac
 """
 
-initscript_by_body=initscript_by_name.replace("the_script_name","the_script_body")
+initscript_by_code=initscript_by_name.replace("the_script_name","the_script_code")
 
 # one single initscript in the InitScripts table
 def initscripts(options,index): 
@@ -189,7 +189,7 @@ def initscripts(options,index):
              ]
 
 # always return 2 slices
-# one has an initscript body, the other one an initscript name
+# one has an initscript code, the other one an initscript name
 def slices (options,index):
     def theslice (i):
         slice_spec = { 'slice_fields': {'name':'%s_pslc%d'%(login_base(index),i),
@@ -203,10 +203,10 @@ def slices (options,index):
                        'sitename' : login_base(index),
                        'owner' : 'pi',
                        }
-        # odd one has an initscript_body
+        # odd one has an initscript_code
         if i%2==1:
-            slice_spec['initscriptbody']=initscript_by_body
-            slice_spec['initscriptstamp']='the_script_body'
+            slice_spec['initscriptcode']=initscript_by_code
+            slice_spec['initscriptstamp']='the_script_code'
         # even one has an initscript (name)
         else:
             slice_spec['initscriptname']='the_script_name'