user creation is done with new sfi options instead of xml-based

[tests.git] / system / config_default.py

diff --git a/system/config_default.py b/system/config_default.py
index b62ef5c..8507d17 100644 (file)
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -20,7 +20,7 @@ def login_base (index):
     else: return 'site%s'%chr(index+94)
 
 def sfa_login_base (index, rspec_style):
-    return "sfasite%s"%(rspec_style)
+    return "sfa%s"%(rspec_style)
 
 def sfa_root (index):
     # use plt (planetlab test) instead of pl
@@ -288,7 +288,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_slpl%d'%(login_base(index),i),
+        slice_spec = { 'slice_fields': {'name':'%s_sl%d'%(login_base(index),i),
                                         'instantiation':'plc-instantiated',
                                         'url':'http://foo%d.com'%index,
                                         'description':'testslice number %d'%i,
@@ -318,18 +318,18 @@ def tcp_tests (options,index):
         return [
             # local test
             { 'server_node': 'node1',
-              'server_slice' : '%s_slpl1'%login_base(index),
+              'server_slice' : '%s_sl1'%login_base(index),
               'client_node' : 'node1',
-              'client_slice' : '%s_slpl1'%login_base(index),
+              'client_slice' : '%s_sl1'%login_base(index),
               'port' : 2000,
               }]
     elif index == 2:
         return [
             # remote test
             { 'server_node': 'node2',
-              'server_slice' : '%s_slpl3'%login_base(index),
+              'server_slice' : '%s_sl3'%login_base(index),
               'client_node' : 'node2',
-              'client_slice' : '%s_slpl4'%login_base(index),
+              'client_slice' : '%s_sl4'%login_base(index),
               'port' : 4000,
               },
             ]
@@ -404,6 +404,9 @@ def sfa (options,index) :
         'SFA_PLC_PASSWORD' : 'test++',
 # use -c sfadebug to increment this one
         'SFA_API_LOGLEVEL': 1,
+# use -c sfavoid to set this to 'void'
+        'SFA_GENERIC_FLAVOUR' : 'pl',
+        'SFA_AGGREGATE_ENABLED' : 'true',
         # details of the slices to create
         'sfa_slice_specs' : [ sfa_slice_spec(options,index,rspec_style) 
                               for rspec_style in options.rspec_styles ]
@@ -412,20 +415,31 @@ def sfa (options,index) :
 # rspecstyle is 'pl' for sfav1 or 'pg' for pgv2
 def sfa_slice_spec (options,index,rspec_style):
     the_login_base=sfa_login_base(index,rspec_style)
-    piuser='sfapi%d%s'%(index,rspec_style)
+    # we're already in a dedicated site/authority so no need to encumber with odd names
+    piuser='pi'
     pimail=piuser+'@test.onelab.eu'
-    regularuser='sfauser%d%s'%(index,rspec_style)
-    slicename='slsfa%d%s'%(index,rspec_style)
+    regularuser='us'
+    slicename='sl'
     prefix='%s.%s'%(sfa_root(index),the_login_base)
     hrn=prefix+'.'+slicename
     user_hrn=prefix+'.'+regularuser
     pi_hrn=prefix+'.'+piuser
-    key=public_key2
     mail="%s@%s"%(regularuser,domain)
+    user_key=public_key2
+    # xxx as compared with the xml-record-based approach
+    # is enabled=True needed here ?
+    # ditto for roles = user+tech
+    person_options = { '-t': 'user',
+                       '-x': user_hrn,
+                       '-e': mail,
+                       '-f': "Fake",
+                       '-l': "SFA-style-%s"%rspec_style,
+                       }
+                       
     person_record_xml =\
-'''<record hrn="%(user_hrn)s" type="user" email="%(mail)s" enabled="True" 
+'''<record enabled="True" 
 first_name="Fake" last_name="Sfa style=%(rspec_style)s" >
-<keys>%(key)s</keys>
+<keys>%(user_key)s</keys>
 <roles>user</roles>
 <roles>tech</roles>
 </record>'''%locals()
@@ -449,8 +463,10 @@ first_name="Fake" last_name="Sfa style=%(rspec_style)s" >
              'nodenames' : all_nodenames(options,index),
              'sitename' : the_login_base,
              'slicename' : slicename,
-             'slice_record' : slice_record_xml,
+             # handle key separately because of embedded whitespace
+             'person_options': person_options,
              'person_record' : person_record_xml,
+             'slice_record' : slice_record_xml,
              'rspec_style':rspec_style,
              }