slapos_cloud: Software Instance Schema put X509 in a sub-object

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

@@ -345,8 +345,10 @@ class SoftwareInstance(Item, JSONType):
       "sla_parameters": self.getSlaXmlAsDict(),
       "access_status_message": self.getTextAccessStatus(),
       "processing_timestamp": parameter_dict.get("timestamp"),
+      "X509": {
         "key": self.getSslKey(),
         "certificate": self.getSslCertificate(),
+      },
     }
     result.update(parameter_dict)
     self.REQUEST.response.setHeader('Cache-Control',

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

@@ -132,6 +132,11 @@
           }\n
       }\n
     },\n
+    "X509": {\n
+      "title": "X509 Certificates",\n
+      "description": "X509 Certificates used by the instance to authentify itself on master",\n
+      "type": "object",\n
+      "properties": {\n
         "key": {\n
           "title": "X509 Key",\n
           "type": "string",\n
@@ -141,6 +146,8 @@
           "title": "X509 Certificate",\n
           "type": "string",\n
           "descritpion": "X509 Certificate used by the instance to authentify itself on master"\n
+        }\n
+      }\n
     },\n
     "sla_parameters": {\n
       "title": "Target Node Selection Parameters",\n