-#!/usr/bin/env python
+#!/usr/bin/python -u
# Thierry Parmentelat <thierry.parmentelat@inria.fr>
# Copyright (C) 2010 INRIA
#
# 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', ]
# the vs-capable box for PLCs
- def plc_boxes_spec (self):
- return [ ('vs64-1', 20), # how many plcs max in this box
+ def plc_vs_boxes_spec (self):
+ return [ ('vs64-1', 35), # how many plcs max in this box
+ ]
+
+ # the lxc-capable box for PLCs
+ def plc_lxc_boxes_spec (self):
+ return [ ('lxc64-1', 35), # how many plcs max in this box
]
- # vplc01 to 15
+ # vplc01 to 40
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,20) ] # 21
+ for i in range(1,41) ]
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 qemus 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)
def vnode_ips (self):
return [ ( 'vnode%02d'%i, # DNS name
'02:34:56:00:00:%02d'%i) # MAC address
- for i in range(1,5) ] # 21
+ for i in range(1,21) ]
# local network settings
def domain (self):