X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fconfig_default.py;h=1f564fcbe454bb2b2de339adf0c4fb8dd0c679e0;hb=c3ac22516b3770b16764a3f7d5b83f73365c7fc7;hp=fca0d68f70728ccac493b73d2462c14960182298;hpb=7373c3fb14653a0b53db7c9e76ca159bb52fa37f;p=tests.git diff --git a/system/config_default.py b/system/config_default.py index fca0d68..1f564fc 100644 --- a/system/config_default.py +++ b/system/config_default.py @@ -312,16 +312,16 @@ def sfa (options,index) : 'SFA_PLC_URL' : 'deferred-myplc-api-url', 'SFA_API_DEBUG': True, # details of the slices to create - 'sfa_slice_specs' : [ sfa_slice_spec(options,index,rspecmode) - for rspecmode in ['pl','pg']], + 'sfa_slice_specs' : [ sfa_slice_spec(options,index,rspec_style) + for rspec_style in options.rspec_styles ] } # subindex is 0 (pl slice) or 1 (pg slice) -def sfa_slice_spec (options,index,rspecmode): +def sfa_slice_spec (options,index,rspec_style): the_login_base=login_base(index) piuser='fake-pi%d'%index - regularuser='sfauser%d%s'%(index,rspecmode) - slicename='slsfa%d%s'%(index,rspecmode) + regularuser='sfauser%d%s'%(index,rspec_style) + slicename='slsfa%d%s'%(index,rspec_style) prefix='%s.%s'%(sfa_root(index),the_login_base) hrn=prefix+'.'+slicename person_hrn=prefix+'.'+regularuser @@ -352,7 +352,7 @@ last_name="Sfa" name="%(hrn)s" type="user"> 'slicename' : slicename, 'slice_add_xml' : slice_add_xml, 'slice_person_xml' : slice_person_xml, - 'rspecmode':rspecmode, + 'rspec_style':rspec_style, }