X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=system%2Fconfig_default.py;h=288b613044e347eec37b1e95f47686c1949066f8;hb=e3c54aca097814618652afd004bc81f9c5297586;hp=298e158e813859b34889c341b5ec0be4db892b4d;hpb=ac98807a5a139b763a0c64ac5acadb3290659e41;p=tests.git

diff --git a/system/config_default.py b/system/config_default.py
index 298e158..288b613 100644
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -333,6 +333,7 @@ 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) :
     return { 
         # the default is to use AMs in the various aggregates.xml
@@ -347,8 +348,7 @@ def sfa (options,index) :
 	'SFA_PLC_URL' : 'deferred-myplc-api-url',
         'SFA_PLC_USER' : 'root@test.onelab.eu',
         'SFA_PLC_PASSWORD' : 'test++',
-# use -c apiv2 to override this one
-#        'SFA_AGGREGATE_API_VERSION' : 1,
+# 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) 
@@ -365,21 +365,20 @@ def sfa_slice_spec (options,index,rspec_style):
     hrn=prefix+'.'+slicename
     user_hrn=prefix+'.'+regularuser
     pi_hrn=prefix+'.'+piuser
-    slice_record_xml = '''<record hrn="%s" type="slice" description="SFA-testing" url="http://test.onelab.eu/">
-<researcher>%s</researcher>
-</record>'''%(hrn, user_hrn)
-
-    mail="%s@%s"%(regularuser,domain)
-    print 'in sfa_slice_spec','slicename',slicename,'hrn',hrn,'mail',mail
     key=public_key2
-    person_record_xml ='''<record email="%(mail)s" enabled="True" first_name="Fake" hrn="%(user_hrn)s" 
-last_name="Sfa %(rspec_style)s" name="%(hrn)s" type="user">
+    mail="%s@%s"%(regularuser,domain)
+    person_record_xml =\
+'''<record hrn="%(user_hrn)s" type="user" email="%(mail)s" enabled="True" 
+first_name="Fake" last_name="Sfa style=%(rspec_style)s" >
 <keys>%(key)s</keys>
-<role_ids>20</role_ids><role_ids>10</role_ids>
-<roles>pi</roles><roles>admin</roles>
-<site_ids>1</site_ids>
-<sites>%(prefix)s</sites>
+<roles>user</roles>
+<roles>tech</roles>
 </record>'''%locals()
+    slice_record_xml =\
+'''<record hrn="%s" type="slice" description="SFA-testing" url="http://test.onelab.eu/">
+<researcher>%s</researcher>
+</record>'''%(hrn, user_hrn)
+
 
     return { 'slice_fields': {'name':'%s_%s'%(the_login_base,slicename),
                               'url':'http://foo%d@foo.com'%index,