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
run lxc-enter-namespace with --noseclabel
[tests.git]
/
system
/
LocalSubstrate.inria.py
diff --git
a/system/LocalSubstrate.inria.py
b/system/LocalSubstrate.inria.py
index
a4f1359
..
2562d67
100755
(executable)
--- a/
system/LocalSubstrate.inria.py
+++ b/
system/LocalSubstrate.inria.py
@@
-1,6
+1,7
@@
-#!/usr/bin/python -u
+#!/usr/bin/python3 -u
+# -*- python3 -*-
# Thierry Parmentelat <thierry.parmentelat@inria.fr>
# Thierry Parmentelat <thierry.parmentelat@inria.fr>
-# Copyright (C) 201
0
INRIA
+# Copyright (C) 201
5
INRIA
#
# this is only an example file
# the actual file is installed in your testmaster box as /root/LocalTestResources.py
#
# this is only an example file
# the actual file is installed in your testmaster box as /root/LocalTestResources.py
@@
-20,9
+21,7
@@
class OnelabSubstrate (Substrate):
# the experimental lxc-based build box
def build_lxc_boxes_spec (self):
# the experimental lxc-based build box
def build_lxc_boxes_spec (self):
-# velvet needs attention
-# return [ 'liquid', 'reed', 'velvet' ]
-# reed out of the pool, liquid only used for the last f18 build
+# liquid only used for the last f18 build
return [ 'buzzcocks', 'liquid' ]
# the lxc-capable box for PLCs
return [ 'buzzcocks', 'liquid' ]
# the lxc-capable box for PLCs
@@
-35,7
+34,7
@@
class OnelabSubstrate (Substrate):
# vplc01 to 40
def vplc_ips (self):
# 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) ]
'unused') # MAC address
for i in range(1,41) ]
@@
-65,8
+64,8
@@
class OnelabSubstrate (Substrate):
# the nodes pool has a MAC address as user-data (3rd elt in tuple)
def vnode_ips (self):
# 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
for i in range(1,21) ]
# local network settings