Revert "include instance and hosting_subscription title in instance parameter_dict"

This reverts commit d57b8d5a.

master/bt5/slapos_slap_tool/SkinTemplateItem/portal_skins/slapos_slap_tool/Computer_updateFromDict.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>def compareAndUpdateAddressList(document, address_list, additional_dict=None):\n
+  if additional_dict is None:\n
+    additional_dict = {}\n
+  to_delete_ip_id_list = []\n
+  to_add_ip_dict_list = address_list[:]\n
+  existing_address_list = document.contentValues(portal_type=\'Internet Protocol Address\')\n
+  existing_address_list.sort(key=lambda x: {0: 1, 1: 2}[int(x.id == \'default_network_interface\')])\n
+  for address in existing_address_list:\n
+    current_dict = {\n
+      \'addr\': address.getIpAddress(),\n
+      \'netmask\': address.getNetmask()\n
+    }\n
+    if current_dict in to_add_ip_dict_list:\n
+      to_add_ip_dict_list.remove(current_dict)\n
+    else:\n
+      # XXX - Only delete if Network interface are supposed to be the same\n
+      if additional_dict.has_key(\'network_interface\'):\n
+        if address.getNetworkInterface(\'\') and additional_dict[\'network_interface\'] != address.getNetworkInterface():\n
+          continue\n
+      to_delete_ip_id_list.append(address.getId())\n
+\n
+  for address in to_add_ip_dict_list:\n
+    if to_delete_ip_id_list:\n
+      id = to_delete_ip_id_list.pop()\n
+      address_document = document.restrictedTraverse(id)\n
+    else:\n
+      kw = {\'portal_type\': \'Internet Protocol Address\'}\n
+      if not len(document.objectIds(portal_type=\'Internet Protocol Address\')):\n
+        kw.update(id=\'default_network_address\')\n
+      address_document = document.newContent(**kw)\n
+    address_document.edit(\n
+      ip_address=address[\'addr\'],\n
+      netmask=address[\'netmask\'],\n
+      **additional_dict\n
+    )\n
+  if to_delete_ip_id_list:\n
+    document.deleteContent(to_delete_ip_id_list)\n
+\n
+\n
+# Getting existing partitions\n
+existing_partition_dict = {}\n
+for c in context.contentValues(portal_type="Computer Partition"):\n
+  existing_partition_dict[c.getReference()] = c\n
+\n
+# update computer data\n
+quantity = len(computer_dict[\'partition_list\'])\n
+if context.getQuantity() != quantity:\n
+  context.edit(quantity=quantity)\n
+\n
+compareAndUpdateAddressList(context, [{\'addr\': computer_dict[\'address\'], \'netmask\': computer_dict[\'netmask\']}])\n
+expected_partition_dict = {}\n
+for send_partition in computer_dict[\'partition_list\']:\n
+  partition = existing_partition_dict.get(send_partition[\'reference\'], None)\n
+  expected_partition_dict[send_partition[\'reference\']] = True\n
+  if partition is None:\n
+    partition = context.newContent(portal_type=\'Computer Partition\')\n
+    partition.validate()\n
+    partition.markFree()\n
+  elif partition.getSlapState() == \'inactive\':\n
+    # Reactivate partition\n
+    partition.markFree(comment="Reactivated by slapformat")\n
+\n
+  if partition.getValidationState() == "invalidated":\n
+    partition.validate(comment="Reactivated by slapformat")\n
+  if partition.getReference() != send_partition[\'reference\']:\n
+    partition.edit(reference=send_partition[\'reference\'])\n
+  network_interface = send_partition[\'tap\'][\'name\']\n
+  compareAndUpdateAddressList(partition, send_partition[\'address_list\'], {\'network_interface\': network_interface})\n
+  tap_addr_list = []\n
+  additional_dict = {\'network_interface\':  \'route_\' + network_interface}\n
+  if send_partition[\'tap\'].has_key(\'ipv4_addr\') and send_partition[\'tap\'][\'ipv4_addr\']:\n
+    tap_addr_list.append({\n
+            \'addr\': send_partition[\'tap\'][\'ipv4_addr\'],\n
+            \'netmask\': send_partition[\'tap\'][\'ipv4_netmask\']\n
+      })\n
+    additional_dict[\'gateway_ip_address\'] = send_partition[\'tap\'][\'ipv4_gateway\']\n
+    additional_dict[\'network_address\'] = send_partition[\'tap\'][\'ipv4_network\']\n
+  compareAndUpdateAddressList(partition, tap_addr_list, additional_dict)\n
+\n
+# Desactivate all other partitions\n
+for key, value in existing_partition_dict.items():\n
+  if key not in expected_partition_dict:\n
+    if value.getSlapState() == "free":\n
+      value.markInactive(comment="Desactivated by slapformat")\n
+    if value.getValidationState() == "validated":\n
+      value.invalidate(comment="Desactivated by slapformat")\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>computer_dict</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Computer_updateFromDict</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

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

@@ -66,14 +66,6 @@ class TestSlapOSSlapToolMixin(testSlapOSMixin):
 class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
   def test_getFullComputerInformation(self):
     self._makeComplexComputer(with_slave=True)
-
-    partition_1_root_instance_title = self.computer.partition1.getAggregateRelatedValue(
-      portal_type='Software Instance').getSpecialiseValue().getTitle()
-    partition_2_root_instance_title = self.computer.partition2.getAggregateRelatedValue(
-      portal_type='Software Instance').getSpecialiseValue().getTitle()
-    partition_3_root_instance_title = self.computer.partition3.getAggregateRelatedValue(
-      portal_type='Software Instance').getSpecialiseValue().getTitle()
-
     self.login(self.computer_id)
     response = self.portal_slap.getFullComputerInformation(self.computer_id)
     self.assertEqual(200, response.status)
@@ -147,8 +139,6 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
             <dictionary id='i11'>
               <string>full_ip_list</string>
               <list id='i12'/>
-              <string>instance_title</string>
-              <unicode>%(partition_3_instance_title)s</unicode>
               <string>ip_list</string>
               <list id='i13'>
                 <tuple>
@@ -158,8 +148,6 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
               </list>
               <unicode>paramé</unicode>
               <unicode>%(partition_3_param)s</unicode>
-              <string>root_instance_title</string>
-              <unicode>%(partition_3_root_instance_title)s</unicode>
               <string>slap_computer_id</string>
               <unicode>%(computer_id)s</unicode>
               <string>slap_computer_partition_id</string>
@@ -219,8 +207,6 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
             <dictionary id='i22'>
               <string>full_ip_list</string>
               <list id='i23'/>
-              <string>instance_title</string>
-              <unicode>%(partition_2_instance_title)s</unicode>
               <string>ip_list</string>
               <list id='i24'>
                 <tuple>
@@ -230,8 +216,6 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
               </list>
               <unicode>paramé</unicode>
               <unicode>%(partition_2_param)s</unicode>
-              <string>root_instance_title</string>
-              <unicode>%(partition_2_root_instance_title)s</unicode>
               <string>slap_computer_id</string>
               <unicode>%(computer_id)s</unicode>
               <string>slap_computer_partition_id</string>
@@ -291,8 +275,6 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
             <dictionary id='i33'>
               <string>full_ip_list</string>
               <list id='i34'/>
-              <string>instance_title</string>
-              <unicode>%(partition_1_instance_title)s</unicode>
               <string>ip_list</string>
               <list id='i35'>
                 <tuple>
@@ -302,8 +284,6 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
               </list>
               <unicode>paramé</unicode>
               <unicode>%(partition_1_param)s</unicode>
-              <string>root_instance_title</string>
-              <unicode>%(partition_1_root_instance_title)s</unicode>
               <string>slap_computer_id</string>
               <unicode>%(computer_id)s</unicode>
               <string>slap_computer_partition_id</string>
@@ -396,24 +376,18 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
   computer_id=self.computer_id,
   destroy_requested_url=self.destroy_requested_software_installation.getUrlString(),
   partition_1_instance_guid=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getReference(),
-  partition_1_instance_title=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getTitle(),
-  partition_1_root_instance_title=partition_1_root_instance_title,
   partition_1_instance_software_type=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getSourceReference(),
   partition_1_param=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getInstanceXmlAsDict()['paramé'],
   partition_1_sla=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getSlaXmlAsDict()['paramé'],
   partition_1_software_release_url=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getUrlString(),
   partition_1_timestamp=int(self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getModificationDate()),
   partition_2_instance_guid=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getReference(),
-  partition_2_instance_title=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getTitle(),
-  partition_2_root_instance_title=partition_2_root_instance_title,
   partition_2_instance_software_type=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getSourceReference(),
   partition_2_param=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getInstanceXmlAsDict()['paramé'],
   partition_2_sla=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getSlaXmlAsDict()['paramé'],
   partition_2_software_release_url=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getUrlString(),
   partition_2_timestamp=int(self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getModificationDate()),
   partition_3_instance_guid=self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getReference(),
-  partition_3_instance_title=self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getTitle(),
-  partition_3_root_instance_title=partition_3_root_instance_title,
   partition_3_instance_software_type=self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getSourceReference(),
   partition_3_param=self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getInstanceXmlAsDict()['paramé'],
   partition_3_sla=self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getSlaXmlAsDict()['paramé'],
@@ -979,8 +953,6 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
             <dictionary id='i9'>
               <string>full_ip_list</string>
               <list id='i10'/>
-              <string>instance_title</string>
-              <unicode>%(instance_title)s</unicode>
               <string>ip_list</string>
               <list id='i11'>
                 <tuple>
@@ -990,8 +962,6 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
               </list>
               <unicode>paramé</unicode>
               <unicode>%(param)s</unicode>
-              <string>root_instance_title</string>
-              <unicode>%(root_instance_title)s</unicode>
               <string>slap_computer_id</string>
               <unicode>%(computer_id)s</unicode>
               <string>slap_computer_partition_id</string>
@@ -1050,8 +1020,6 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
 """ % dict(
     computer_id=self.computer_id,
     instance_guid=self.start_requested_software_instance.getReference(),
-    instance_title=self.start_requested_software_instance.getTitle(),
-    root_instance_title=self.start_requested_software_instance.getSpecialiseValue().getTitle(),
     software_release_url=self.start_requested_software_instance.getUrlString(),
     software_type=self.start_requested_software_instance.getSourceReference(),
     param=self.start_requested_software_instance.getInstanceXmlAsDict()['paramé'],
@@ -1199,8 +1167,6 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
       <dictionary id='i6'>
         <string>full_ip_list</string>
         <list id='i7'/>
-        <string>instance_title</string>
-        <unicode>%(instance_title)s</unicode>
         <string>ip_list</string>
         <list id='i8'>
           <tuple>
@@ -1210,8 +1176,6 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
         </list>
         <unicode>paramé</unicode>
         <unicode>%(param)s</unicode>
-        <string>root_instance_title</string>
-        <unicode>%(root_instance_title)s</unicode>
         <string>slap_computer_id</string>
         <unicode>%(computer_id)s</unicode>
         <string>slap_computer_partition_id</string>
@@ -1271,8 +1235,6 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
   software_release_url=self.start_requested_software_instance.getUrlString(),
   timestamp=int(self.start_requested_software_instance.getModificationDate()),
   instance_guid=self.start_requested_software_instance.getReference(),
-  instance_title=self.start_requested_software_instance.getTitle(),
-  root_instance_title=self.start_requested_software_instance.getSpecialiseValue().getTitle(),
   software_type=self.start_requested_software_instance.getSourceReference(),
   slave_1_param=self.start_requested_slave_instance.getInstanceXmlAsDict()['paramé'],
   slave_1_software_type=self.start_requested_slave_instance.getSourceReference(),
@@ -1329,8 +1291,6 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
       <dictionary id='i6'>
         <string>full_ip_list</string>
         <list id='i7'/>
-        <string>instance_title</string>
-        <unicode>%(instance_title)s</unicode>
         <string>ip_list</string>
         <list id='i8'>
           <tuple>
@@ -1340,8 +1300,6 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
         </list>
         <unicode>paramé</unicode>
         <unicode>%(param)s</unicode>
-        <string>root_instance_title</string>
-        <unicode>%(root_instance_title)s</unicode>
         <string>slap_computer_id</string>
         <unicode>%(computer_id)s</unicode>
         <string>slap_computer_partition_id</string>
@@ -1388,8 +1346,6 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
   software_release_url=self.start_requested_software_instance.getUrlString(),
   timestamp=int(self.start_requested_software_instance.getModificationDate()),
   instance_guid=self.start_requested_software_instance.getReference(),
-  instance_title=self.start_requested_software_instance.getTitle(),
-  root_instance_title=self.start_requested_software_instance.getSpecialiseValue().getTitle(),
   software_type=self.start_requested_software_instance.getSourceReference()
 )
     self.assertEqual(expected_xml, got_xml,
@@ -2292,8 +2248,6 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
       <dictionary id='i6'>
         <string>full_ip_list</string>
         <list id='i7'/>
-        <string>instance_title</string>
-        <unicode>%(instance_title)s</unicode>
         <string>ip_list</string>
         <list id='i8'>
           <tuple>
@@ -2303,8 +2257,6 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
         </list>
         <unicode>paramé</unicode>
         <unicode>%(param)s</unicode>
-        <string>root_instance_title</string>
-        <unicode>%(root_instance_title)s</unicode>
         <string>slap_computer_id</string>
         <unicode>%(computer_id)s</unicode>
         <string>slap_computer_partition_id</string>
@@ -2364,8 +2316,6 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
   software_release_url=self.start_requested_software_instance.getUrlString(),
   timestamp=int(self.start_requested_software_instance.getModificationDate()),
   instance_guid=self.start_requested_software_instance.getReference(),
-  instance_title=self.start_requested_software_instance.getTitle(),
-  root_instance_title=self.start_requested_software_instance.getSpecialiseValue().getTitle(),
   software_type=self.start_requested_software_instance.getSourceReference(),
   slave_1_param=self.start_requested_slave_instance.getInstanceXmlAsDict()['paramé'],
   slave_1_software_type=self.start_requested_slave_instance.getSourceReference(),
@@ -2422,8 +2372,6 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
       <dictionary id='i6'>
         <string>full_ip_list</string>
         <list id='i7'/>
-        <string>instance_title</string>
-        <unicode>%(instance_title)s</unicode>
         <string>ip_list</string>
         <list id='i8'>
           <tuple>
@@ -2433,8 +2381,6 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
         </list>
         <unicode>paramé</unicode>
         <unicode>%(param)s</unicode>
-        <string>root_instance_title</string>
-        <unicode>%(root_instance_title)s</unicode>
         <string>slap_computer_id</string>
         <unicode>%(computer_id)s</unicode>
         <string>slap_computer_partition_id</string>
@@ -2481,8 +2427,6 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
   software_release_url=self.start_requested_software_instance.getUrlString(),
   timestamp=int(self.start_requested_software_instance.getModificationDate()),
   instance_guid=self.start_requested_software_instance.getReference(),
-  instance_title=self.start_requested_software_instance.getTitle(),
-  root_instance_title=self.start_requested_software_instance.getSpecialiseValue().getTitle(),
   software_type=self.start_requested_software_instance.getSourceReference()
 )
     self.assertEqual(expected_xml, got_xml,
@@ -2681,8 +2625,6 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
       <string>%(state)s</string>
       <string>full_ip_list</string>
       <list id='i7'/>
-      <string>instance_title</string>
-      <unicode>%(instance_title)s</unicode>
       <string>ip_list</string>
       <list id='i8'>
         <tuple>
@@ -2690,8 +2632,6 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
           <unicode>%(ip)s</unicode>
         </tuple>
       </list>
-      <string>root_instance_title</string>
-      <unicode>%(root_instance_title)s</unicode>
       <string>slap_computer_id</string>
       <unicode>%(computer_id)s</unicode>
       <string>slap_computer_partition_id</string>
@@ -2709,8 +2649,6 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
 </marshal>
 """ % dict(
     instance_guid=self.start_requested_software_instance.getReference(),
-    instance_title=self.start_requested_software_instance.getTitle(),
-    root_instance_title=self.start_requested_software_instance.getSpecialiseTitle(),
     state="started",
     url_string=self.start_requested_software_instance.getUrlString(),
     type=self.start_requested_software_instance.getSourceReference(),

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

@@ -6,22 +6,10 @@
     </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>
@@ -47,23 +35,23 @@
             <value>
               <tuple>
                 <string>W: 29, 10: 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>
+                <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>
               </tuple>
             </value>
         </item>
@@ -74,28 +62,13 @@
         <item>
             <key> <string>workflow_history</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</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>
@@ -108,7 +81,7 @@
                 <item>
                     <key> <string>component_validation_workflow</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -117,7 +90,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
+  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
     </pickle>

master/product/Vifib/Tool/SlapTool.py

@@ -1476,8 +1476,6 @@ 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'):
@@ -1521,8 +1519,6 @@ 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(),