X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fconfig_default.py;h=9b358e1bae0c2f7456bd4073b7d52aba593a9943;hb=d933160f1c55c769a0f93cdd953e11a3fc57753f;hp=28f5e02ded9e9470c268ecba09c0222887f40836;hpb=a3630d61fae62ab1d32317f0cda33e3af6ae2b0d;p=tests.git diff --git a/system/config_default.py b/system/config_default.py index 28f5e02..9b358e1 100644 --- a/system/config_default.py +++ b/system/config_default.py @@ -7,6 +7,8 @@ # values like 'hostname', 'ip' and the like are rewritten later with a TestPool object +reservation_granularity=180 + def nodes(options,index): return [{'name':'node%d'%index, 'node_fields': {'hostname': 'deferred-nodename%d'%index, @@ -79,7 +81,7 @@ def sites (options,index): 'login_base':'main', 'abbreviated_name':'PLanettest', 'max_slices':100, - 'url':'http://testbox.onelab.eu', + 'url':'http://test.onelab.eu', }, 'address_fields' : {'line1':'route des lucioles', 'city':'sophia', @@ -134,29 +136,48 @@ def initscripts(options,index): initscripts= [ { 'initscript_fields' : { 'enabled' : True, 'name':'script1', - 'script' : '#! /bin/sh\n (echo Starting test initscript: Stage 1; date) > /tmp/script1.stamp \n ', + 'script' : """#! /bin/sh +(echo Starting test initscript: script1; date) >> /tmp/script1.stamp +# expected to be 'start' +command=$1; shift +# get slice name +slicename=$1; shift +echo "This is the stdout of the sliver $slicename initscript $command (exp. start) pid=$$" +echo "This is the stderr of the sliver $slicename initscript $command (exp. start) pid=$$" 1>&2 +""", }}, { 'initscript_fields' : { 'enabled' : True, 'name':'script2', - 'script' : '#! /bin/sh\n (echo Starting test initscript: Stage 2; date) > /tmp/script2.stamp \n ', + 'script' : """#! /bin/sh +(echo Starting loop-forever test initscript: script2; date) >> /tmp/script2.stamp +# expected to be 'start' +command=$1; shift +# get slice name +slicename=$1; shift +while true; do +echo "This is the stdout of the loop-for-ever sliver initscript $slicename $command (exp. start) $$" +echo "This is the stderr of the loop-for-ever sliver initscript $slicename $command (exp. start) $$" 1>&2 +sleep 10 +done +""", }}, ] return initscripts def slices (options,index): - return [ { 'slice_fields': {'name':'main_slicetest%d'%index, + return [ { 'slice_fields': {'name':'main_pslc%d'%i, 'instantiation':'plc-instantiated', - 'url':'http://foo%d@foo.com'%index, - 'description':'testslice number %d'%index, + 'url':'http://foo.com', + 'description':'testslice number %d'%i, 'max_nodes':2, }, 'usernames' : [ 'pi','tech','techuser' ], 'nodenames' : all_nodenames(options,index), - 'initscriptname' : 'script%d'%index, + 'initscriptname' : 'script%d'%i, 'sitename' : 'main', 'owner' : 'pi', - }] + } for i in range (2*index-1,2*index+1) ] def all_slicenames (options,index): return [ slice['slice_fields']['name'] for slice in slices(options,index)] @@ -166,24 +187,38 @@ def tcp_tests (options,index): return [ # local test { 'server_node': 'node1', - 'server_slice' : 'main_slicetest1', + 'server_slice' : 'main_pslc1', 'client_node' : 'node1', - 'client_slice' : 'main_slicetest1', + 'client_slice' : 'main_pslc1', 'port' : 2000, }] elif index == 2: return [ # remote test { 'server_node': 'node1', - 'server_slice' : 'main_slicetest1', + 'server_slice' : 'main_pslc1', 'client_node' : 'node2', - 'client_slice' : 'main_slicetest2', + 'client_slice' : 'main_pslc2', 'port' : 4000, }, ] else: return [] - + +# the semantic for 't_from' and 't_until' here is: +# if they are smaller than one year, they are relative to the current time +# otherwise they are absolute +def leases (options, index): + leases=[] + counter=0 + slices=all_slicenames(options,index) + slice_sequence = slices[:1] + slices + [None,] + for iterator in range(12): + for slice in slice_sequence: + leases.append ( {'slice' : slice, 't_from':counter,'t_until':counter+reservation_granularity} ) + counter += reservation_granularity + return leases + def plc (options,index) : return { 'name' : 'onetest%d'%index, @@ -197,7 +232,7 @@ def plc (options,index) : 'PLC_ROOT_PASSWORD' : 'test++', 'PLC_NAME' : 'Regression TestLab', 'PLC_SHORTNAME' : 'Rlab', - 'PLC_MAIL_ENABLED':'true', + 'PLC_MAIL_ENABLED':'false', 'PLC_MAIL_SUPPORT_ADDRESS' : 'thierry.parmentelat@sophia.inria.fr', 'PLC_DB_HOST' : 'deferred-myplc-hostname', 'PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq', @@ -206,12 +241,15 @@ def plc (options,index) : 'PLC_BOOT_HOST' : 'deferred-myplc-hostname', 'PLC_NET_DNS1' : 'deferred-dns-1', 'PLC_NET_DNS2' : 'deferred-dns-2', + 'PLC_RESERVATION_GRANULARITY':reservation_granularity, + 'PLC_OMF_ENABLED' : True, 'sites' : sites(options,index), 'keys' : keys(options,index), 'initscripts': initscripts(options,index), 'slices' : slices(options,index), 'tcp_test' : tcp_tests(options,index), 'sfa' : sfa(options,index), + 'leases' : leases (options, index), } def sfa (options,index) : @@ -238,7 +276,7 @@ def sfa (options,index) : } def slices_sfa (options,index): - return [ { 'slice_fields': {'name':'main_sfaslicea1', + return [ { 'slice_fields': {'name':'main_fslc1', 'url':'http://foo%d@foo.com'%index, 'description':'SFA-testing', 'max_nodes':2, @@ -250,10 +288,10 @@ def slices_sfa (options,index): def sfa_slice_xml(options,index): if index==1: - hrn='plc.main.sfaslicea1' + hrn='plc.main.fslc1' researcher='plc.main.fake-pi1' else: - hrn='ple.main.sfaslicea1' + hrn='ple.main.fslc1' researcher='ple.main.fake-pi1' return ["""%s"""%(hrn, researcher)] @@ -283,5 +321,5 @@ def sfa_slice_rspec(options,index): def config (plc_specs,options): result=plc_specs for i in range (options.size): - result += [ plc(options,i+1) ] + result.append(plc(options,i+1)) return result