revert libslap changes

master/bt5/slapos_slap_tool/TestTemplateItem/portal_components/test.erp5.testSlapOSSlapTool.py

@@ -270,7 +270,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
       <string>%(compute_node_id)s</string>
       <string>_compute_partition_list</string>
       <list id='i4'>
-        <object id='i5' module='slapos.slap.slap' class='ComputePartition'>
+        <object id='i5' module='slapos.slap.slap' class='ComputerPartition'>
           <tuple>
             <string>%(compute_node_id)s</string>
             <string>partition4</string>
@@ -290,7 +290,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
             <none/>
           </dictionary>
         </object>
-        <object id='i7' module='slapos.slap.slap' class='ComputePartition'>
+        <object id='i7' module='slapos.slap.slap' class='ComputerPartition'>
           <tuple>
             <string>%(compute_node_id)s</string>
             <string>partition3</string>
@@ -332,7 +332,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
               <string>%(partition_3_root_instance_title)s</string>
               <string>slap_computer_id</string>
               <string>%(compute_node_id)s</string>
-              <string>slap_compute_partition_id</string>
+              <string>slap_computer_partition_id</string>
               <string>partition3</string>
               <string>slap_software_release_url</string>
               <string>%(partition_3_software_release_url)s</string>
@@ -366,7 +366,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
             </object>
           </dictionary>
         </object>
-        <object id='i18' module='slapos.slap.slap' class='ComputePartition'>
+        <object id='i18' module='slapos.slap.slap' class='ComputerPartition'>
           <tuple>
             <string>%(compute_node_id)s</string>
             <string>partition2</string>
@@ -408,7 +408,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
               <string>%(partition_2_root_instance_title)s</string>
               <string>slap_computer_id</string>
               <string>%(compute_node_id)s</string>
-              <string>slap_compute_partition_id</string>
+              <string>slap_computer_partition_id</string>
               <string>partition2</string>
               <string>slap_software_release_url</string>
               <string>%(partition_2_software_release_url)s</string>
@@ -442,7 +442,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
             </object>
           </dictionary>
         </object>
-        <object id='i29' module='slapos.slap.slap' class='ComputePartition'>
+        <object id='i29' module='slapos.slap.slap' class='ComputerPartition'>
           <tuple>
             <string>%(compute_node_id)s</string>
             <string>partition1</string>
@@ -484,7 +484,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
               <string>%(partition_1_root_instance_title)s</string>
               <string>slap_computer_id</string>
               <string>%(compute_node_id)s</string>
-              <string>slap_compute_partition_id</string>
+              <string>slap_computer_partition_id</string>
               <string>partition1</string>
               <string>slap_software_release_url</string>
               <string>%(partition_1_software_release_url)s</string>
@@ -1181,7 +1181,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
       <string>%(compute_node_id)s</string>
       <string>_compute_partition_list</string>
       <list id='i4'>
-        <object id='i5' module='slapos.slap.slap' class='ComputePartition'>
+        <object id='i5' module='slapos.slap.slap' class='ComputerPartition'>
           <tuple>
             <string>%(compute_node_id)s</string>
             <string>partition1</string>
@@ -1223,7 +1223,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
               <string>%(root_instance_title)s</string>
               <string>slap_computer_id</string>
               <string>%(compute_node_id)s</string>
-              <string>slap_compute_partition_id</string>
+              <string>slap_computer_partition_id</string>
               <string>partition1</string>
               <string>slap_software_release_url</string>
               <string>%(software_release_url)s</string>
@@ -1418,7 +1418,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
     expected_xml = """\
 <?xml version='1.0' encoding='UTF-8'?>
 <marshal>
-  <object id='i2' module='slapos.slap.slap' class='ComputePartition'>
+  <object id='i2' module='slapos.slap.slap' class='ComputerPartition'>
     <tuple>
       <string>%(compute_node_id)s</string>
       <string>partition1</string>
@@ -1458,7 +1458,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
         <string>%(root_instance_title)s</string>
         <string>slap_computer_id</string>
         <string>%(compute_node_id)s</string>
-        <string>slap_compute_partition_id</string>
+        <string>slap_computer_partition_id</string>
         <string>partition1</string>
         <string>slap_software_release_url</string>
         <string>%(software_release_url)s</string>
@@ -1552,7 +1552,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
     expected_xml = """\
 <?xml version='1.0' encoding='UTF-8'?>
 <marshal>
-  <object id='i2' module='slapos.slap.slap' class='ComputePartition'>
+  <object id='i2' module='slapos.slap.slap' class='ComputerPartition'>
     <tuple>
       <string>%(compute_node_id)s</string>
       <string>partition1</string>
@@ -1592,7 +1592,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
         <string>%(root_instance_title)s</string>
         <string>slap_computer_id</string>
         <string>%(compute_node_id)s</string>
-        <string>slap_compute_partition_id</string>
+        <string>slap_computer_partition_id</string>
         <string>partition1</string>
         <string>slap_software_release_url</string>
         <string>%(software_release_url)s</string>
@@ -2741,7 +2741,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
     expected_xml = """\
 <?xml version='1.0' encoding='UTF-8'?>
 <marshal>
-  <object id='i2' module='slapos.slap.slap' class='ComputePartition'>
+  <object id='i2' module='slapos.slap.slap' class='ComputerPartition'>
     <tuple>
       <string>%(compute_node_id)s</string>
       <string>partition1</string>
@@ -2781,7 +2781,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
         <string>%(root_instance_title)s</string>
         <string>slap_computer_id</string>
         <string>%(compute_node_id)s</string>
-        <string>slap_compute_partition_id</string>
+        <string>slap_computer_partition_id</string>
         <string>partition1</string>
         <string>slap_software_release_url</string>
         <string>%(software_release_url)s</string>
@@ -2875,7 +2875,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
     expected_xml = """\
 <?xml version='1.0' encoding='UTF-8'?>
 <marshal>
-  <object id='i2' module='slapos.slap.slap' class='ComputePartition'>
+  <object id='i2' module='slapos.slap.slap' class='ComputerPartition'>
     <tuple>
       <string>%(compute_node_id)s</string>
       <string>partition1</string>
@@ -2915,7 +2915,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
         <string>%(root_instance_title)s</string>
         <string>slap_computer_id</string>
         <string>%(compute_node_id)s</string>
-        <string>slap_compute_partition_id</string>
+        <string>slap_computer_partition_id</string>
         <string>partition1</string>
         <string>slap_software_release_url</string>
         <string>%(software_release_url)s</string>
@@ -3180,7 +3180,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
       <string>%(root_instance_title)s</string>
       <string>slap_computer_id</string>
       <string>%(compute_node_id)s</string>
-      <string>slap_compute_partition_id</string>
+      <string>slap_computer_partition_id</string>
       <string>%(partition_id)s</string>
       <string>slap_software_release_url</string>
       <string>%(url_string)s</string>

master/bt5/slapos_slap_tool/ToolComponentTemplateItem/portal_components/tool.erp5.SlapTool.py

@@ -1637,7 +1637,7 @@ class SlapTool(BaseTool):
       'filter_xml': software_instance.getSlaXml(),
       'slap_computer_id': \
         compute_partition.getParentValue().getReference().decode("UTF-8"),
-      'slap_compute_partition_id': \
+      'slap_computer_partition_id': \
         compute_partition.getReference().decode("UTF-8"),
       'slap_software_type': \
         software_instance.getSourceReference().decode("UTF-8"),