fix: include instance and hosting_subscription title in instance parameter_dict

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

@@ -6,10 +6,22 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_recorded_property_dict</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
         <item>
             <key> <string>default_reference</string> </key>
             <value> <string>testSlapOSSlapTool</string> </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>test.erp5.testSlapOSSlapTool</string> </value>
@@ -35,23 +47,23 @@
             <value>
               <tuple>
                 <string>W: 29, 10: Use of eval (eval-used)</string>
-                <string>W: 38,  2: Arguments number differs from overridden method (arguments-differ)</string>
-                <string>W:467, 13: Use of eval (eval-used)</string>
-                <string>W:518, 13: Use of eval (eval-used)</string>
-                <string>W:743, 13: Use of eval (eval-used)</string>
-                <string>W:1307, 13: Use of eval (eval-used)</string>
-                <string>W:1420, 13: Use of eval (eval-used)</string>
-                <string>W:1474, 13: Use of eval (eval-used)</string>
-                <string>W:1514, 13: Use of eval (eval-used)</string>
-                <string>W:1921,  2: Arguments number differs from overridden method (arguments-differ)</string>
-                <string>W:2017, 13: Use of eval (eval-used)</string>
-                <string>W:2372, 13: Use of eval (eval-used)</string>
-                <string>W:2426, 13: Use of eval (eval-used)</string>
-                <string>W:2453, 13: Use of eval (eval-used)</string>
-                <string>W:2598, 13: Use of eval (eval-used)</string>
-                <string>W:2626, 13: Use of eval (eval-used)</string>
-                <string>W:2675, 13: Use of eval (eval-used)</string>
-                <string>W:2722, 13: Use of eval (eval-used)</string>
+                <string>W: 38,  2: Arguments number differs from overridden \'afterSetUp\' method (arguments-differ)</string>
+                <string>W:517, 13: Use of eval (eval-used)</string>
+                <string>W:568, 13: Use of eval (eval-used)</string>
+                <string>W:793, 13: Use of eval (eval-used)</string>
+                <string>W:1399, 13: Use of eval (eval-used)</string>
+                <string>W:1512, 13: Use of eval (eval-used)</string>
+                <string>W:1566, 13: Use of eval (eval-used)</string>
+                <string>W:1606, 13: Use of eval (eval-used)</string>
+                <string>W:2013,  2: Arguments number differs from overridden \'afterSetUp\' method (arguments-differ)</string>
+                <string>W:2109, 13: Use of eval (eval-used)</string>
+                <string>W:2492, 13: Use of eval (eval-used)</string>
+                <string>W:2546, 13: Use of eval (eval-used)</string>
+                <string>W:2573, 13: Use of eval (eval-used)</string>
+                <string>W:2728, 13: Use of eval (eval-used)</string>
+                <string>W:2756, 13: Use of eval (eval-used)</string>
+                <string>W:2805, 13: Use of eval (eval-used)</string>
+                <string>W:2852, 13: Use of eval (eval-used)</string>
               </tuple>
             </value>
         </item>
@@ -62,13 +74,28 @@
         <item>
             <key> <string>workflow_history</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
       </dictionary>
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
@@ -81,7 +108,7 @@
                 <item>
                     <key> <string>component_validation_workflow</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -90,7 +117,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="3" aka="AAAAAAAAAAM=">
+  <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
       <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
     </pickle>

master/product/Vifib/Tool/SlapTool.py

@@ -1476,6 +1476,8 @@ class SlapTool(BaseTool):
     if (newtimestamp > timestamp):
       timestamp = newtimestamp
 
+    hosting_subscription = software_instance.getSpecialiseValue()
+
     ip_list = []
     full_ip_list = []
     for internet_protocol_address in computer_partition.contentValues(portal_type='Internet Protocol Address'):
@@ -1519,6 +1521,8 @@ class SlapTool(BaseTool):
             timestamp = newtimestamp
     return {
       'instance_guid': software_instance.getReference().decode("UTF-8"),
+      'instance_title': software_instance.getTitle().decode("UTF-8"),
+      'root_instance_title': hosting_subscription.getTitle().decode("UTF-8"),
       'xml': software_instance.getTextContent(),
       'connection_xml': software_instance.getConnectionXml(),
       'filter_xml': software_instance.getSlaXml(),