X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fconfig_default.py;h=8fd549aac56e19d0e7290850b3aba506e9c7e96f;hb=5148b9f217612f5044034a3f2efd7a69a9a25529;hp=ea51da686501cc8f0f514704726dde957bd06d10;hpb=ff1fa20416428477d21e053296517839081e316f;p=tests.git diff --git a/system/config_default.py b/system/config_default.py index ea51da6..8fd549a 100644 --- a/system/config_default.py +++ b/system/config_default.py @@ -1,5 +1,6 @@ +# -*- python3 -*- # Thierry Parmentelat -# Copyright (C) 2010 INRIA +# Copyright (C) 2015 INRIA # # a configuration module is expected: # (*) to define a config method @@ -518,7 +519,7 @@ def plc (options,index) : 'initscripts': initscripts(options,index), 'slices' : slices(options,index), 'tcp_specs' : tcp_specs(options,index), - 'sfa' : sfa(options,index), + 'sfa' : sfa(options,index), 'leases' : leases (options, index), # big distros need more time to install nodes 'ssh_node_boot_timers': (40,38), @@ -619,7 +620,7 @@ def config (plc_specs, options): return result ### for creating a sample config interactively -def sample_test_plc (): +def sample_test_plc_spec (): class Void: pass options = Void() @@ -629,8 +630,8 @@ def sample_test_plc (): return config([], options)[0] if __name__ == '__main__': - s = sample_test_plc() - print 'Sample plc_spec has the following keys' + s = sample_test_plc_spec() + print('Sample plc_spec has the following keys') for k in sorted(s.keys()): - print k + print(k)