From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 27 Nov 2012 09:09:47 +0000 (+0100)
Subject: configurable timers for ssh_node*
X-Git-Tag: tests-5.1-8~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d499ddce86a19432bf0cc857bc79b5f9113197e1;p=tests.git

configurable timers for ssh_node*
---

diff --git a/system/TestPlc.py b/system/TestPlc.py
index c40d4be..cc2b0e7 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -152,6 +152,8 @@ class TestPlc:
         self.vservername=plc_spec['vservername']
         self.url="https://%s:443/PLCAPI/"%plc_spec['vserverip']
 	self.apiserver=TestApiserver(self.url,options.dry_run)
+        (self.ssh_node_boot_timeout,self.ssh_node_boot_silent)=plc_spec['ssh_node_boot_timers']
+        (self.ssh_node_debug_timeout,self.ssh_node_debug_silent)=plc_spec['ssh_node_debug_timers']
         
     def has_addresses_api (self):
         return self.apiserver.has_method('AddIpAddress')
@@ -1012,11 +1014,15 @@ class TestPlc:
         
     def ssh_node_debug(self):
         "Tries to ssh into nodes in debug mode with the debug ssh key"
-        return self.check_nodes_ssh(debug=True,timeout_minutes=10,silent_minutes=8)
+        return self.check_nodes_ssh(debug=True,
+                                    timeout_minutes=self.ssh_node_debug_timeout,
+                                    silent_minutes=self.ssh_node_debug_silent)
     
     def ssh_node_boot(self):
         "Tries to ssh into nodes in production mode with the root ssh key"
-        return self.check_nodes_ssh(debug=False,timeout_minutes=40,silent_minutes=38)
+        return self.check_nodes_ssh(debug=False,
+                                    timeout_minutes=self.ssh_node_boot_timeout,
+                                    silent_minutes=self.ssh_node_boot_silent)
     
     @node_mapper
     def qemu_local_init (self): pass
diff --git a/system/config_bignode.py b/system/config_bignode.py
new file mode 100644
index 0000000..277167c
--- /dev/null
+++ b/system/config_bignode.py
@@ -0,0 +1,12 @@
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2012 INRIA 
+#
+# allow one hour for the node to install
+
+def config (plc_specs, options):
+    def tweak_timers (plc_spec):
+        plc_spec['ssh_node_boot_timers'] (60, 58)
+        return plc_spec
+    return [tweak_timers (plc_spec) for plc_spec in plc_specs ]
+
+    
diff --git a/system/config_default.py b/system/config_default.py
index d14f414..d7de172 100644
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -494,6 +494,9 @@ def plc (options,index) :
         'tcp_specs' : tcp_specs(options,index),
 	'sfa' : sfa(options,index),
         'leases' : leases (options, index),
+        # big distros need more time to install nodes
+        'ssh_node_boot_timers': (40,38),
+        'ssh_node_debug_timers': (10,8),
     }
 
 # NOTE: SFA currently has SFA_AGGREGATE_API_VERSION=2 baked into the code