X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fconfig_default.py;h=b0eabdbbb7de99105e8bbc9fbf8705c8cbe12b38;hb=5d45fc9b92d7ea2645986c91ef7d068a6ee55729;hp=9bd90d4ac633a38c92b1c4d167ff93b08208904e;hpb=88ce17543e3f87197e7d6fd792ea56d99b7d67c3;p=tests.git diff --git a/system/config_default.py b/system/config_default.py index 9bd90d4..b0eabdb 100644 --- a/system/config_default.py +++ b/system/config_default.py @@ -10,7 +10,9 @@ # values like 'hostname', 'ip' and the like are rewritten later with a TestPool object -domain="onelab.eu" +# so that sfa users get different mails whether they are based on pl or pg +pldomain="onelab.eu" +pgdomain="emulab.eu" ### for the sfa dual setup def login_base (index): @@ -74,14 +76,14 @@ def users (options) : 'user_fields' : {'first_name':'Admin', 'last_name':'Admin', 'enabled':'true', - 'email':'admin@%s'%domain, + 'email':'admin@%s'%pldomain, 'password':'testuseradmin'}, 'roles':['admin']}, {'name' : 'pi', 'key_names' : [ 'key_pi' ], 'user_fields' : {'first_name':'PI', 'last_name':'PI', 'enabled':'True', - 'email':'fake-pi1@%s'%domain, + 'email':'fake-pi1@%s'%pldomain, 'password':'testpi'}, 'roles':['pi']}, @@ -89,28 +91,28 @@ def users (options) : 'user_fields' : {'first_name':'PiTech', 'last_name':'PiTech', 'enabled':'true', - 'email':'fake-pi2@%s'%domain, + 'email':'fake-pi2@%s'%pldomain, 'password':'testusertech'}, 'roles':['pi','tech']}, {'name' : 'tech', 'key_names' : [ 'key_user' ], 'user_fields' : {'first_name':'Tech', 'last_name':'Tech', 'enabled':'true', - 'email':'fake-tech1@%s'%domain, + 'email':'fake-tech1@%s'%pldomain, 'password':'testtech'}, 'roles':['tech']}, {'name':'user', 'key_names' : [ 'key_user' ], 'user_fields' : {'first_name':'User', 'last_name':'User', 'enabled':'true', - 'email':'fake-user1@%s'%domain, + 'email':'fake-user1@%s'%pldomain, 'password':'testuser'}, 'roles':['user']}, {'name':'techuser', 'key_names' : [ 'key_user' ], 'user_fields' : {'first_name':'UserTech', 'last_name':'UserTech', 'enabled':'true', - 'email':'fake-tech2@%s'%domain, + 'email':'fake-tech2@%s'%pldomain, 'password':'testusertech'}, 'roles':['tech','user']}, @@ -126,7 +128,7 @@ def sites (options,index): 'login_base':login_base(index), 'abbreviated_name':'PlanetTest%d'%index, 'max_slices':100, - 'url':'http://test.%s'%domain, + 'url':'http://test.%s'%pldomain, 'latitude':float(latitude), 'longitude':float(longitude), }, @@ -340,18 +342,19 @@ def keys (options,index): initscript_by_name="""#!/bin/bash command=$1; shift slicename=$1; shift -stamp="the_script_name" -stampfile=/tmp/$stamp.stamp +stamp="initscript_by_name" +stampfile=/var/tmp/$stamp.stamp +date=$(date) -echo "Running initscript with command=$command and slicename=$slicename" +echo $date "Running initscript with command=$command and slicename=$slicename" function start () { - (echo Starting test initscript: $stamp on slicename $slicename ; date) >> $stampfile - 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 + (echo $date Starting test initscript: $stamp on slicename $slicename ; date) >> $stampfile + echo $date "This is the stdout of the sliver $slicename initscript $command (exp. start) pid=$$" + echo $date "This is the stderr of the sliver $slicename initscript $command (exp. start) pid=$$" 1>&2 } function stop () { - echo "Removing stamp $stampfile" + echo $date "Removing stamp $stampfile" rm -f $stampfile } function restart () { @@ -366,12 +369,12 @@ restart) restart ;; esac """ -initscript_by_code=initscript_by_name.replace("the_script_name","the_script_code") +initscript_by_code=initscript_by_name.replace("initscript_by_name","initscript_by_code") # one single initscript in the InitScripts table def initscripts(options,index): return [ { 'initscript_fields' : { 'enabled' : True, - 'name':'the_script_name', + 'name':'initscript_by_name', 'script' : initscript_by_name, }}, ] @@ -393,16 +396,17 @@ def slices (options,index): 'sitename' : login_base(index), 'owner' : 'pi', } - # 1st one has an initscript_code + # 1st one has an initscript by code if i%3==1: slice_spec['initscriptcode']=initscript_by_code - slice_spec['initscriptstamp']='the_script_code' - # 2nd one has an initscript (name) + slice_spec['initscriptstamp']='initscript_by_code' + # 2nd one has an initscript by name elif i%3==2: - slice_spec['initscriptname']='the_script_name' - slice_spec['initscriptstamp']='the_script_name' + slice_spec['initscriptname']='initscript_by_name' + slice_spec['initscriptstamp']='initscript_by_name' # 3rd one is omf-friendly else: + # potentially turned off with config_no_omf slice_spec ['omf-friendly'] = True return slice_spec # usual index is 1, additional plc's then get 2... @@ -483,6 +487,7 @@ def plc (options,index) : 'PLC_ROOT_USER' : 'root@test.onelab.eu', 'PLC_ROOT_PASSWORD' : 'test++', 'PLC_SLICE_PREFIX' : 'auto', + 'PLC_HRN_ROOT': sfa_root(index), 'PLC_SHORTNAME' : 'Rlab', 'PLC_MAIL_ENABLED':'false', 'PLC_MAIL_SUPPORT_ADDRESS' : 'thierry.parmentelat@inria.fr', @@ -536,26 +541,31 @@ def sfa (options,index) : for rspec_style in options.rspec_styles ] } -# rspecstyle is 'pl' for sfav1 or 'pg' for pgv2 +# rspec_style is 'pl' for sfav1 or 'pg' for pgv2 def test_auth_sfa_spec (options,index,rspec_style): + domain=pldomain if rspec_style=='pl' else pgdomain # the auth/site part per se login_base=sfa_login_base(index,rspec_style) hrn_prefix='%s.%s'%(sfa_root(index),login_base) def full_hrn(x): return "%s.%s"%(hrn_prefix,x) def full_mail(x): return "%s@test.%s"%(x,domain) - # 2 users + # 2 users; we use dashes on purpose, as it might show up in email addresses + pi_alias = 'pi-user' + user_alias = 'regular-user' +# pi_alias = 'pi' +# user_alias = 'user' + # pi_spec = { - 'name': 'pi', - 'email': full_mail ('piuser'), + 'name': pi_alias, + 'email': full_mail (pi_alias), 'key_name': 'key_sfapi', } - user_hrn = full_hrn ('us') user_spec = { - 'name': 'us', - 'email': full_mail ('regularuser'), + 'name': user_alias, + 'email': full_mail (user_alias), 'key_name': 'key_sfauser', - 'add_options': [ '--extra',"first_name=Fake", + 'register_options': [ '--extra',"first_name=Fake", '--extra',"last_name=SFA-style-%s"%rspec_style, ], 'update_options': [ '--extra',"enabled=true", @@ -564,7 +574,7 @@ def test_auth_sfa_spec (options,index,rspec_style): slice_spec = { 'name': 'sl', - 'add_options': [ '--researchers', user_hrn, + 'register_options': [ '--researchers', full_hrn (user_alias), # xxx '--extra', "description=SFA-testing-%s"%rspec_style, '--extra', "url=http://slice%d.test.onelab.eu/"%index,