X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FLocalSubstrate.inria.py;h=58b6b8fdfb50c07f81b04da24fa39a1af74d9119;hb=ef42cee27de6d6a678ab5a5768b3b576ba747476;hp=c156aca48f7dbd0fe0e81a0ce993fb0b91ca013b;hpb=fa29584970509214e38235c4f14a6aacc906cf9b;p=tests.git

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index c156aca..58b6b8f 100755
--- a/system/LocalSubstrate.inria.py
+++ b/system/LocalSubstrate.inria.py
@@ -1,6 +1,7 @@
-#!/usr/bin/python -u
+#!/usr/bin/python3 -u
+# -*- python3 -*-
 # Thierry Parmentelat <thierry.parmentelat@inria.fr>
-# Copyright (C) 2010 INRIA 
+# Copyright (C) 2015 INRIA 
 #
 # this is only an example file
 # the actual file is installed in your testmaster box as /root/LocalTestResources.py
@@ -20,50 +21,32 @@ class OnelabSubstrate (Substrate):
 
    # the experimental lxc-based build box
    def build_lxc_boxes_spec (self):
-# velvet needs attention
-#      return [ 'liquid', 'reed', 'velvet' ]
-      return [ 'liquid', 'reed' ]
+      return [ 'buzzcocks' ]
 
    # the lxc-capable box for PLCs
    def plc_lxc_boxes_spec (self):
-      return [ 
-# gotan looks in bad shape and I can't use its drac from the US
-#         ('gotan', 20),         # how many plcs max in this box 
-         ('deathvegas', 12),    
-         ]  
+      # we now use the same box as for builds
+      return [ ('buzzcocks', 20), ]  
 
-   # vplc01 to 40
+   def qemu_boxes_spec (self):
+      # ditto, a single big box now is enough
+      return [ ('boxtops', 64), ]
+
+   
+   # may use vplc01 to 25 - out of the existing 30
+   # keep 5 upper addresses for more persistent instances
    def vplc_ips (self):
-      return [  ( 'vplc%02d'%i,                 # DNS name
+      return [  ( 'vplc{:02d}.pl.sophia.inria.fr'
+                      .format(i),               # DNS name
                   'unused')                     # MAC address 
-                for i in range(1,41) ] 
-
-# as of jan 2014 this is renumbered so that 1 is preferred
-   def qemu_boxes_spec (self):
-      return [ # (hostname, how many qemus max in this box)
-# speedball (1) - old school but robust and a big disk
-         ('speedball', 2), # 4 cores, 4Gb, 840 Gb
-# used to have kruder too, but it is broken/dead
-# dorfmeister (2)
-         ('dorfmeister', 2), # 4 cores, 4Gb
-# enfoui - L119 as it won't work well under the KVM in L102A
-# use F10 to enter BIOS setup
-# nodes spawned in this box won't get network connectivity
-#         ('enfoui', 4), # 4 cores, 8Gb
-# estran (4) - big mem but small disk
-# take it out because it takes much of the load and then gets full..
-#         ('estran', 2), # 4 cores, 8Gb
-# lodos (5) - rather old/small
-         ('lodos', 1), # 2 cores, 4Gb
-# cyblok (6)        
-         ('cyblok', 1), # 2 cores, 4Gb
-         ]
+                for i in range(1, 26) ] 
 
-   # the nodes pool has a MAC address as user-data (3rd elt in tuple)
+   # vnode01 to 20
+   # the nodes IP pool has a MAC address as user-data (3rd elt in tuple)
    def vnode_ips (self):
-      return [ ( 'vnode%02d'%i,                 # DNS name               
-                 '02:34:56:00:00:%02d'%i)       # MAC address
-               for i in range(1,21) ] 
+      return [ ( 'vnode{:02d}'.format(i),            # DNS name               
+                 '02:34:56:00:00:{:02d}'.format(i))  # MAC address
+               for i in range(1, 21) ] 
    
    # local network settings
    def domain (self):
@@ -81,7 +64,7 @@ class OnelabSubstrate (Substrate):
                'ipaddress_fields:netmask':      '255.255.248.0',
                }
 
-# the hostname for the testmaster - in case we'd like to run this remotely
+# the hostname for the testmaster that orchestrates the whole business
    def testmaster (self): 
       return 'testmaster'