slapos_cloud: Improve Software Instance as JSON Text

master/bt5/slapos_cloud/DocumentTemplateItem/portal_components/document.erp5.SoftwareInstance.py

@@ -330,7 +330,6 @@ class SoftwareInstance(Item):
       state = 'destroyed'
     else:
       raise ValueError("Unknown slap state : %s" % requested_state)
-
     # software instance has to define an xml parameter
     result = {
       "$schema": self.getPortalObject().portal_types.restrictedTraverse(self.getPortalType()).absolute_url()
@@ -342,6 +341,10 @@ class SoftwareInstance(Item):
       "node": self.getSlaXmlAsDict(),
       "state": state,
       "id": self.getRelativeUrl(),
+      "software_release_uri": self.getUrlString(),
+      "software_type": self.getSourceReference().decode("UTF-8"),
+      "compute_node_id": parameter_dict.get("slap_computer_id"),
+      "compute_partition_id": parameter_dict.get("slap_computer_partition_id"),
     }
     result.update(parameter_dict)
     return json.dumps(result, indent=2)

master/bt5/slapos_cloud/DocumentTemplateItem/portal_components/document.erp5.SoftwareInstance.xml

@@ -6,6 +6,12 @@
     </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>SoftwareInstance</string> </value>
@@ -49,13 +55,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>
@@ -68,7 +89,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>
@@ -77,7 +98,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="3" aka="AAAAAAAAAAM=">
+  <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
       <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>

master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Software%20Instance.xml

@@ -118,33 +118,52 @@
     },\n
     "software_release_uri": {\n
       "title": "Software Release URI",\n
-      "type": "string"\n
+      "type": "string",\n
+      "description": "URL of the software release used by the software instance"\n
     },\n
     "software_type": {\n
       "title": "Software Type",\n
       "type": "string",\n
-      "description": "Software type to be requested"\n
+      "description": "Software type of the instance, it define the type of the instance according to the software release"\n
     },\n
     "state": {\n
       "title": "Requested State",\n
       "type": "string",\n
       "enum": ["started", "stopped", "destroyed"],\n
-      "description": "State of the requested instance"\n
+      "description": "State of the requested instance. It is functionnal when started. In stopped state, all services are stopped. If destroyed, it will remove the instance."\n
     },\n
     "connection_parameters": {\n
       "title": "Connections Parameters",\n
       "type": "object",\n
+      "description": "List of parameters provided by the instance to access it.",\n
       "additionalProperties": { "type": "string" }\n
     },\n
     "parameters": {\n
       "title": "Instance Parameters",\n
       "type": "object",\n
+      "description": "Parameters provided to the instance when requested to configure it.",\n
       "additionalProperties": { "type": "string" }\n
     },\n
     "shared": {\n
       "title": "Shared Instance",\n
       "type": "boolean",\n
-      "description": "Ask for a Shared Instance"\n
+      "description": "This instance is Shared Instance hosted on another instance. It doesn\'t use a computer partition."\n
+    },\n
+    "root_instante_title": {\n
+      "title": "Root Instance Title",\n
+      "type": "string",\n
+      "description": "Title of the Instance at the root of the instance tree. This is the title of the instance that has been requested by the user."\n
+    },\n
+    "ip_list": {\n
+      "title": "IP List",\n
+      "type": "array",\n
+      "descritpion": "List of IPs usable by the Software Instance on the partition",\n
+      "items": {\n
+          "type": "array",\n
+          "items": {\n
+            "type": "string"\n
+          }\n
+      }\n
     },\n
     "sla_parameters": {\n
       "title": "Target Node Selection Parameters",\n