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

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index 3fd52d0..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,9 +20,8 @@ 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' ]
+# liquid only used for the last f18 build      
+      return [ 'buzzcocks', 'liquid' ]
 
    # the lxc-capable box for PLCs
    def plc_lxc_boxes_spec (self):
@@ -34,13 +33,13 @@ 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) ] 
 
    def qemu_boxes_spec (self):
       return [ # (hostname, how many qemus max in this box)
-         ('buzzcocks', 12),
+         ('boxtops', 12),
          ]
 
 # these boxes are going on a well deserved retirement
@@ -64,8 +63,8 @@ class OnelabSubstrate (Substrate):
 
    # 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