X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FLocalSubstrate.inria.py;h=e102692f757a5cd99bf182f71d18e483ef46c4d3;hb=8666ae7f0291e8d115e166ef555f02abafc40fc8;hp=4ed1547ae51cda19b8f12f20ebaff7b40d0a2847;hpb=8ab3507bd25e64e9d47e1ccf74fe2ebfb6e192de;p=tests.git

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index 4ed1547..e102692 100755
--- a/system/LocalSubstrate.inria.py
+++ b/system/LocalSubstrate.inria.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/python3 -u
 # Thierry Parmentelat <thierry.parmentelat@inria.fr>
 # Copyright (C) 2010 INRIA 
 #
@@ -20,7 +20,8 @@ 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):
@@ -32,35 +33,38 @@ class OnelabSubstrate (Substrate):
 
    # 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
+         ('boxtops', 12),
+         ]
+
+# 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
-         ('kvm64-2', 3), # 4 cores, 4Gb
-# enfoui - this HP box behaves weird at boot-time
-# we don't get to see much of the boot process
+# 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
-#         ('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
-         ]
+#         ('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