X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fconfig_default.py;h=288b613044e347eec37b1e95f47686c1949066f8;hb=1133022b1489e02c9fa3c08fb3f0c6d9cf87be7c;hp=df41babe6f12374a82dd6d38d9218d35357af145;hpb=f27bb478ee8d4f7f8b1731e87dcec3a9eb496c73;p=tests.git diff --git a/system/config_default.py b/system/config_default.py index df41bab..288b613 100644 --- a/system/config_default.py +++ b/system/config_default.py @@ -14,16 +14,16 @@ domain="onelab.eu" ### for the sfa dual setup def login_base (index): - if index==1: return 'inria' - elif index==2: return 'princeton' + if index==1: return 'inri' + elif index==2: return 'princ' # 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) - + # use plt (planetlab test) instead of pl + # otherwise a triangular test ends up with 'plc' + # plta, pltb, ... + return 'plt%s'%chr(index+96) def nodes(options,index): return [{'name':'node%d'%index, @@ -144,14 +144,52 @@ BO+VyPNWF+kDNI8mSUwi7jLW6liMdhNOmDaSX0+0X8CHtK898xM= -----END RSA PRIVATE KEY----- """ +### another keypair for the SFA user +public_key2="""ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQLvh5LkrjyLIr9UJznTJHMnqjdqzRdc9ekVmI9bx/5X4flnGtPBsr6bK/CPXmWjS2Vw0QOxi1NM45qkQJZXxroS0aehCCrvJRHgp/LOZykWCyNKqVopq9w0kH4jw1KFGIuwWROpOcMq2d/kAwyr6RV/W66KNVqu2XDiNOPJLcuZCuKrH++q3fPyP2zHSJ/irew7vwqIXbDSnVvvyRXYgc9KlR57L4BWthXcUofHlje8wKq7nWBQIUslYtJDryJg5tBvJIFfCFGmWZy0WJlGJd+yppI5jRvt9c6n9HyJKN22lUBTaTaDFvo+Xu5GEazLKG/v8h/o5WpxrrE6Y3TKeX user@test.onelab.eu +""" + +private_key2=""" +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEA0C74eS5K48iyK/VCc50yRzJ6o3as0XXPXpFZiPW8f+V+H5Zx +rTwbK+myvwj15lo0tlcNEDsYtTTOOapECWV8a6EtGnoQgq7yUR4KfyzmcpFgsjSq +laKavcNJB+I8NShRiLsFkTqTnDKtnf5AMMq+kVf1uuijVartlw4jTjyS3LmQriqx +/vqt3z8j9sx0if4q3sO78KiF2w0p1b78kV2IHPSpUeey+AVrYV3FKHx5Y3vMCqu5 +1gUCFLJWLSQ68iYObQbySBXwhRplmctFiZRiXfsqaSOY0b7fXOp/R8iSjdtpVAU2 +k2gxb6Pl7uRhGsyyhv7/If6OVqca6xOmN0ynlwIDAQABAoIBADZnwAmzPmEO5vkz +7DzYnPYcTA6CCiHnPt1A8Pwo9C0cZXyNzYFvTs6IEW15QwIDGvl4AHL4brmUZjyN +saAfBIgAJBBiTARLAgqO5kFcE5FnSrTnrJjUWMo0ydYkmoVt1vj7nzXX8BGG8PZ0 +JoRZx7mmGhLRjzXpKJQsXq+ohtzlrSoOzkx9jKqCOerhsZGBAIMl/w+gfePWoU6q +Q/NPHM0ckgvzNRs7x+AMcCtIn+xZIBzbLTKpoEI3dIvMf46ghAG5mTc08OJjqHaS +faTUyp828teAVLtWxAAv2JKcplEnjsDNU8KOGIFkUkwLNTTvwc0pCVYwyDKVxtl3 +Hv76T5ECgYEA6wiun6IHfY5a4Wcn+vrUsrt3atikiBMiXvZk7ZmU5HKc72+c4mVh +frmwF8F355ncI3w63/3CKfP+X4yvsHoR+ps27t2hMMfGco7j3bMDHHpo9n04/1ZX +pYP2RlPz4EKAhD2Wi0sgTsxchwrL42qkuolmzT4TWN32xjF2ZwhCDh8CgYEA4sEf +VY+jVrMNHoHG/v1UN8nBzF5g6PwHtoo4GrFd4pMb9wo6LX4ib4FGRQfSjZ4kQ0KB +Qxrl7xLw4GlYKnYqAqgZ1peb7JN7k5Yq1Drqi61ZZxvdQ2BbO7dx22Bb3VwsKA97 +DUcWUdKLVw2gU7beMYYBNMliw/E5Gx12Mqvnx4kCgYEAyQSf9cArD+PVLrt/olUt +3cAgnq2z6v4Sg43RPLYCdnDgcJjRYYC8JhrC1U6PMvKRKXhzEmiCzEb25Nn62cFN +5z0heqLr3kC/JfO4SEF3A8BeTZNEUH6Ub+exluzuxHucV34lZ/VVKI/5Azbksxje +0vv5hMj22ybcjR542h5iAJkCgYAsFw8HrPk+l2wanXNbC1j/y/whx8wiITdCuBd2 +oTw3HRGX9GYhiGAbvFA0hfPb038LkPffW3CQDufFStZ40ycSAyua/Tm1Q2wI428K +ezY12IwEr3dTbX3v25iI5nCWVyDC3Ve42jStzjmHwL+G54zGpl6/q9THcrT+37im +26QiuQKBgQCTUDGKLqQ+QM8dAl6IZpz+oExdDCWwCNjTMH83tz1Rwoc+npW7z2ZC +D/FseVOmS9MqJkgCap5pr4m1Qj5YciZNteIHdkIbD1yDoPaW1NvlOnxzVBQXK3HD +rUck4dxa0t30wUFK0XVQjNEArXqvU23EB8Z7bQQMRx0yhd4pF5k29Q== +-----END RSA PRIVATE KEY----- +""" + def keys (options,index): return [ {'name': 'key1', 'private' : private_key, 'key_fields' : {'key_type':'ssh', - 'key': public_key}} + 'key': public_key}}, + {'name': 'key2', + 'private' : private_key2, + 'key_fields' : {'key_type':'ssh', + 'key': public_key2}} + ] - ############################## initscripts initscript_by_name="""#!/bin/bash command=$1; shift @@ -196,7 +234,7 @@ def initscripts(options,index): # one has an initscript code, the other one an initscript name def slices (options,index): def theslice (i): - slice_spec = { 'slice_fields': {'name':'%s_pslc%d'%(login_base(index),i), + slice_spec = { 'slice_fields': {'name':'%s_slpl%d'%(login_base(index),i), 'instantiation':'plc-instantiated', 'url':'http://foo%d.com'%index, 'description':'testslice number %d'%i, @@ -226,18 +264,18 @@ def tcp_tests (options,index): return [ # local test { 'server_node': 'node1', - 'server_slice' : '%s_pslc1'%login_base(index), + 'server_slice' : '%s_slpl1'%login_base(index), 'client_node' : 'node1', - 'client_slice' : '%s_pslc1'%login_base(index), + 'client_slice' : '%s_slpl1'%login_base(index), 'port' : 2000, }] elif index == 2: return [ # remote test { 'server_node': 'node2', - 'server_slice' : '%s_pslc3'%login_base(index), + 'server_slice' : '%s_slpl3'%login_base(index), 'client_node' : 'node2', - 'client_slice' : '%s_pslc4'%login_base(index), + 'client_slice' : '%s_slpl4'%login_base(index), 'port' : 4000, }, ] @@ -260,9 +298,10 @@ def leases (options, index): def plc (options,index) : return { - 'name' : 'onetest%d'%index, + 'index' : index, + 'name' : 'plctest%d'%index, # as of yet, not sure we can handle foreign hosts, but this is required though - 'hostname' : 'deferred-myplc-hostbox-%d'%index, + 'host_box' : 'deferred-myplc-hostbox-%d'%index, # set these two items to run within a vserver 'vservername': 'deferred-vservername', 'vserverip': 'deferred-vserverip', @@ -275,7 +314,7 @@ def plc (options,index) : 'PLC_MAIL_ENABLED':'false', 'PLC_MAIL_SUPPORT_ADDRESS' : 'thierry.parmentelat@inria.fr', 'PLC_DB_HOST' : 'deferred-myplc-hostname', - 'PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq', +# 'PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq', 'PLC_API_HOST' : 'deferred-myplc-hostname', 'PLC_WWW_HOST' : 'deferred-myplc-hostname', 'PLC_BOOT_HOST' : 'deferred-myplc-hostname', @@ -294,75 +333,72 @@ def plc (options,index) : 'leases' : leases (options, index), } +# NOTE: SFA currently has SFA_AGGREGATE_API_VERSION=2 baked into the code def sfa (options,index) : - piuser='fake-pi%d'%index - regularuser='sfafakeuser%d'%index - slicename='fslc%d'%index return { + # the default is to use AMs in the various aggregates.xml + # stack config_sfamesh to point to SMs instead + 'neighbours-port':12346, + ## global sfa-config-tty stuff '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', + 'SFA_PLC_URL' : 'deferred-myplc-api-url', 'SFA_PLC_USER' : 'root@test.onelab.eu', 'SFA_PLC_PASSWORD' : 'test++', - 'SFA_PLC_DB_HOST':'deferred-myplc-hostname', - 'SFA_PLC_DB_USER' : 'pgsqluser', - 'SFA_PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq', - 'SFA_PLC_URL' : 'deferred-myplc-api-url', - '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, - # the default is to use AMs in the various aggregates.xml - # stack config_sfamesh to point to SMs instead - 'neighbours-port':12346, +# use -c sfadebug to increment this one + 'SFA_API_LOGLEVEL': 1, + # details of the slices to create + 'sfa_slice_specs' : [ sfa_slice_spec(options,index,rspec_style) + for rspec_style in options.rspec_styles ] } -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' : [ (regularuser,'key1') ], - 'nodenames' : all_nodenames(options,index), - 'sitename' : login_base(index), - }] - -def sfa_slice_xml(options,index,piuser,slicename): - prefix='%s.%s'%(sfa_root(index),login_base(index)) +# subindex is 0 (pl slice) or 1 (pg slice) +def sfa_slice_spec (options,index,rspec_style): + the_login_base=login_base(index) + piuser='fake-pi%d'%index + 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 - researcher=prefix+'.'+piuser - - return ['%s'%(hrn, researcher)] - -def sfa_person_xml(options,index,regularuser): - prefix='%s.%s'%(sfa_root(index),login_base(index)) - hrn=prefix+'.'+regularuser + user_hrn=prefix+'.'+regularuser + pi_hrn=prefix+'.'+piuser + key=public_key2 mail="%s@%s"%(regularuser,domain) - key=public_key + person_record_xml =\ +''' +%(key)s +user +tech +'''%locals() + slice_record_xml =\ +''' +%s +'''%(hrn, user_hrn) - return ['%(key)s20101piadmin%(prefix)s'%locals()] -def sfa_slice_rspec(options,index): - node_name='deferred' + return { 'slice_fields': {'name':'%s_%s'%(the_login_base,slicename), + 'url':'http://foo%d@foo.com'%index, + 'description':'SFA-testing', + 'max_nodes':2, + }, + 'login_base' : the_login_base, + 'piuser' : piuser, + 'regularuser':regularuser, + 'domain':domain, + 'usernames' : [ (regularuser,'key2') ], + 'nodenames' : all_nodenames(options,index), + 'sitename' : the_login_base, + 'slicename' : slicename, + 'slice_record' : slice_record_xml, + 'person_record' : person_record_xml, + 'rspec_style':rspec_style, + } + - return { - 'part1' : '', - } - def config (plc_specs,options): result=plc_specs for i in range (options.size):