trim incoming xml records

[tests.git] / system / config_default.py

diff --git a/system/config_default.py b/system/config_default.py
index 80618d4..404f44a 100644 (file)
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -365,17 +365,21 @@ def sfa_slice_spec (options,index,rspec_style):
     hrn=prefix+'.'+slicename
     user_hrn=prefix+'.'+regularuser
     pi_hrn=prefix+'.'+piuser
-    slice_add_xml = '''<record hrn="%s" type="slice" description="SFA-testing" url="http://test.onelab.eu/">
+    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>
+<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)
 
     mail="%s@%s"%(regularuser,domain)
     print 'in sfa_slice_spec','slicename',slicename,'hrn',hrn,'mail',mail
     key=public_key2
-    slice_person_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">
-<keys>%(key)s</keys><role_ids>20</role_ids><role_ids>10</role_ids>
-<site_ids>1</site_ids><roles>pi</roles><roles>admin</roles><sites>%(prefix)s</sites></record>'''%locals()
 
     return { 'slice_fields': {'name':'%s_%s'%(the_login_base,slicename),
                               'url':'http://foo%d@foo.com'%index,
@@ -386,12 +390,12 @@ last_name="Sfa %(rspec_style)s" name="%(hrn)s" type="user">
              'piuser' : piuser,
              'regularuser':regularuser,
              'domain':domain,
-             'usernames' : [ (regularuser,'key1') ],
+             'usernames' : [ (regularuser,'key2') ],
              'nodenames' : all_nodenames(options,index),
              'sitename' : the_login_base,
              'slicename' : slicename,
-             'slice_add_xml' : slice_add_xml,
-             'slice_person_xml' : slice_person_xml,
+             'slice_record' : slice_record_xml,
+             'person_record' : person_record_xml,
              'rspec_style':rspec_style,
              }