diff --git a/software/ors-amarisoft/buildout.hash.cfg b/software/ors-amarisoft/buildout.hash.cfg index 234b2764da07adec9be9fa00674d1f1377a82f8a..4f24e1798471ed30e1e9b3649661c57f0d8b6534 100644 --- a/software/ors-amarisoft/buildout.hash.cfg +++ b/software/ors-amarisoft/buildout.hash.cfg @@ -32,7 +32,7 @@ md5sum = ab666fdfadbfc7d8a16ace38d295c883 [ru_libinstance.jinja2.cfg] _update_hash_filename_ = ru/libinstance.jinja2.cfg -md5sum = d3ae8839b1a7b7a225bc69c3910c0b35 +md5sum = 17f90d61a4994c58ceb816d2d8b06422 [ru_sdr_libinstance.jinja2.cfg] _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg @@ -40,7 +40,7 @@ md5sum = de71c63b8df940207409de7e948f7c8c [ru_lopcomm_libinstance.jinja2.cfg] _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg -md5sum = b2af1e70141216a4db07cca655aa63a7 +md5sum = 497c7831d9bcf47e1d1c87284b08a5dc [ru_sunwave_libinstance.jinja2.cfg] _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg diff --git a/software/ors-amarisoft/ru/libinstance.jinja2.cfg b/software/ors-amarisoft/ru/libinstance.jinja2.cfg index 5caf62c74ca291d73328a2267269b76677edda8e..15d9d49b5804c929482c70925e081de2740f4c92 100644 --- a/software/ors-amarisoft/ru/libinstance.jinja2.cfg +++ b/software/ors-amarisoft/ru/libinstance.jinja2.cfg @@ -16,6 +16,8 @@ {%- macro buildout() %} +{%- set testing = slapparameter_dict.get("testing", False) %} + {#- part emits new buildout section and registers it into buildout.parts #} {%- set parts_list = [] %} {%- macro part(name) %} @@ -28,7 +30,7 @@ {{ part('promise-'+name) }} <= monitor-promise-base name = {{ name }}.py -config-testing = {{ slapparameter_dict.get("testing", False) }} +config-testing = {{ testing }} config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }} {%- endmacro %} @@ -205,7 +207,7 @@ context = key slapparameter_dict slap-configuration:configuration key log_file :log-output raw stats_period {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }} - raw testing {{ slapparameter_dict.get("testing", False) }} + raw testing {{ testing }} raw python_path {{ buildout_directory}}/bin/pythonwitheggs mode = 0775 url = {{ ru_amarisoft_rf_info_template }} @@ -228,7 +230,7 @@ context = key slapparameter_dict slap-configuration:configuration key log_file :log-output raw stats_period {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }} - raw testing {{ slapparameter_dict.get("testing", False) }} + raw testing {{ testing }} raw python_path {{ buildout_directory}}/bin/pythonwitheggs mode = 0775 url = {{ ru_amarisoft_stats_template }} diff --git a/software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg b/software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg index c32dceaf081301262633a99476de007bbd6c0b7c..7a0e0ff13a8e7d08b1abc117ba6206c632d633ab 100644 --- a/software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg +++ b/software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg @@ -27,7 +27,7 @@ context = key log_file :log-output key software_reply_json_log_file :software-reply-json-log-output key remote_file_path :remote-file-path - raw testing {{ slapparameter_dict.get("testing", False) }} + raw testing {{ testing }} raw python_path {{ buildout_directory}}/bin/pythonwitheggs raw buildout_directory_path {{ buildout_directory }} key is_firmware_updated :is_firmware_updated @@ -69,7 +69,7 @@ context = section directory directory section vtap vtap.{{ cell._tap }} key log_file :log-output - raw testing {{ slapparameter_dict.get("testing", False) }} + raw testing {{ testing }} raw python_path {{ buildout_directory}}/bin/pythonwitheggs raw buildout_directory_path {{ buildout_directory }} raw CreateProcessingEle_template {{ ru_lopcomm_CreateProcessingEle_template }} @@ -110,7 +110,7 @@ context = key is_netconf_connected :is_netconf_connected key ncsession_json_log_file :ncsession-json-log-output key software_json_log_file :software-json-log-output - raw testing {{ slapparameter_dict.get("testing", False) }} + raw testing {{ testing }} raw python_path {{ buildout_directory}}/bin/pythonwitheggs raw buildout_directory_path {{ buildout_directory }} import netaddr netaddr @@ -174,7 +174,7 @@ context = key log_file :log-output key json_log_file :json-log-output raw stats_period {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }} - raw testing {{ slapparameter_dict.get("testing", False) }} + raw testing {{ testing }} raw python_path {{ buildout_directory}}/bin/pythonwitheggs import netaddr netaddr mode = 0775