}},
]
-# always return 2 slices
-# one has an initscript code, the other one an initscript name
+# returns 3 slices
+# 1 has an initscript code
+# 2 has an initscript name
+# 3 is an omf-friendly slice
def slices (options,index):
def theslice (i):
slice_spec = { 'slice_fields': {'name':'%s_sl%d'%(login_base(index),i),
'sitename' : login_base(index),
'owner' : 'pi',
}
- # odd one has an initscript_code
- if i%2==1:
+ # 1st one has an initscript_code
+ if i%3==1:
slice_spec['initscriptcode']=initscript_by_code
slice_spec['initscriptstamp']='the_script_code'
- # even one has an initscript (name)
- else:
+ # 2nd one has an initscript (name)
+ elif i%3==2:
slice_spec['initscriptname']='the_script_name'
slice_spec['initscriptstamp']='the_script_name'
+ # 3rd one is omf-friendly
+ else:
+ slice_spec ['omf-friendly'] = True
return slice_spec
- return [ theslice(i) for i in range (2*index-1,2*index+1) ]
+ # usual index is 1, additional plc's then get 2...
+ # so index=1 -> 1 - 2 - 3
+ # index=2 -> 4 - 5 - 6
+ # 3 * (index-1) + 1 = 3*index-2 .. same+3 = 3*index+1
+ return [ theslice(i) for i in range (3*index-2,3*index+1) ]
def all_slicenames (options,index):
return [ slice['slice_fields']['name'] for slice in slices(options,index)]
-def tcp_tests (options,index):
- if index == 1:
- return [
- # local test
- { 'server_node': 'node1',
- 'server_slice' : '%s_sl1'%login_base(index),
- 'client_node' : 'node1',
- 'client_slice' : '%s_sl1'%login_base(index),
- 'port' : 2000,
- }]
- elif index == 2:
- return [
- # remote test
- { 'server_node': 'node2',
- 'server_slice' : '%s_sl3'%login_base(index),
- 'client_node' : 'node2',
- 'client_slice' : '%s_sl4'%login_base(index),
- 'port' : 4000,
- },
- ]
- else:
- return []
+# the logic here is to try:
+# . client and server on the same slice/node
+# . client and server on the same node but 2 different slices
+# if at least 2 plcs, we have 2 nodes, so again on diff. nodes
+def tcp_specs (options,index):
+ # only run the test on the first plc
+ if index != 1: return None
+ #
+ slice1='%s_sl1'%login_base(1)
+ slice2='%s_sl2'%login_base(1)
+ # with the addition of omf-friendly slices..
+ slice3='%s_sl4'%login_base(2)
+ slice4='%s_sl5'%login_base(2)
+# bind on 0.0.0.0 and try to reach this on localhost
+# not expected to work
+ same_node_same_slice_lo = { 'server_node': 'node1', 'server_slice': slice1,
+ 'client_node': 'node1', 'client_slice': slice1,
+ 'client_connect' : 'localhost',
+ 'port': 10000}
+ same_node_same_slice = { 'server_node': 'node1', 'server_slice': slice1,
+ 'client_node': 'node1', 'client_slice': slice1,
+ 'port': 10001}
+# this does not work on vs-nodes....
+ same_node_2_slices = { 'server_node': 'node1', 'server_slice': slice1,
+ 'client_node': 'node1', 'client_slice': slice2,
+ 'port': 10002}
+ two_nodes_same_slice = { 'server_node': 'node1', 'server_slice': slice1,
+ 'client_node': 'node2', 'client_slice': slice3,
+ 'port': 10003}
+ two_nodes_2_slices = { 'server_node': 'node1', 'server_slice': slice1,
+ 'client_node': 'node2', 'client_slice': slice4,
+ 'port': 10004}
+ specs = []
+# specs += [ same_node_same_slice_lo ]
+ specs += [ same_node_same_slice ]
+# worth another try
+ specs += [ same_node_2_slices ]
+ if options.size >1 :
+ specs += [ two_nodes_same_slice, two_nodes_2_slices ]
+ return specs
# 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
'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',
'PLC_NET_DNS1' : 'deferred-dns-1',
'PLC_NET_DNS2' : 'deferred-dns-2',
'PLC_RESERVATION_GRANULARITY':1800,
+ 'PLC_VSYS_DEFAULTS':' , vif_up, vif_down, fd_tuntap, promisc, ',
+ 'expected_vsys_tags': [ 'vif_up', 'vif_down', 'fd_tuntap', 'promisc', ],
# minimal config so the omf plugins actually trigger
'PLC_OMF_ENABLED' : 'true',
'PLC_OMF_XMPP_SERVER': 'deferred-myplc-hostname',
'keys' : keys(options,index),
'initscripts': initscripts(options,index),
'slices' : slices(options,index),
- 'tcp_test' : tcp_tests(options,index),
+ 'tcp_specs' : tcp_specs(options,index),
'sfa' : sfa(options,index),
'leases' : leases (options, index),
+ # big distros need more time to install nodes
+ 'ssh_node_boot_timers': (40,38),
+ 'ssh_node_debug_timers': (10,8),
}
# NOTE: SFA currently has SFA_AGGREGATE_API_VERSION=2 baked into the code
'name': 'us',
'email': full_mail ('regularuser'),
'key_name': 'key_sfauser',
- 'sfi_options': [ '--extra',"enabled=true",
- '--extra',"first_name=Fake",
+ 'add_options': [ '--extra',"first_name=Fake",
'--extra',"last_name=SFA-style-%s"%rspec_style,
],
+ 'update_options': [ '--extra',"enabled=true",
+ ],
}
slice_spec = {
'name': 'sl',
- 'sfi_options': [ '--researchers', user_hrn,
+ 'add_options': [ '--researchers', user_hrn,
# xxx
'--extra', "description=SFA-testing-%s"%rspec_style,
'--extra', "url=http://slice%d.test.onelab.eu/"%index,
def config (plc_specs,options):
result=plc_specs
+ # plc 'index' starts with 1
for i in range (options.size):
result.append(plc(options,i+1))
return result
git://git.onelab.eu / tests.git / blobdiff