From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 19 Sep 2011 09:30:24 +0000 (+0200)
Subject: more consistently rename plc_spec['hostname'] into plc_spec['host_box']
X-Git-Tag: tests-5.0-29~42
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1ddd05ac07ac53ea71e47f6ea22ca17ac882c82c;p=tests.git

more consistently rename plc_spec['hostname'] into plc_spec['host_box']
---

diff --git a/system/Substrate.py b/system/Substrate.py
index 013ca8f..cffc5fa 100644
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -675,7 +675,7 @@ class Substrate:
         #### apply in the plc_spec
         # # informative
         # label=options.personality.replace("linux","")
-        mapper = {'plc': [ ('*' , {'hostname':plc_box.hostname,
+        mapper = {'plc': [ ('*' , {'host_box':plc_box.hostname,
                                    # 'name':'%s-'+label,
                                    'name': plc_name,
                                    'vservername':vservername,
diff --git a/system/TestPlc.py b/system/TestPlc.py
index a567080..85750c9 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -145,7 +145,7 @@ class TestPlc:
     def __init__ (self,plc_spec,options):
 	self.plc_spec=plc_spec
         self.options=options
-	self.test_ssh=TestSsh(self.plc_spec['hostname'],self.options.buildname)
+	self.test_ssh=TestSsh(self.plc_spec['host_box'],self.options.buildname)
         try:
             self.vserverip=plc_spec['vserverip']
             self.vservername=plc_spec['vservername']
@@ -160,7 +160,7 @@ class TestPlc:
         return "%s.%s"%(name,self.vservername)
 
     def hostname(self):
-        return self.plc_spec['hostname']
+        return self.plc_spec['host_box']
 
     def is_local (self):
         return self.test_ssh.is_local()
@@ -431,7 +431,7 @@ class TestPlc:
     @staticmethod
     def display_mapping_plc (plc_spec):
         print '+ MyPLC',plc_spec['name']
-        print '+\tvserver address = root@%s:/vservers/%s'%(plc_spec['hostname'],plc_spec['vservername'])
+        print '+\tvserver address = root@%s:/vservers/%s'%(plc_spec['host_box'],plc_spec['vservername'])
         print '+\tIP = %s/%s'%(plc_spec['PLC_API_HOST'],plc_spec['vserverip'])
         for site_spec in plc_spec['sites']:
             for node_spec in site_spec['nodes']:
diff --git a/system/config_default.py b/system/config_default.py
index 16a4e90..75c60b1 100644
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -263,7 +263,7 @@ def plc (options,index) :
         'index' : index,
         'name' : 'onetest%d'%index,
         # as of yet, not sure we can handle foreign hosts, but this is required though
-        'hostname' : 'deferred-myplc-hostbox-%d'%index,
+        'host_box' : 'deferred-myplc-hostbox-%d'%index,
         # set these two items to run within a vserver
         'vservername': 'deferred-vservername',
         'vserverip': 'deferred-vserverip',