X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fconfig_default.py;h=a65eebada7db9d05ea73a5fea66d9c8278ec6ef6;hb=d2bd9d6de371cfd3970e5c0f3b73dc49b3c09cd4;hp=37a740fb67510e359d364ad1231317909aeb1595;hpb=a3050922573f1c5ce0275d36bf08f09b7a451f42;p=tests.git diff --git a/system/config_default.py b/system/config_default.py index 37a740f..a65eeba 100644 --- a/system/config_default.py +++ b/system/config_default.py @@ -1,3 +1,6 @@ +# Thierry Parmentelat +# Copyright (C) 2010 INRIA +# # a configuration module is expected: # (*) to define a config method # (*) that takes two arguments @@ -7,6 +10,21 @@ # values like 'hostname', 'ip' and the like are rewritten later with a TestPool object +domain="onelab.eu" + +### for the sfa dual setup +def login_base (index): + if index==1: return 'inria' + elif index==2: return 'princeton' + # index=3=>'sitea' 4=>'siteb' + else: return 'site%s'%chr(index+94) + +def sfa_root (index): + if index==1: return 'ple' + elif index==2: return 'plc' + else: return 'plx%s'%chr(index+94) + + def nodes(options,index): return [{'name':'node%d'%index, 'node_fields': {'hostname': 'deferred-nodename%d'%index, @@ -30,7 +48,6 @@ def all_nodenames (options,index): return [ node['name'] for node in nodes(options,index)] def users (options) : - domain="onelab.eu" return [ {'name' : 'pi', 'keynames' : [ 'key1' ], 'user_fields' : {'first_name':'PI', 'last_name':'PI', 'enabled':'True', @@ -75,9 +92,9 @@ def all_usernames (options): return [ user['name'] for user in users(options)] def sites (options,index): - return [ {'site_fields' : {'name':'mainsite', - 'login_base':'main', - 'abbreviated_name':'PLanettest', + return [ {'site_fields' : {'name':'main site for plc number %d'%index, + 'login_base':login_base(index), + 'abbreviated_name':'PlanetTest%d'%index, 'max_slices':100, 'url':'http://test.onelab.eu', }, @@ -85,7 +102,7 @@ def sites (options,index): 'city':'sophia', 'state':'fr', 'postalcode':'06600', - 'country':'france', + 'country':'France', }, 'users' : users(options), 'nodes': nodes(options,index), @@ -134,29 +151,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_pslc%d'%index, + return [ { 'slice_fields': {'name':'%s_pslc%d'%(login_base(index),i), 'instantiation':'plc-instantiated', - 'url':'http://foo%d@foo.com'%index, - 'description':'testslice number %d'%index, + 'url':'http://foo%d.com'%index, + 'description':'testslice number %d'%i, 'max_nodes':2, }, 'usernames' : [ 'pi','tech','techuser' ], 'nodenames' : all_nodenames(options,index), - 'initscriptname' : 'script%d'%index, - 'sitename' : 'main', + 'initscriptname' : 'script%d'%(((i-1)%2)+1), + 'sitename' : login_base(index), '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 +202,38 @@ def tcp_tests (options,index): return [ # local test { 'server_node': 'node1', - 'server_slice' : 'main_pslc1', + 'server_slice' : '%s_pslc1'%login_base(index), 'client_node' : 'node1', - 'client_slice' : 'main_pslc1', + 'client_slice' : '%s_pslc1'%login_base(index), 'port' : 2000, }] elif index == 2: return [ # remote test - { 'server_node': 'node1', - 'server_slice' : 'main_pslc1', + { 'server_node': 'node2', + 'server_slice' : '%s_pslc3'%login_base(index), 'client_node' : 'node2', - 'client_slice' : 'main_pslc2', + 'client_slice' : '%s_pslc4'%login_base(index), '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, expressed in grains +# 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+1} ) + counter += 1 + return leases + def plc (options,index) : return { 'name' : 'onetest%d'%index, @@ -193,12 +243,13 @@ def plc (options,index) : 'vservername': 'deferred-vservername', 'vserverip': 'deferred-vserverip', 'role' : 'root', + 'PLC_NAME' : 'Regression TestLab', 'PLC_ROOT_USER' : 'root@test.onelab.eu', 'PLC_ROOT_PASSWORD' : 'test++', - 'PLC_NAME' : 'Regression TestLab', + 'PLC_SLICE_PREFIX' : 'auto', 'PLC_SHORTNAME' : 'Rlab', 'PLC_MAIL_ENABLED':'false', - 'PLC_MAIL_SUPPORT_ADDRESS' : 'thierry.parmentelat@sophia.inria.fr', + 'PLC_MAIL_SUPPORT_ADDRESS' : 'thierry.parmentelat@inria.fr', 'PLC_DB_HOST' : 'deferred-myplc-hostname', 'PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq', 'PLC_API_HOST' : 'deferred-myplc-hostname', @@ -206,23 +257,25 @@ 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':300, + 'PLC_RESERVATION_GRANULARITY':1800, + 'PLC_OMF_ENABLED' : 'false', '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) : - if index==1: - root_auth='plc' - else: - root_auth='ple' + piuser='fake-pi%d'%index + regularuser='sfafakeuser%d'%index + slicename='fslc%d'%index return { - 'SFA_REGISTRY_ROOT_AUTH' : root_auth, - 'SFA_REGISTRY_LEVEL1_AUTH' : '', + 'SFA_REGISTRY_ROOT_AUTH' : sfa_root(index), + 'SFA_INTERFACE_HRN' : sfa_root(index), +# 'SFA_REGISTRY_LEVEL1_AUTH' : '', 'SFA_REGISTRY_HOST' : 'deferred-myplc-hostname', 'SFA_AGGREGATE_HOST': 'deferred-myplc-hostname', 'SFA_SM_HOST': 'deferred-myplc-hostname', @@ -232,57 +285,57 @@ def sfa (options,index) : 'SFA_PLC_DB_USER' : 'pgsqluser', 'SFA_PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq', 'SFA_PLC_URL' : 'deferred-myplc-api-url', - 'slices_sfa' : slices_sfa(options,index), - 'sfa_slice_xml' : sfa_slice_xml(options,index), - 'sfa_person_xml' : sfa_person_xml(options,index), - 'sfa_slice_rspec' : sfa_slice_rspec(options,index) + 'SFA_API_DEBUG': True, + 'sfa_slice_specs' : sfa_slice_specs(options,index,slicename,regularuser), + 'sfa_slice_xml' : sfa_slice_xml(options,index,piuser,slicename), + 'sfa_person_xml' : sfa_person_xml(options,index,regularuser), + 'sfa_slice_rspec' : sfa_slice_rspec(options,index), + 'login_base' : login_base(index), + 'piuser' : piuser, + 'regularuser':regularuser, + 'slicename' : slicename, + 'domain':domain, } -def slices_sfa (options,index): - return [ { 'slice_fields': {'name':'main_fslc1', +def sfa_slice_specs (options,index,slicename,regularuser): + return [ { 'slice_fields': {'name':'%s_%s'%(login_base(index),slicename), 'url':'http://foo%d@foo.com'%index, 'description':'SFA-testing', 'max_nodes':2, }, - 'usernames' : [ ('sfafakeuser1','key1') ], + 'usernames' : [ (regularuser,'key1') ], 'nodenames' : all_nodenames(options,index), - 'sitename' : 'main', + 'sitename' : login_base(index), }] -def sfa_slice_xml(options,index): - if index==1: - hrn='plc.main.fslc1' - researcher='plc.main.fake-pi1' - else: - hrn='ple.main.fslc1' - researcher='ple.main.fake-pi1' +def sfa_slice_xml(options,index,piuser,slicename): + prefix='%s.%s'%(sfa_root(index),login_base(index)) + hrn=prefix+'.'+slicename + researcher=prefix+'.'+piuser - return ["""%s"""%(hrn, researcher)] + return ['%s'%(hrn, researcher)] -def sfa_person_xml(options,index): - if index==1: - hrn='plc.main.sfafakeuser1' - else: - hrn='ple.main.sfafakeuser1' +def sfa_person_xml(options,index,regularuser): + prefix='%s.%s'%(sfa_root(index),login_base(index)) + hrn=prefix+'.'+regularuser + mail="%s@%s"%(regularuser,domain) + key=public_key - return ["""%s20101piadminplc.main"""%(hrn,hrn,public_key)] + return ['%(key)s20101piadmin%(prefix)s'%locals()] def sfa_slice_rspec(options,index): node_name='deferred' - if index==1: - netspec_name='\"plc\"' - else: - netspec_name='\"ple\"' - return { 'part1' : """""" + return { + 'part1' : '', } 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