no semantic change, just reorganize the input xml records

diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py
index 3e9caf8..30e60f6 100644 (file)
--- a/system/TestSliceSfa.py
+++ b/system/TestSliceSfa.py
@@ -46,8 +46,8 @@ class TestSliceSfa:
     # result name
     def resname (self,name,ext): return "%s.%s"%(name,ext)
 
-    def addslicefile (self): return self.resname("addslice","xml")
-    def addpersonfile (self): return self.resname("addperson","xml")
+    def addslicefile (self): return self.resname("slice_record","xml")
+    def addpersonfile (self): return self.resname("person_record","xml")
     def adfile (self): return self.resname("ad","rspec")
     def reqfile (self): return self.resname("req","rspec")
     def nodefile (self): return self.resname("nodes","txt")
@@ -91,7 +91,7 @@ class TestSliceSfa:
         #
        file_name=dir_name + os.sep + self.addpersonfile()
         fileconf=open(file_name,'w')
-       fileconf.write(sfa_slice_spec['slice_person_xml'])
+       fileconf.write(sfa_slice_spec['person_record'])
        fileconf.write('\n')
         fileconf.close()
         utils.header ("(Over)wrote %s"%file_name)
@@ -115,7 +115,7 @@ class TestSliceSfa:
         #
        file_name=dir_name + os.sep + self.addslicefile()
         fileconf=open(file_name,'w')
-       fileconf.write(sfa_slice_spec['slice_add_xml'])
+       fileconf.write(sfa_slice_spec['slice_record'])
        fileconf.write('\n')
         utils.header ("(Over)wrote %s"%file_name)
         fileconf.close()

diff --git a/system/config_default.py b/system/config_default.py
index 4174dcf..298e158 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/">
+    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" 
+    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">
-<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()
+<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>
+</record>'''%locals()
 
     return { 'slice_fields': {'name':'%s_%s'%(the_login_base,slicename),
                               'url':'http://foo%d@foo.com'%index,
@@ -390,8 +394,8 @@ last_name="Sfa %(rspec_style)s" name="%(hrn)s" type="user">
              '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,
              }