diff --git a/master/bt5/slapos_cloud/DocumentTemplateItem/portal_components/document.erp5.SoftwareInstance.py b/master/bt5/slapos_cloud/DocumentTemplateItem/portal_components/document.erp5.SoftwareInstance.py index b50e595c7637fd599492df388bc70209b4ff0497..164da252abfbaaba7832159e6c5e565f0b73f6e5 100644 --- a/master/bt5/slapos_cloud/DocumentTemplateItem/portal_components/document.erp5.SoftwareInstance.py +++ b/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"), - "key": self.getSslKey(), - "certificate": self.getSslCertificate(), + "X509": { + "key": self.getSslKey(), + "certificate": self.getSslCertificate(), + }, } result.update(parameter_dict) self.REQUEST.response.setHeader('Cache-Control', diff --git a/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Software%20Instance.xml b/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Software%20Instance.xml index 4e1a2523c9f62a6e6ed98f5891897a4683685d49..5f4d424225b8c62d961e13bd49229c23ff7e702b 100644 --- a/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Software%20Instance.xml +++ b/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