Commit 74f3b76e authored by Cédric Le Ninivin's avatar Cédric Le Ninivin Committed by Cédric Le Ninivin

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

parent 0bebfac1
...@@ -345,8 +345,10 @@ class SoftwareInstance(Item, JSONType): ...@@ -345,8 +345,10 @@ class SoftwareInstance(Item, JSONType):
"sla_parameters": self.getSlaXmlAsDict(), "sla_parameters": self.getSlaXmlAsDict(),
"access_status_message": self.getTextAccessStatus(), "access_status_message": self.getTextAccessStatus(),
"processing_timestamp": parameter_dict.get("timestamp"), "processing_timestamp": parameter_dict.get("timestamp"),
"key": self.getSslKey(), "X509": {
"certificate": self.getSslCertificate(), "key": self.getSslKey(),
"certificate": self.getSslCertificate(),
},
} }
result.update(parameter_dict) result.update(parameter_dict)
self.REQUEST.response.setHeader('Cache-Control', self.REQUEST.response.setHeader('Cache-Control',
......
...@@ -132,15 +132,22 @@ ...@@ -132,15 +132,22 @@
}\n }\n
}\n }\n
},\n },\n
"key": {\n "X509": {\n
"title": "X509 Key",\n "title": "X509 Certificates",\n
"type": "string",\n "description": "X509 Certificates used by the instance to authentify itself on master",\n
"descritpion": "X509 Key used by the instance to authentify itself on master"\n "type": "object",\n
},\n "properties": {\n
"certificate": {\n "key": {\n
"title": "X509 Certificate",\n "title": "X509 Key",\n
"type": "string",\n "type": "string",\n
"descritpion": "X509 Certificate used by the instance to authentify itself on master"\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 },\n
"sla_parameters": {\n "sla_parameters": {\n
"title": "Target Node Selection Parameters",\n "title": "Target Node Selection Parameters",\n
......
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