X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fconfig_default.py;h=4deba9a85ae9d80bfbf076063a3ae998b8d7dbf2;hb=ae4bbca7124dcbd74896aacf6f5fc8b6e19d0ca3;hp=3a840fec8cf096c0c6b8a2d974ff2714aa002ad4;hpb=4f186a149b65ff9b108e22b6f897be1b00650f1c;p=tests.git diff --git a/system/config_default.py b/system/config_default.py index 3a840fe..4deba9a 100644 --- a/system/config_default.py +++ b/system/config_default.py @@ -11,9 +11,7 @@ # values like 'hostname', 'ip' and the like are rewritten later with a TestPool object -# 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): @@ -22,14 +20,15 @@ def login_base (index): # index=3=>'sitea' 4=>'siteb' else: return 'site{}'.format(chr(index+94)) -def sfa_login_base (index, rspec_style): - return "sfa{}".format(rspec_style) +# only one rspec style +def sfa_login_base (index): + return "sfa" def sfa_root (index): # use plt (planetlab test) instead of pl # otherwise a triangular test ends up with 'plc' # plta, pltb, ... - return 'plt{}'.format(chr(index+96)) + return '{}'.format(chr(index+96)) def nodes(options, index): return [{'name' : 'node{}'.format(index), @@ -67,8 +66,9 @@ def nodes(options, index): 'next_hop' : 'xxx-deferred-xxx', }, 'bootmedium_options' : [ 'serial', 'no-hangcheck', 'systemd-debug' ], - # provision for bonding - 'tags' : {}, + 'tags' : { + # no tags anymore + }, # boot cd settings # we should have tags here instead of the hard-wired # options set for GetBootMedium in TestNode.py @@ -389,7 +389,7 @@ def initscripts(options, index): # returns 3 slices # 1 has an initscript code # 2 has an initscript name -# 3 is an omf-friendly slice +# 3 used to be an omf-friendly slice but this is now deprecated def slices (options, index): def theslice (i): slice_spec = { 'slice_fields': {'name' : '{}_sl{}'.format(login_base(index),i), @@ -411,10 +411,11 @@ def slices (options, index): elif i%3 == 2: slice_spec['initscriptname'] = 'initscript_by_name' slice_spec['initscriptstamp'] = 'initscript_by_name' - # 3rd one is omf-friendly + # 3rd one - not omf-friendly any longer else: - # potentially turned off with config_no_omf - slice_spec ['omf-friendly'] = True + # omf-friendly slices is a deprecated feature + # slice_spec ['omf-friendly'] = True + pass return slice_spec # usual index is 1, additional plc's then get 2... # so index=1 -> 1 - 2 - 3 @@ -512,8 +513,10 @@ def plc (options, index) : 'PLC_NET_DNS2' : 'deferred-dns-2', 'PLC_RESERVATION_GRANULARITY':1800, 'PLC_VSYS_DEFAULTS' : ' , vif_up, vif_down, fd_tuntap, promisc, ', - 'PLC_OMF_ENABLED' : 'true', - 'PLC_OMF_XMPP_SERVER' : 'deferred-myplc-hostname', +# omf-friendly slices is a deprecated feature +# 'PLC_OMF_ENABLED' : 'true', +# 'PLC_OMF_XMPP_SERVER' : 'deferred-myplc-hostname', + 'PLC_OMF_ENABLED' : 'false', }, 'expected_vsys_tags': [ 'vif_up', 'vif_down', 'fd_tuntap', 'promisc', ], # minimal config so the omf plugins actually trigger @@ -543,9 +546,6 @@ def sfa (options, index) : 'SFA_INTERFACE_HRN' : sfa_root(index), 'SFA_REGISTRY_HOST' : 'deferred-myplc-hostname', 'SFA_AGGREGATE_HOST' : 'deferred-myplc-hostname', - 'SFA_SM_HOST' : 'deferred-myplc-hostname', -# turning off SM and using only AM; be explicit on this as the default has changed in the code - 'SFA_SM_ENABLED' : 'false', 'SFA_PLC_URL' : 'deferred-myplc-api-url', 'SFA_PLC_USER' : 'root@test.onelab.eu', 'SFA_PLC_PASSWORD' : 'test++', @@ -556,15 +556,14 @@ def sfa (options, index) : 'SFA_AGGREGATE_ENABLED' : 'true', }, # details of the slices to create - 'auth_sfa_specs' : [ test_auth_sfa_spec(options, index,rspec_style) - for rspec_style in options.rspec_styles ] + 'auth_sfa_specs' : [ test_auth_sfa_spec(options, index) ] } -# 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 +# rspec_style used to be 'pl' for sfav1 or 'pg' for pgv2 - OBSOLETE +def test_auth_sfa_spec (options, index): + domain = pldomain # the auth/site part per se - login_base = sfa_login_base(index,rspec_style) + login_base = sfa_login_base(index) hrn_prefix = '{}.{}'.format(sfa_root(index),login_base) def full_hrn(x): return "{}.{}".format(hrn_prefix,x) def full_mail(x): return "{}@test.{}".format(x,domain) @@ -585,7 +584,7 @@ def test_auth_sfa_spec (options, index, rspec_style): 'email': full_mail (user_alias), 'key_name': 'key_sfauser', 'register_options': [ '--extra',"first_name=Fake", - '--extra',"last_name=SFA-style-{}".format(rspec_style), + '--extra',"last_name=SFA", ], 'update_options': [ '--extra',"enabled=true", ], @@ -594,10 +593,9 @@ def test_auth_sfa_spec (options, index, rspec_style): slice_spec = { 'name': 'sl', 'register_options': [ '--researchers', full_hrn (user_alias), - # xxx - '--extra', "description=SFA-testing-{}".format(rspec_style), - '--extra', "url=http://slice{}.test.onelab.eu/".format(index), - '--extra', "max_nodes=2", + '--extra', "description=SFA-testing", + '--extra', "url=http://slice{}.test.onelab.eu/".format(index), + '--extra', "max_nodes=2", ], 'key_name': 'key_sfauser', 'nodenames': all_nodenames(options, index), @@ -605,13 +603,12 @@ def test_auth_sfa_spec (options, index, rspec_style): # we're already in a dedicated site/authority so no need to encumber with odd names - return { #'hrn_prefix': hrn_prefix, + return { 'login_base' : login_base, - 'domain':domain, - 'rspec_style':rspec_style, - 'pi_spec': pi_spec, - 'user_spec': user_spec, - 'slice_spec': slice_spec, + 'domain' : domain, + 'pi_spec' : pi_spec, + 'user_spec' : user_spec, + 'slice_spec' : slice_spec, } @@ -628,7 +625,6 @@ def sample_test_plc_spec (): options = Void() options.size = 1 - options.rspec_styles = ['pg'] return config([], options)[0]