Commit 476bddaf authored by Alain Takoudjou's avatar Alain Takoudjou

fix: include instance and hosting_subscription title in instance parameter_dict

parent ade3960f
...@@ -6,10 +6,22 @@ ...@@ -6,10 +6,22 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>_recorded_property_dict</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>default_reference</string> </key> <key> <string>default_reference</string> </key>
<value> <string>testSlapOSSlapTool</string> </value> <value> <string>testSlapOSSlapTool</string> </value>
</item> </item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>test.erp5.testSlapOSSlapTool</string> </value> <value> <string>test.erp5.testSlapOSSlapTool</string> </value>
...@@ -35,23 +47,23 @@ ...@@ -35,23 +47,23 @@
<value> <value>
<tuple> <tuple>
<string>W: 29, 10: Use of eval (eval-used)</string> <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: 38, 2: Arguments number differs from overridden \'afterSetUp\' method (arguments-differ)</string>
<string>W:467, 13: Use of eval (eval-used)</string> <string>W:517, 13: Use of eval (eval-used)</string>
<string>W:518, 13: Use of eval (eval-used)</string> <string>W:568, 13: Use of eval (eval-used)</string>
<string>W:743, 13: Use of eval (eval-used)</string> <string>W:793, 13: Use of eval (eval-used)</string>
<string>W:1307, 13: Use of eval (eval-used)</string> <string>W:1399, 13: Use of eval (eval-used)</string>
<string>W:1420, 13: Use of eval (eval-used)</string> <string>W:1512, 13: Use of eval (eval-used)</string>
<string>W:1474, 13: Use of eval (eval-used)</string> <string>W:1566, 13: Use of eval (eval-used)</string>
<string>W:1514, 13: Use of eval (eval-used)</string> <string>W:1606, 13: Use of eval (eval-used)</string>
<string>W:1921, 2: Arguments number differs from overridden method (arguments-differ)</string> <string>W:2013, 2: Arguments number differs from overridden \'afterSetUp\' method (arguments-differ)</string>
<string>W:2017, 13: Use of eval (eval-used)</string> <string>W:2109, 13: Use of eval (eval-used)</string>
<string>W:2372, 13: Use of eval (eval-used)</string> <string>W:2492, 13: Use of eval (eval-used)</string>
<string>W:2426, 13: Use of eval (eval-used)</string> <string>W:2546, 13: Use of eval (eval-used)</string>
<string>W:2453, 13: Use of eval (eval-used)</string> <string>W:2573, 13: Use of eval (eval-used)</string>
<string>W:2598, 13: Use of eval (eval-used)</string> <string>W:2728, 13: Use of eval (eval-used)</string>
<string>W:2626, 13: Use of eval (eval-used)</string> <string>W:2756, 13: Use of eval (eval-used)</string>
<string>W:2675, 13: Use of eval (eval-used)</string> <string>W:2805, 13: Use of eval (eval-used)</string>
<string>W:2722, 13: Use of eval (eval-used)</string> <string>W:2852, 13: Use of eval (eval-used)</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -62,13 +74,28 @@ ...@@ -62,13 +74,28 @@
<item> <item>
<key> <string>workflow_history</string> </key> <key> <string>workflow_history</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <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> <pickle>
<global name="PersistentMapping" module="Persistence.mapping"/> <global name="PersistentMapping" module="Persistence.mapping"/>
</pickle> </pickle>
...@@ -81,7 +108,7 @@ ...@@ -81,7 +108,7 @@
<item> <item>
<key> <string>component_validation_workflow</string> </key> <key> <string>component_validation_workflow</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -90,7 +117,7 @@ ...@@ -90,7 +117,7 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="3" aka="AAAAAAAAAAM="> <record id="4" aka="AAAAAAAAAAQ=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle> </pickle>
......
...@@ -1476,6 +1476,8 @@ class SlapTool(BaseTool): ...@@ -1476,6 +1476,8 @@ class SlapTool(BaseTool):
if (newtimestamp > timestamp): if (newtimestamp > timestamp):
timestamp = newtimestamp timestamp = newtimestamp
hosting_subscription = software_instance.getSpecialiseValue()
ip_list = [] ip_list = []
full_ip_list = [] full_ip_list = []
for internet_protocol_address in computer_partition.contentValues(portal_type='Internet Protocol Address'): for internet_protocol_address in computer_partition.contentValues(portal_type='Internet Protocol Address'):
...@@ -1519,6 +1521,8 @@ class SlapTool(BaseTool): ...@@ -1519,6 +1521,8 @@ class SlapTool(BaseTool):
timestamp = newtimestamp timestamp = newtimestamp
return { return {
'instance_guid': software_instance.getReference().decode("UTF-8"), '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(), 'xml': software_instance.getTextContent(),
'connection_xml': software_instance.getConnectionXml(), 'connection_xml': software_instance.getConnectionXml(),
'filter_xml': software_instance.getSlaXml(), 'filter_xml': software_instance.getSlaXml(),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment