Commit b72751e7 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼

Update Release Candidate

parents aaf478ec 1ed7106b
......@@ -348,6 +348,7 @@ class TestDataMixin(object):
ignored_plugin_list = [
'__init__.py', # that's not a plugin
'monitor-http-frontend.py', # can't check w/o functioning frontend
'trafficserver-cache-availability.py', # randomly passing when done
]
runpromise_bin = os.path.join(
self.software_path, 'bin', 'monitor.runpromise')
......
......@@ -21,5 +21,4 @@ TestDefaultMonitorHttpdPort-1/etc/plugin/nginx_frontend_ipv4_https.py: ERROR
TestDefaultMonitorHttpdPort-1/etc/plugin/nginx_frontend_ipv6_http.py: ERROR
TestDefaultMonitorHttpdPort-1/etc/plugin/nginx_frontend_ipv6_https.py: ERROR
TestDefaultMonitorHttpdPort-1/etc/plugin/re6st-connectivity.py: OK
TestDefaultMonitorHttpdPort-1/etc/plugin/trafficserver-cache-availability.py: ERROR
TestDefaultMonitorHttpdPort-1/etc/plugin/trafficserver-port-listening.py: ERROR
\ No newline at end of file
......@@ -21,5 +21,4 @@ TestDuplicateSiteKeyProtection-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
TestDuplicateSiteKeyProtection-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
TestDuplicateSiteKeyProtection-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
TestDuplicateSiteKeyProtection-1/etc/plugin/re6st-connectivity.py: OK
TestDuplicateSiteKeyProtection-1/etc/plugin/trafficserver-cache-availability.py: ERROR
TestDuplicateSiteKeyProtection-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
......@@ -25,5 +25,4 @@ TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/nginx_frontend_ipv4_https.py:
TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/re6st-connectivity.py: OK
TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/trafficserver-cache-availability.py: ERROR
TestEnableHttp2ByDefaultDefaultSlave-1/etc/plugin/trafficserver-port-listening.py: ERROR
\ No newline at end of file
......@@ -25,5 +25,4 @@ TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/nginx_fronte
TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/re6st-connectivity.py: OK
TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-cache-availability.py: ERROR
TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
......@@ -25,5 +25,4 @@ TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/re6st-connectivity.py: OK
TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/trafficserver-cache-availability.py: ERROR
TestEnableHttp2ByDefaultFalseSlave-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
......@@ -25,5 +25,4 @@ TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend
TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/re6st-connectivity.py: OK
TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-cache-availability.py: ERROR
TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
......@@ -21,5 +21,4 @@ TestMalformedBackenUrlSlave-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
TestMalformedBackenUrlSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
TestMalformedBackenUrlSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
TestMalformedBackenUrlSlave-1/etc/plugin/re6st-connectivity.py: OK
TestMalformedBackenUrlSlave-1/etc/plugin/trafficserver-cache-availability.py: ERROR
TestMalformedBackenUrlSlave-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
......@@ -19,5 +19,4 @@ TestMasterRequest-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
TestMasterRequest-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
TestMasterRequest-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
TestMasterRequest-1/etc/plugin/re6st-connectivity.py: OK
TestMasterRequest-1/etc/plugin/trafficserver-cache-availability.py: ERROR
TestMasterRequest-1/etc/plugin/trafficserver-port-listening.py: ERROR
\ No newline at end of file
......@@ -19,5 +19,4 @@ TestMasterRequestDomain-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
TestMasterRequestDomain-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
TestMasterRequestDomain-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
TestMasterRequestDomain-1/etc/plugin/re6st-connectivity.py: OK
TestMasterRequestDomain-1/etc/plugin/trafficserver-cache-availability.py: ERROR
TestMasterRequestDomain-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
......@@ -21,5 +21,4 @@ TestQuicEnabled-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
TestQuicEnabled-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
TestQuicEnabled-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
TestQuicEnabled-1/etc/plugin/re6st-connectivity.py: OK
TestQuicEnabled-1/etc/plugin/trafficserver-cache-availability.py: ERROR
TestQuicEnabled-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
......@@ -21,5 +21,4 @@ TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/nginx_frontend_ipv4_https.py:
TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/re6st-connectivity.py: OK
TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/trafficserver-cache-availability.py: ERROR
TestRe6stVerificationUrlDefaultSlave-1/etc/plugin/trafficserver-port-listening.py: ERROR
\ No newline at end of file
......@@ -21,5 +21,4 @@ TestRe6stVerificationUrlSlave-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
TestRe6stVerificationUrlSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
TestRe6stVerificationUrlSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
TestRe6stVerificationUrlSlave-1/etc/plugin/re6st-connectivity.py: ERROR
TestRe6stVerificationUrlSlave-1/etc/plugin/trafficserver-cache-availability.py: ERROR
TestRe6stVerificationUrlSlave-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
......@@ -21,7 +21,6 @@ TestReplicateSlave-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
TestReplicateSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
TestReplicateSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
TestReplicateSlave-1/etc/plugin/re6st-connectivity.py: OK
TestReplicateSlave-1/etc/plugin/trafficserver-cache-availability.py: ERROR
TestReplicateSlave-1/etc/plugin/trafficserver-port-listening.py: ERROR
TestReplicateSlave-2/etc/plugin/buildout-TestReplicateSlave-2-status.py: OK
TestReplicateSlave-2/etc/plugin/caddy_cached.py: ERROR
......@@ -42,5 +41,4 @@ TestReplicateSlave-2/etc/plugin/nginx_frontend_ipv4_https.py: OK
TestReplicateSlave-2/etc/plugin/nginx_frontend_ipv6_http.py: OK
TestReplicateSlave-2/etc/plugin/nginx_frontend_ipv6_https.py: OK
TestReplicateSlave-2/etc/plugin/re6st-connectivity.py: OK
TestReplicateSlave-2/etc/plugin/trafficserver-cache-availability.py: ERROR
TestReplicateSlave-2/etc/plugin/trafficserver-port-listening.py: ERROR
\ No newline at end of file
......@@ -110,5 +110,4 @@ TestSlave-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
TestSlave-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
TestSlave-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
TestSlave-1/etc/plugin/re6st-connectivity.py: OK
TestSlave-1/etc/plugin/trafficserver-cache-availability.py: ERROR
TestSlave-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
......@@ -38,5 +38,4 @@ TestSlaveBadParameters-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
TestSlaveBadParameters-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
TestSlaveBadParameters-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
TestSlaveBadParameters-1/etc/plugin/re6st-connectivity.py: OK
TestSlaveBadParameters-1/etc/plugin/trafficserver-cache-availability.py: ERROR
TestSlaveBadParameters-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
......@@ -110,5 +110,4 @@ TestSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv4_https.py: OK
TestSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_http.py: OK
TestSlaveGlobalDisableHttp2-1/etc/plugin/nginx_frontend_ipv6_https.py: OK
TestSlaveGlobalDisableHttp2-1/etc/plugin/re6st-connectivity.py: OK
TestSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-cache-availability.py: ERROR
TestSlaveGlobalDisableHttp2-1/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file
......@@ -28,7 +28,7 @@
"type": "integer",
"default": 1
},
"key-length" : {
"key-length": {
"title": "Key length",
"description": "Size, in bits, of the SSL key generated to authenticate users.",
"default": 2048,
......
......@@ -384,7 +384,7 @@
"ssl": {
"description": "HTTPS certificate generation parameters",
"properties": {
"caucase-url":{
"caucase-url": {
"title": "Caucase URL",
"description": "URL of caucase service to use. If not set, global setting will be used.",
"type": "string"
......
......@@ -18,4 +18,4 @@ md5sum = 307663d73ef3ef94b02567ecd322252e
[template-default]
filename = instance-default.cfg
md5sum = c85bd43145c7d21321546f988aebbfc7
md5sum = de56145079f33f78d6bcf140f6caf2f3
......@@ -94,7 +94,7 @@ rendered = $${directory:etc}/$${:_buildout_section_name_}
template = inline:
https://$${:hostname}:$${:port} {
bind $${:ipv6}
tls $${:cert-file} $${:key-file}
tls self_signed
gzip
log stdout
errors stderr
......
......@@ -61,7 +61,7 @@ output = ${buildout:directory}/template-default.cfg
mode = 0644
[versions]
erp5.util = 0.4.57
erp5.util = 0.4.58
slapos.recipe.template = 4.3
dnspython = 1.15.0
PyXML = 0.8.5
......
{
"type": "object",
"$schema": "http://json-schema.org/draft-04/schema",
"title": "Input Parameters",
"properties": {
"Log": {
"type": "object",
"title": "Log Configuration",
"properties": {
"options": {
"title": "Log Level",
"description": "Log Level",
"type": "string",
"default": "debug"
}
}
"type": "object",
"$schema": "http://json-schema.org/draft-04/schema",
"title": "Input Parameters",
"properties": {
"Log": {
"type": "object",
"title": "Log Configuration",
"properties": {
"options": {
"title": "Log Level",
"description": "Log Level",
"type": "string",
"default": "debug"
}
}
},
"mme_addr": {
"title": "MME address",
"description": "address of MME for S1AP connection",
"type": "string",
"default": "127.0.1.100"
},
"rf_params": {
"type": "object",
"title": "RF Parameters",
"properties": {
"dl_earfcn": {
"title": "DL EARFCN",
"description": "Downlink EARFCN of the cell",
"type": "number"
},
"mme_addr": {
"title": "MME address",
"description": "address of MME for S1AP connection",
"type": "string",
"default": "127.0.1.100"
"tx_gain": {
"title": "Tx gain",
"description": "Tx gain (in dB)",
"type": "number"
},
"rf_params": {
"type": "object",
"title": "RF Parameters",
"properties": {
"dl_earfcn": {
"title": "DL EARFCN",
"description": "Downlink EARFCN of the cell",
"type": "number"
},
"tx_gain": {
"title": "Tx gain",
"description": "Tx gain (in dB)",
"type": "number"
},
"rx_gain": {
"title": "Rx gain",
"description": "Rx gain (in dB)",
"type": "number"
}
}
"rx_gain": {
"title": "Rx gain",
"description": "Rx gain (in dB)",
"type": "number"
}
}
}
}
}
{
"name": "srsLTE",
"description": "srsLTE",
"serialisation": "json-in-xml",
"software-type": {
"default": {
"title": "Default",
"software-type": "default",
"description": "Default",
"request": "instance-srslte-input-schema.json",
"response": "instance-srslte-schema.json",
"index": 1
}
"name": "srsLTE",
"description": "srsLTE",
"serialisation": "json-in-xml",
"software-type": {
"default": {
"title": "Default",
"software-type": "default",
"description": "Default",
"request": "instance-srslte-input-schema.json",
"response": "instance-srslte-schema.json",
"index": 1
}
}
}
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