Skip to content

slapos
slapos
Commit 20e3c314 authored by Joanne Hugé's avatar Joanne Hugé
Browse files
Options

ors-amarisoft: remove CPU temperature promise 

CPU temperature promise will now come from monitor SR
parent 905ee4b3
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 514 deletions
software/ors-amarisoft/buildout.hash.cfg
View file @ 20e3c314
...@@ -36,23 +36,23 @@ md5sum = e0b68a87238282568e0e04c792ec7288 ...@@ -36,23 +36,23 @@ md5sum = e0b68a87238282568e0e04c792ec7288
[template-enb] [template-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg _update_hash_filename_ = instance-enb.jinja2.cfg
md5sum = ba704d02815e85f3ab30227f117c88ff md5sum = 8fc0bff45b68c89928f0623188470ded
[template-gnb] [template-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg _update_hash_filename_ = instance-gnb.jinja2.cfg
md5sum = b2a1816ceb8e7f475e71454e5389d091 md5sum = 89230ab64b3d4fa826ea47d6612de101
[template-core-network] [template-core-network]
_update_hash_filename_ = instance-core-network.jinja2.cfg _update_hash_filename_ = instance-core-network.jinja2.cfg
md5sum = d39aa3cda900b31cb57f29bd10592102 md5sum = eda157219444c3ac10272626dd5cea10
[template-ue-lte] [template-ue-lte]
_update_hash_filename_ = instance-ue-lte.jinja2.cfg _update_hash_filename_ = instance-ue-lte.jinja2.cfg
md5sum = e201f486d31388cc2542e91bbda85711 md5sum = 41c0a900ec61f0b57f21dcbf721c2226
[template-ue-nr] [template-ue-nr]
_update_hash_filename_ = instance-ue-nr.jinja2.cfg _update_hash_filename_ = instance-ue-nr.jinja2.cfg
md5sum = 765fd303d6013cf4dbee108c53623412 md5sum = 8217b7b7c8ace3b4f1d9ed1241143bdf
[template-obsolete] [template-obsolete]
_update_hash_filename_ = instance-obsolete.jinja2.cfg _update_hash_filename_ = instance-obsolete.jinja2.cfg
......
software/ors-amarisoft/instance-core-network-input-schema.json
View file @ 20e3c314
...@@ -32,24 +32,6 @@ ...@@ -32,24 +32,6 @@
"title": "Use IPv4", "title": "Use IPv4",
"description": "Set to true to use IPv4 for AMF / MME addresses", "description": "Set to true to use IPv4 for AMF / MME addresses",
"type": "boolean" "type": "boolean"
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-core-network.jinja2.cfg
View file @ 20e3c314
...@@ -41,7 +41,6 @@ parts = ...@@ -41,7 +41,6 @@ parts =
mme-config mme-config
mme-service mme-service
monitor-base monitor-base
check-cpu-temperature.py
check-interface-up.py check-interface-up.py
publish-connection-information publish-connection-information
{% if slapparameter_dict.get("iperf3", None) %} {% if slapparameter_dict.get("iperf3", None) %}
...@@ -108,16 +107,6 @@ service = ${:etc}/service ...@@ -108,16 +107,6 @@ service = ${:etc}/service
promise = ${:etc}/promise promise = ${:etc}/promise
log = ${:var}/log log = ${:var}/log
[check-cpu-temperature.py]
<= macro.promise
promise = check_cpu_temperature
config-testing = {{ slapparameter_dict.get("testing", False) }}
config-frequency = {{ slapparameter_dict.get("promise_cpu_temperature_frequency", 5) }}
config-max-spot-temp = {{ slapparameter_dict.get("promise_cpu_max_spot_temp", 90) }}
config-max-avg-temp = {{ slapparameter_dict.get("promise_cpu_max_avg_temp", 80) }}
config-avg-temp-duration = {{ slapparameter_dict.get("promise_cpu_avg_temp_duration", 600) }}
config-avg-flag-file = ${directory:var}/promise_cpu_avg_flag_file
[ltelogs] [ltelogs]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
url = {{ ltelogs_template }} url = {{ ltelogs_template }}
......
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
View file @ 20e3c314
...@@ -185,24 +185,6 @@ ...@@ -185,24 +185,6 @@
"description": "Baseband latency promise will fail if average TX/RX diff reaches threshold (higher than this value)", "description": "Baseband latency promise will fail if average TX/RX diff reaches threshold (higher than this value)",
"type": "number", "type": "number",
"default": 7 "default": 7
},
"promise_cpu_max_spot_temp": {
"title": "Maximum CPU spot temperature",
"description": "Maximum CPU spot temperature above which CPU temperature promise will fail",
"type": "number",
"default": 90
},
"promise_cpu_max_avg_temp": {
"title": "Maximum average CPU temperature",
"description": "If average temperature over specified period reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temp_period": {
"title": "Period of Average CPU temperature checks",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-enb.jinja2.cfg
View file @ 20e3c314
...@@ -15,9 +15,6 @@ parts = ...@@ -15,9 +15,6 @@ parts =
check-lopcomm-lof.py check-lopcomm-lof.py
check-lopcomm-rssi.py check-lopcomm-rssi.py
check-cpri-lock.py check-cpri-lock.py
{% endif %}
{% if not slapparameter_dict.get("sub-instance", False) %}
check-cpu-temperature.py
{% endif %} {% endif %}
check-sdr-busy.py check-sdr-busy.py
check-baseband-latency.py check-baseband-latency.py
...@@ -292,16 +289,6 @@ password = {{ slapparameter_dict['monitor-password'] | string }} ...@@ -292,16 +289,6 @@ password = {{ slapparameter_dict['monitor-password'] | string }}
<= monitor-promise-base <= monitor-promise-base
name = ${:_buildout_section_name_} name = ${:_buildout_section_name_}
[check-cpu-temperature.py]
<= macro.promise
promise = check_cpu_temperature
config-testing = {{ slapparameter_dict.get("testing", False) }}
config-frequency = {{ slapparameter_dict.get("promise_cpu_temperature_frequency", 5) }}
config-max-spot-temp = {{ slapparameter_dict.get("promise_cpu_max_spot_temp", 90) }}
config-max-avg-temp = {{ slapparameter_dict.get("promise_cpu_max_avg_temp", 80) }}
config-avg-temp-duration = {{ slapparameter_dict.get("promise_cpu_avg_temp_duration", 600) }}
config-avg-flag-file = ${directory:var}/promise_cpu_avg_flag_file
[check-sdr-busy.py] [check-sdr-busy.py]
<= macro.promise <= macro.promise
promise = check_sdr_busy promise = check_sdr_busy
......
software/ors-amarisoft/instance-gnb-input-schema.json.jinja2
View file @ 20e3c314
...@@ -325,24 +325,6 @@ ...@@ -325,24 +325,6 @@
"description": "Average TX/RX diff threshold above which baseband latency promise will fail", "description": "Average TX/RX diff threshold above which baseband latency promise will fail",
"type": "number", "type": "number",
"default": 7 "default": 7
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-gnb.jinja2.cfg
View file @ 20e3c314
...@@ -13,9 +13,6 @@ parts = ...@@ -13,9 +13,6 @@ parts =
check-lopcomm-lof.py check-lopcomm-lof.py
check-lopcomm-rssi.py check-lopcomm-rssi.py
check-cpri-lock.py check-cpri-lock.py
{% endif %}
{% if not slapparameter_dict.get("sub-instance", False) %}
check-cpu-temperature.py
{% endif %} {% endif %}
check-sdr-busy.py check-sdr-busy.py
check-baseband-latency.py check-baseband-latency.py
...@@ -246,16 +243,6 @@ password = {{ slapparameter_dict['monitor-password'] | string }} ...@@ -246,16 +243,6 @@ password = {{ slapparameter_dict['monitor-password'] | string }}
<= monitor-promise-base <= monitor-promise-base
name = ${:_buildout_section_name_} name = ${:_buildout_section_name_}
[check-cpu-temperature.py]
<= macro.promise
promise = check_cpu_temperature
config-testing = {{ slapparameter_dict.get("testing", False) }}
config-frequency = {{ slapparameter_dict.get("promise_cpu_temperature_frequency", 5) }}
config-max-spot-temp = {{ slapparameter_dict.get("promise_cpu_max_spot_temp", 90) }}
config-max-avg-temp = {{ slapparameter_dict.get("promise_cpu_max_avg_temp", 80) }}
config-avg-temp-duration = {{ slapparameter_dict.get("promise_cpu_avg_temp_duration", 600) }}
config-avg-flag-file = ${directory:var}/promise_cpu_avg_flag_file
[check-sdr-busy.py] [check-sdr-busy.py]
<= macro.promise <= macro.promise
promise = check_sdr_busy promise = check_sdr_busy
......
software/ors-amarisoft/instance-tdd-enb-input-schema.json
View file @ 20e3c314
...@@ -185,24 +185,6 @@ ...@@ -185,24 +185,6 @@
"description": "Baseband latency promise will fail if average TX/RX diff reaches threshold (higher than this value)", "description": "Baseband latency promise will fail if average TX/RX diff reaches threshold (higher than this value)",
"type": "number", "type": "number",
"default": 7 "default": 7
},
"promise_cpu_max_spot_temp": {
"title": "Maximum CPU spot temperature",
"description": "Maximum CPU spot temperature above which CPU temperature promise will fail",
"type": "number",
"default": 90
},
"promise_cpu_max_avg_temp": {
"title": "Maximum average CPU temperature",
"description": "If average temperature over specified period reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temp_period": {
"title": "Period of Average CPU temperature checks",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd-gnb-input-schema.json
View file @ 20e3c314
...@@ -325,24 +325,6 @@ ...@@ -325,24 +325,6 @@
"description": "Average TX/RX diff threshold above which baseband latency promise will fail", "description": "Average TX/RX diff threshold above which baseband latency promise will fail",
"type": "number", "type": "number",
"default": 7 "default": 7
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd-ue-lte-input-schema.json
View file @ 20e3c314
...@@ -92,24 +92,6 @@ ...@@ -92,24 +92,6 @@
"description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.", "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
"type": "string", "type": "string",
"default": "" "default": ""
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd-ue-nr-input-schema.json
View file @ 20e3c314
...@@ -104,24 +104,6 @@ ...@@ -104,24 +104,6 @@
"description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.", "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
"type": "string", "type": "string",
"default": "" "default": ""
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd1900-enb-input-schema.json
View file @ 20e3c314
...@@ -154,24 +154,6 @@ ...@@ -154,24 +154,6 @@
"description": "Baseband latency promise will fail if average TX/RX diff reaches threshold (higher than this value)", "description": "Baseband latency promise will fail if average TX/RX diff reaches threshold (higher than this value)",
"type": "number", "type": "number",
"default": 7 "default": 7
},
"promise_cpu_max_spot_temp": {
"title": "Maximum CPU spot temperature",
"description": "Maximum CPU spot temperature above which CPU temperature promise will fail",
"type": "number",
"default": 90
},
"promise_cpu_max_avg_temp": {
"title": "Maximum average CPU temperature",
"description": "If average temperature over specified period reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temp_period": {
"title": "Period of Average CPU temperature checks",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json
View file @ 20e3c314
...@@ -314,24 +314,6 @@ ...@@ -314,24 +314,6 @@
"description": "Average TX/RX diff threshold above which baseband latency promise will fail", "description": "Average TX/RX diff threshold above which baseband latency promise will fail",
"type": "number", "type": "number",
"default": 7 "default": 7
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd1900-ue-lte-input-schema.json
View file @ 20e3c314
...@@ -92,24 +92,6 @@ ...@@ -92,24 +92,6 @@
"description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.", "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
"type": "string", "type": "string",
"default": "" "default": ""
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd1900-ue-nr-input-schema.json
View file @ 20e3c314
...@@ -104,24 +104,6 @@ ...@@ -104,24 +104,6 @@
"description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.", "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
"type": "string", "type": "string",
"default": "" "default": ""
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd2600-enb-input-schema.json
View file @ 20e3c314
...@@ -154,24 +154,6 @@ ...@@ -154,24 +154,6 @@
"description": "Baseband latency promise will fail if average TX/RX diff reaches threshold (higher than this value)", "description": "Baseband latency promise will fail if average TX/RX diff reaches threshold (higher than this value)",
"type": "number", "type": "number",
"default": 7 "default": 7
},
"promise_cpu_max_spot_temp": {
"title": "Maximum CPU spot temperature",
"description": "Maximum CPU spot temperature above which CPU temperature promise will fail",
"type": "number",
"default": 90
},
"promise_cpu_max_avg_temp": {
"title": "Maximum average CPU temperature",
"description": "If average temperature over specified period reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temp_period": {
"title": "Period of Average CPU temperature checks",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json
View file @ 20e3c314
...@@ -314,24 +314,6 @@ ...@@ -314,24 +314,6 @@
"description": "Average TX/RX diff threshold above which baseband latency promise will fail", "description": "Average TX/RX diff threshold above which baseband latency promise will fail",
"type": "number", "type": "number",
"default": 7 "default": 7
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd2600-ue-lte-input-schema.json
View file @ 20e3c314
...@@ -92,24 +92,6 @@ ...@@ -92,24 +92,6 @@
"description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.", "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
"type": "string", "type": "string",
"default": "" "default": ""
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd2600-ue-nr-input-schema.json
View file @ 20e3c314
...@@ -104,24 +104,6 @@ ...@@ -104,24 +104,6 @@
"description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.", "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
"type": "string", "type": "string",
"default": "" "default": ""
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd3500-enb-input-schema.json
View file @ 20e3c314
...@@ -154,24 +154,6 @@ ...@@ -154,24 +154,6 @@
"description": "Baseband latency promise will fail if average TX/RX diff reaches threshold (higher than this value)", "description": "Baseband latency promise will fail if average TX/RX diff reaches threshold (higher than this value)",
"type": "number", "type": "number",
"default": 7 "default": 7
},
"promise_cpu_max_spot_temp": {
"title": "Maximum CPU spot temperature",
"description": "Maximum CPU spot temperature above which CPU temperature promise will fail",
"type": "number",
"default": 90
},
"promise_cpu_max_avg_temp": {
"title": "Maximum average CPU temperature",
"description": "If average temperature over specified period reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temp_period": {
"title": "Period of Average CPU temperature checks",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json
View file @ 20e3c314
...@@ -314,24 +314,6 @@ ...@@ -314,24 +314,6 @@
"description": "Average TX/RX diff threshold above which baseband latency promise will fail", "description": "Average TX/RX diff threshold above which baseband latency promise will fail",
"type": "number", "type": "number",
"default": 7 "default": 7
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd3500-ue-lte-input-schema.json
View file @ 20e3c314
...@@ -92,24 +92,6 @@ ...@@ -92,24 +92,6 @@
"description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.", "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
"type": "string", "type": "string",
"default": "" "default": ""
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd3500-ue-nr-input-schema.json
View file @ 20e3c314
...@@ -104,24 +104,6 @@ ...@@ -104,24 +104,6 @@
"description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.", "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
"type": "string", "type": "string",
"default": "" "default": ""
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd3700-enb-input-schema.json
View file @ 20e3c314
...@@ -154,24 +154,6 @@ ...@@ -154,24 +154,6 @@
"description": "Baseband latency promise will fail if average TX/RX diff reaches threshold (higher than this value)", "description": "Baseband latency promise will fail if average TX/RX diff reaches threshold (higher than this value)",
"type": "number", "type": "number",
"default": 7 "default": 7
},
"promise_cpu_max_spot_temp": {
"title": "Maximum CPU spot temperature",
"description": "Maximum CPU spot temperature above which CPU temperature promise will fail",
"type": "number",
"default": 90
},
"promise_cpu_max_avg_temp": {
"title": "Maximum average CPU temperature",
"description": "If average temperature over specified period reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temp_period": {
"title": "Period of Average CPU temperature checks",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json
View file @ 20e3c314
...@@ -314,24 +314,6 @@ ...@@ -314,24 +314,6 @@
"description": "Average TX/RX diff threshold above which baseband latency promise will fail", "description": "Average TX/RX diff threshold above which baseband latency promise will fail",
"type": "number", "type": "number",
"default": 7 "default": 7
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd3700-ue-lte-input-schema.json
View file @ 20e3c314
...@@ -92,24 +92,6 @@ ...@@ -92,24 +92,6 @@
"description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.", "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
"type": "string", "type": "string",
"default": "" "default": ""
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-tdd3700-ue-nr-input-schema.json
View file @ 20e3c314
...@@ -104,24 +104,6 @@ ...@@ -104,24 +104,6 @@
"description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.", "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
"type": "string", "type": "string",
"default": "" "default": ""
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-ue-lte-input-schema.json.jinja2
View file @ 20e3c314
...@@ -92,24 +92,6 @@ ...@@ -92,24 +92,6 @@
"description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.", "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
"type": "string", "type": "string",
"default": "" "default": ""
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-ue-lte.jinja2.cfg
View file @ 20e3c314
...@@ -5,7 +5,6 @@ parts = ...@@ -5,7 +5,6 @@ parts =
lte-ue-lte-config lte-ue-lte-config
lte-ue-service lte-ue-service
check-sdr-busy.py check-sdr-busy.py
check-cpu-temperature.py
monitor-base monitor-base
publish-connection-information publish-connection-information
...@@ -144,16 +143,6 @@ password = {{ slapparameter_dict['monitor-password'] | string }} ...@@ -144,16 +143,6 @@ password = {{ slapparameter_dict['monitor-password'] | string }}
<= monitor-promise-base <= monitor-promise-base
name = ${:_buildout_section_name_} name = ${:_buildout_section_name_}
[check-cpu-temperature.py]
<= macro.promise
promise = check_cpu_temperature
config-testing = {{ slapparameter_dict.get("testing", False) }}
config-frequency = {{ slapparameter_dict.get("promise_cpu_temperature_frequency", 5) }}
config-max-spot-temp = {{ slapparameter_dict.get("promise_cpu_max_spot_temp", 90) }}
config-max-avg-temp = {{ slapparameter_dict.get("promise_cpu_max_avg_temp", 80) }}
config-avg-temp-duration = {{ slapparameter_dict.get("promise_cpu_avg_temp_duration", 600) }}
config-avg-flag-file = ${directory:var}/promise_cpu_avg_flag_file
[check-sdr-busy.py] [check-sdr-busy.py]
<= macro.promise <= macro.promise
promise = check_sdr_busy promise = check_sdr_busy
......
software/ors-amarisoft/instance-ue-nr-input-schema.json.jinja2
View file @ 20e3c314
...@@ -104,24 +104,6 @@ ...@@ -104,24 +104,6 @@
"description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.", "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
"type": "string", "type": "string",
"default": "" "default": ""
},
"promise_cpu_temperature_threshold": {
"title": "CPU temperature promise threshold",
"description": "Temperature threshold above which CPU temperature promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold": {
"title": "Average CPU temperature promise threshold",
"description": "If average temperature over specified duration reaches this threshold, promise will fail",
"type": "number",
"default": 80
},
"promise_cpu_avg_temperature_threshold_duration": {
"title": "Average CPU temperature promise threshold duration",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"default": 600
} }
} }
} }
software/ors-amarisoft/instance-ue-nr.jinja2.cfg
View file @ 20e3c314
...@@ -5,7 +5,6 @@ parts = ...@@ -5,7 +5,6 @@ parts =
lte-ue-nr-config lte-ue-nr-config
lte-ue-service lte-ue-service
check-sdr-busy.py check-sdr-busy.py
check-cpu-temperature.py
monitor-base monitor-base
publish-connection-information publish-connection-information
...@@ -147,16 +146,6 @@ password = {{ slapparameter_dict['monitor-password'] | string }} ...@@ -147,16 +146,6 @@ password = {{ slapparameter_dict['monitor-password'] | string }}
<= monitor-promise-base <= monitor-promise-base
name = ${:_buildout_section_name_} name = ${:_buildout_section_name_}
[check-cpu-temperature.py]
<= macro.promise
promise = check_cpu_temperature
config-testing = {{ slapparameter_dict.get("testing", False) }}
config-frequency = {{ slapparameter_dict.get("promise_cpu_temperature_frequency", 5) }}
config-max-spot-temp = {{ slapparameter_dict.get("promise_cpu_max_spot_temp", 90) }}
config-max-avg-temp = {{ slapparameter_dict.get("promise_cpu_max_avg_temp", 80) }}
config-avg-temp-duration = {{ slapparameter_dict.get("promise_cpu_avg_temp_duration", 600) }}
config-avg-flag-file = ${directory:var}/promise_cpu_avg_flag_file
[check-sdr-busy.py] [check-sdr-busy.py]
<= macro.promise <= macro.promise
promise = check_sdr_busy promise = check_sdr_busy
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7