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

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

@@ -349,8 +349,10 @@ class SoftwareInstance(Item, JSONType):
       "sla_parameters": self.getSlaXmlAsDict(),
       "access_status_message": self.getTextAccessStatus(),
       "processing_timestamp": parameter_dict.get("timestamp"),
-      "key": self.getSslKey(),
-      "certificate": self.getSslCertificate(),
+      "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,15 +132,22 @@
           }\n
       }\n
     },\n
-    "key": {\n
-      "title": "X509 Key",\n
-      "type": "string",\n
-      "descritpion": "X509 Key used by the instance to authentify itself on master"\n
-    },\n
-    "certificate": {\n
-      "title": "X509 Certificate",\n
-      "type": "string",\n
-      "descritpion": "X509 Certificate used by the instance to authentify itself on master"\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
+          "descritpion": "X509 Key used by the instance to authentify itself on master"\n
+        },\n
+        "certificate": {\n
+          "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