From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 1 Apr 2008 08:53:41 +0000 (+0000)
Subject: other fixes needed for remapped hostnames
X-Git-Tag: tests-4.2-4~117
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2514be3188bb12aff05474bf5cff8b8c0ce45d66;p=tests.git

other fixes needed for remapped hostnames
---

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 9ab023f..fe7bd44 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -126,6 +126,13 @@ class TestPlc:
                     return (site,node)
         raise Exception,"Cannot locate node %s"%nodename
         
+    def locate_hostname (self,hostname):
+        for site in self.plc_spec['sites']:
+            for node in site['nodes']:
+                if node['node_fields']['hostname'] == hostname:
+                    return (site,node)
+        raise Exception,"Cannot locate hostname %s"%hostname
+        
     def locate_key (self,keyname):
         for key in self.plc_spec['keys']:
             if key['name'] == keyname:
@@ -435,7 +442,7 @@ class TestPlc:
                     utils.header ("%s has reached the 'boot' state"%hostname)
                 else:
                     # if it's a real node, never mind
-                    (site_spec,node_spec)=self.locate_node(hostname)
+                    (site_spec,node_spec)=self.locate_hostname(hostname)
                     if TestNode.is_real_model(node_spec['node_fields']['model']):
                         utils.header("WARNING - Real node %s in %s - ignored"%(hostname,boot_state))
                         # let's cheat
@@ -491,7 +498,7 @@ class TestPlc:
                     # refresh tocheck
                     tocheck.remove(hostname)
                 else:
-                    (site_spec,node_spec)=self.locate_node(hostname)
+                    (site_spec,node_spec)=self.locate_hostname(hostname)
                     if TestNode.is_real_model(node_spec['node_fields']['model']):
                         utils.header ("WARNING : check ssh access into real node %s - skipped"%hostname)
 			tocheck.remove(hostname)
diff --git a/system/config_1testbox64.py b/system/config_1testbox64.py
index 3d1f1b9..f93331f 100644
--- a/system/config_1testbox64.py
+++ b/system/config_1testbox64.py
@@ -3,6 +3,8 @@ from TestMapper import TestMapper
 
 # using mapper to do the reallocation job
 
+target = 'testbox64.one-lab.org'
+
 def config (plcs, options):
 
     mapper = {'plc': [ ('*' , {'hostname':target,