renaming steps big time - more consistent - easier to remember

[tests.git] / system / LocalTestResources.sample.inria

diff --git a/system/LocalTestResources.sample.inria b/system/LocalTestResources.sample.inria
old mode 100644 (file)
new mode 100755 (executable)
index 5683087..7e596d7
--- a/system/LocalTestResources.sample.inria
+++ b/system/LocalTestResources.sample.inria
@@ -1,45 +1,67 @@
-# -*-python-*-
-# $Id$
-# 
-# this is only an example file
-# the actual file is installed in your testmaster box as /root/LocalTestResources.py
-# 
+#!/usr/bin/python
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA 
+#
+# this is the file that gets installed at onelab
+# in our testmaster box as /root/LocalTestResources.py
 # 
 
+if __name__ == '__main__':
+   import sys, os.path
+   sys.path.append(os.path.expanduser("~/git-tests/system"))
+
 from TestResources import TestResources
 
 class OnelabTestResources (TestResources):
     
     # we use only one for now but who knows
     def plc_boxes (self):
-        return [ 'testbox-plc.onelab.eu' ]
+        return [ 'testplc.pl.sophia.inria.fr' ]
 
     def network_dict (self):
-        return { 'interface_fields:gateway':'138.96.248.250',
-                 'interface_fields:network':'138.96.0.0',
-                 'interface_fields:broadcast':'138.96.255.255',
-                 'interface_fields:netmask':'255.255.0.0',
-                 'interface_fields:dns1': '138.96.0.10',
-                 'interface_fields:dns2': '138.96.0.11',
+        return { 'interface_fields:gateway':'138.96.112.250',
+                 'interface_fields:network':'138.96.112.0',
+                 'interface_fields:broadcast':'138.96.119.255',
+                 'interface_fields:netmask':'255.255.248.0',
+                 'interface_fields:dns1': '138.96.112.1',
+                 'interface_fields:dns2': '138.96.112.2',
                  }
 
     def nodes_ip_pool (self):
-        return [ ( 'vnode%02d.inria.fr'%i, 
-                   '138.96.255.%d'%(230+i), 
-                   '02:34:56:00:00:%02d'%i) for i in range(1,10) ]
+        return [ ( 'vnode%02d.pl.sophia.inria.fr'%i, 
+                   '138.96.112.%d'%(110+i), 
+                   '02:34:56:00:00:%02d'%i) for i in range(1,8) ]
     
-    # 64-bits qemu boxes that can run any test
-    def qemus_ip_pool_64 (self):
-        return [ ( 'testqemu%d.onelab.eu'%i, None, None) for i in range(1,4) ] 
+    # 32bits : qemu32-[1-5] + 64bits : qemu64-[1-3]
+    # removing qemu64-3 until it gets on the right IP segment again
+    def qemus_ip_pool (self):
+        return [
+            ('qemu64-1.pl.sophia.inria.fr', None, None),
+            ('qemu64-2.pl.sophia.inria.fr', None, None),
+            ('qemu64-3.pl.sophia.inria.fr', None, None),
+#            ('qemu32-1.pl.sophia.inria.fr', None, None),
+            ('qemu32-2.pl.sophia.inria.fr', None, None),
+            ('qemu32-3.pl.sophia.inria.fr', None, None),
+            ('qemu32-4.pl.sophia.inria.fr', None, None),
+#            ('qemu32-5.pl.sophia.inria.fr', None, None),
+            ]
 
-    # 32-bits qemu boxes that can run only 32bits nodes
-    def qemus_ip_pool_32 (self):
-        return [ ( 'testqemu32-%d.onelab.eu'%i, None, 32) for i in range(1,6) ]
+    def max_qemus (self):
+        return len(self.qemus_ip_pool())-1
 
+    # 1 to 15
     def plcs_ip_pool (self):
-        return [  ( 'vplc%02d.inria.fr'%i, 
-                    '138.96.255.%d'%(200+i), 
+        return [  ( 'vplc%02d.pl.sophia.inria.fr'%i,
+                    '138.96.112.%d'%(70+i),
                     '02:34:56:00:ee:%02d'%i) for i in range(1,16) ]
 
+    def max_plcs (self):
+        return len(self.plcs_ip_pool())-2
+
+    def preferred_hostname (self):
+        return None
 
 local_resources = OnelabTestResources ()
+
+if __name__ == '__main__':
+   for (h,_,__) in local_resources.qemus_ip_pool(): print h