X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FLocalSubstrate.inria.py;h=639c14d184dd1cae788090f2cf47163b9c2c5a20;hb=ecfd3c10755fc660c44151b3773f971517d017f9;hp=56733452c270ce9fdff704c2a201031cb9aec345;hpb=5e7aa028e662c047334288e1d95b461eb167bc87;p=tests.git

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index 5673345..639c14d 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,44 +21,51 @@ class OnelabSubstrate (Substrate):
 
    # the experimental lxc-based build box
    def build_lxc_boxes_spec (self):
-      return [ 'liquid', 'reed', 'velvet' ]
+# liquid only used for the last f18 build      
+      return [ 'buzzcocks', 'liquid' ]
 
    # the lxc-capable box for PLCs
    def plc_lxc_boxes_spec (self):
       return [ 
-         ('gotan', 10),         # how many plcs max in this box 
-         ('deathvegas', 10),    
+# gotan looks in bad shape and I can't use its drac from the US
+#         ('gotan', 20),         # how many plcs max in this box 
+         ('buzzcocks', 12),    
          ]  
 
    # vplc01 to 40
    def vplc_ips (self):
-      return [  ( 'vplc%02d'%i,                 # DNS name
+      return [  ( 'vplc{:02d}'.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 - old school but robust and a big disk
-         ('kvm64-1', 3), # 4 cores, 4Gb, 840 Gb
-# used to have kruder too, but it is broken/dead
-# dorfmeister
-         ('kvm64-2', 3), # 4 cores, 4Gb
-# enfoui - can't seem to enter BIOS on that one
-# won't reboot - needs to be fixed
-#         ('kvm64-3', 4), # 4 cores, 8Gb
-# estran - big mem but small disk
-         ('kvm64-4', 2), # 4 cores, 8Gb
-# lodos - rather old/small
-         ('kvm64-5', 1), # 2 cores, 4Gb
-# cyblok         
-         ('kvm64-6', 1), # 2 cores, 4Gb
+         ('boxtops', 64),
          ]
 
+# these boxes are going on a well deserved retirement
+# as of jan 2014 this is renumbered so that 1 is preferred
+# 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
+
    # the nodes 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
+      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