git://git.onelab.eu
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configurable timers for ssh_node*
[tests.git]
/
system
/
LocalSubstrate.inria.py
diff --git
a/system/LocalSubstrate.inria.py
b/system/LocalSubstrate.inria.py
index
836d1d1
..
56fa025
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
#
# Thierry Parmentelat <thierry.parmentelat@inria.fr>
# Copyright (C) 2010 INRIA
#
@@
-15,30
+15,37
@@
from Substrate import Substrate
# domain name .pl.sophia.inria.fr is implicit on our network
class OnelabSubstrate (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', ]
# the vs-capable box for PLCs
# 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
def vplc_ips (self):
return [ ( 'vplc%02d'%i, # DNS name
-# '02:34:56:00:ee:%02d'%i) # MAC address
'unused') # MAC address
'unused') # MAC address
- for i in range(1,
2
1) ]
+ for i in range(1,
4
1) ]
def qemu_boxes_spec (self):
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',
1), # 4 cores, 8Gb
+ ('kvm64-5',
1), # 2 cores, 4Gb
+ ('kvm64-6',
2), # 2 cores, 4Gb
]
# the nodes pool has a MAC address as user-data (3rd elt in tuple)
]
# the nodes pool has a MAC address as user-data (3rd elt in tuple)
@@
-52,12
+59,15
@@
class OnelabSubstrate (Substrate):
return 'pl.sophia.inria.fr'
def network_settings (self):
return 'pl.sophia.inria.fr'
def network_settings (self):
- return { 'interface_fields:gateway':'138.96.112.250',
- 'interface_fields:network':'138.96.112.0',
- 'interface_fields:broadcast':'138.96.119.255',
- 'interface_fields:netmask':'255.255.248.0',
- 'interface_fields:dns1': '138.96.112.1',
- 'interface_fields:dns2': '138.96.112.2',
+ return { 'interface_fields:gateway': '138.96.112.250',
+ 'route_fields:next_hop': '138.96.112.250',
+ 'interface_fields:network': '138.96.112.0',
+ 'interface_fields:broadcast': '138.96.119.255',
+ 'interface_fields:netmask': '255.255.248.0',
+ 'interface_fields:dns1': '138.96.112.1',
+ 'interface_fields:dns2': '138.96.112.2',
+ 'node_fields_nint:dns': '138.96.112.1,138.96.112.2',
+ 'ipaddress_fields:netmask': '255.255.248.0',
}
# the hostname for the testmaster - in case we'd like to run this remotely
}
# the hostname for the testmaster - in case we'd like to run this remotely