slapos_cloud: Fixup name convetions on scripts

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Alarm_garbageCollectDestroyedRootTree.py

@@ -4,7 +4,7 @@ portal.portal_catalog.searchAndActivate(
   portal_type=["Slave Instance", "Software Instance"],
   validation_state="validated",
   specialise_validation_state="archived",
-  method_id='Instance_tryToGarbageCollect',
+  method_id='SoftwareInstance_tryToGarbageCollect',
   activate_kw={'tag': tag},
   **{"slapos_item.slap_state": ("start_requested", "stop_requested")}
 )

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Alarm_garbageCollectNonAllocatedRootTree.py

@@ -7,7 +7,7 @@ portal.portal_catalog.searchAndActivate(
   select_dict=select_dict,
   left_join_list=select_dict.keys(),
 
-  method_id='Instance_tryToGarbageCollectNonAllocatedRootTree',
+  method_id='SoftwareInstance_tryToGarbageCollectNonAllocatedRootTree',
   activate_kw={'tag': tag},
   **{"slapos_item.slap_state": ['start_requested', 'stop_requested']}
 )

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Alarm_searchComputerPartitionAndMarkFree.py

@@ -4,7 +4,7 @@ portal.portal_catalog.searchAndActivate(
   portal_type=["Software Instance", "Slave Instance"],
   default_aggregate_relative_url="computer_module/%/%",
   validation_state="invalidated",
-  method_id='Instance_tryToUnallocatePartition',
+  method_id='SoftwareInstance_tryToUnallocatePartition',
   activate_kw={'tag': tag}
 )
 

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Alarm_stopCollectInstance.py

@@ -8,7 +8,7 @@ portal.portal_catalog.searchAndActivate(
   portal_type=["Slave Instance", "Software Instance"],
   validation_state="validated",
   specialise_validation_state="validated",
-  method_id='Instance_tryToStopCollect',
+  method_id='SoftwareInstance_tryToStopCollect',
   activate_kw={'tag': tag},
   **{"slapos_item.slap_state": "start_requested"}
 )

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Instance_tryToGarbageCollect.xml → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SoftwareInstance_tryToGarbageCollect.xml

@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Instance_tryToGarbageCollect</string> </value>
+            <value> <string>SoftwareInstance_tryToGarbageCollect</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Instance_tryToGarbageCollectNonAllocatedRootTree.xml → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SoftwareInstance_tryToGarbageCollectNonAllocatedRootTree.xml

@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Instance_tryToGarbageCollectNonAllocatedRootTree</string> </value>
+            <value> <string>SoftwareInstance_tryToGarbageCollectNonAllocatedRootTree</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Instance_tryToStopCollect.xml → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SoftwareInstance_tryToStopCollect.xml

@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Instance_tryToStopCollect</string> </value>
+            <value> <string>SoftwareInstance_tryToStopCollect</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Instance_tryToUnallocatePartition.xml → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SoftwareInstance_tryToUnallocatePartition.xml

@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Instance_tryToUnallocatePartition</string> </value>
+            <value> <string>SoftwareInstance_tryToUnallocatePartition</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudAlarm.xml

@@ -100,11 +100,13 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -117,7 +119,9 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>