Commit fac758db authored by Cédric Le Ninivin's avatar Cédric Le Ninivin

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

parent 00640900
......@@ -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',
......
......@@ -134,15 +134,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
......
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