sfa users have different names

[tests.git] / system / LocalSubstrate.inria.py

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index 836d1d1..5c6d04f 100755 (executable)
--- a/system/LocalSubstrate.inria.py
+++ b/system/LocalSubstrate.inria.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python -u
 # Thierry Parmentelat <thierry.parmentelat@inria.fr>
 # Copyright (C) 2010 INRIA 
 #
@@ -15,6 +15,9 @@ from Substrate import Substrate
 # domain name .pl.sophia.inria.fr is implicit on our network
 class OnelabSubstrate (Substrate):
 
+   def test_box_spec (self):
+      return 'testmaster'
+
    # the build boxes we use 
    def build_boxes_spec (self):
       return [ 'liquid', 'reed', 'velvet', ]
@@ -27,18 +30,17 @@ class OnelabSubstrate (Substrate):
    # vplc01 to 15
    def vplc_ips (self):
       return [  ( 'vplc%02d'%i,                 # DNS name
-#                  '02:34:56:00:ee:%02d'%i)     # MAC address 
                   'unused')                     # MAC address 
                 for i in range(1,21) ] 
 
    def qemu_boxes_spec (self):
-      return [
-         ('kvm64-1', 3), # how many plcs max in this box
-         ('kvm64-2', 3),
-         ('kvm64-3', 3),
-         ('kvm64-4', 3),
-         ('kvm64-5', 3),
-         ('kvm64-6', 3),
+      return [ # how many plcs max in this box
+         ('kvm64-1', 3), # 4 cores, 4Gb
+         ('kvm64-2', 3), # 4 cores, 4Gb
+         ('kvm64-3', 2), # 2 cores, 4Gb
+         ('kvm64-4', 3), # 4 cores, 8Gb
+         ('kvm64-5', 2), # 2 cores, 4Gb
+         ('kvm64-6', 2), # 2 cores, 4Gb
          ]
 
    # the nodes pool has a MAC address as user-data (3rd elt in tuple)