Commit 9e74abb4 authored by Lu Xu's avatar Lu Xu 👀

fixup

parent 520f7e80
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = 2735363970f6c5569431325c4738896f md5sum = 5675e3dc0fbc8907b6d05eb9b076a5be
[amarisoft-stats.jinja2.py] [amarisoft-stats.jinja2.py]
_update_hash_filename_ = amarisoft-stats.jinja2.py _update_hash_filename_ = amarisoft-stats.jinja2.py
...@@ -36,7 +36,7 @@ md5sum = b34fe47a73890097fbc6ea6374aeb38d ...@@ -36,7 +36,7 @@ md5sum = b34fe47a73890097fbc6ea6374aeb38d
[template-enb] [template-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg _update_hash_filename_ = instance-enb.jinja2.cfg
md5sum = a7186816e468937baafa211ca67984ee md5sum = 6edeefc5efa339dab3acce83dd90003d
[template-gnb] [template-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg _update_hash_filename_ = instance-gnb.jinja2.cfg
...@@ -106,6 +106,10 @@ md5sum = e435990eb0a0d4be41efa9bd16dce09b ...@@ -106,6 +106,10 @@ md5sum = e435990eb0a0d4be41efa9bd16dce09b
filename = netconf/cu_config.jinja2.xml filename = netconf/cu_config.jinja2.xml
md5sum = 2660e02c5afb3e86436282efa9f9fbc4 md5sum = 2660e02c5afb3e86436282efa9f9fbc4
[software_install.jinja2.xml]
filename = netconf/software_install.jinja2.xml
md5sum = 9efdb301023149d3785c814fb5a5318f
[software.cfg.html] [software.cfg.html]
_update_hash_filename_ = gadget/software.cfg.html _update_hash_filename_ = gadget/software.cfg.html
md5sum = 61a2f783fbf683a34aed3d13e00baca2 md5sum = 61a2f783fbf683a34aed3d13e00baca2
......
...@@ -281,7 +281,7 @@ context = ...@@ -281,7 +281,7 @@ context =
key log_file :log-output key log_file :log-output
raw testing {{ slapparameter_dict.get("testing", False) }} raw testing {{ slapparameter_dict.get("testing", False) }}
raw python_path {{ buildout_directory}}/bin/pythonwitheggs raw python_path {{ buildout_directory}}/bin/pythonwitheggs
raw software_download {{ software_download_template }} raw software_download_template {{ software_download_template }}
import netaddr netaddr import netaddr netaddr
mode = 0775 mode = 0775
url = {{ lopcomm_rrh_software_template }} url = {{ lopcomm_rrh_software_template }}
......
...@@ -131,7 +131,7 @@ init = ...@@ -131,7 +131,7 @@ init =
options['tdd'] = get_sdr_info('t').decode() options['tdd'] = get_sdr_info('t').decode()
options['one-watt'] = bool(options['version'] >= 4) options['one-watt'] = bool(options['version'] >= 4)
options['ors-version'] = "{} {} {}".format( options['ors-version'] = "{} {} {}".format(
options['tdd'], options['tdd'],
options['band'], options['band'],
"2x1W" if options['one-watt'] else "2x0.5W", "2x1W" if options['one-watt'] else "2x0.5W",
) )
...@@ -212,6 +212,7 @@ extra-context = ...@@ -212,6 +212,7 @@ extra-context =
raw lopcomm_rrh_config_template ${lopcomm-rrh-config.jinja2.py:target} raw lopcomm_rrh_config_template ${lopcomm-rrh-config.jinja2.py:target}
raw CreateProcessingEle_template ${CreateProcessingEle.jinja2.xml:target} raw CreateProcessingEle_template ${CreateProcessingEle.jinja2.xml:target}
raw cu_config_template ${cu_config.jinja2.xml:target} raw cu_config_template ${cu_config.jinja2.xml:target}
raw software_install_template ${software_install.jinja2.xml:target}
raw openssl_location ${openssl:location} raw openssl_location ${openssl:location}
raw default_lte_n_rb_dl ${default-params:default-lte-n-rb-dl} raw default_lte_n_rb_dl ${default-params:default-lte-n-rb-dl}
raw default_lte_inactivity_timer ${default-params:default-lte-inactivity-timer} raw default_lte_inactivity_timer ${default-params:default-lte-inactivity-timer}
......
...@@ -29,6 +29,7 @@ parts += ...@@ -29,6 +29,7 @@ parts +=
ue-nr.jinja2.cfg ue-nr.jinja2.cfg
CreateProcessingEle.jinja2.xml CreateProcessingEle.jinja2.xml
cu_config.jinja2.xml cu_config.jinja2.xml
software_install.jinja2.xml
sib23.jinja2.asn sib23.jinja2.asn
monitor-httpd-extra-conf monitor-httpd-extra-conf
# copy all gadget file # copy all gadget file
...@@ -172,6 +173,9 @@ filename = CreateProcessingEle.jinja2.xml ...@@ -172,6 +173,9 @@ filename = CreateProcessingEle.jinja2.xml
[cu_config.jinja2.xml] [cu_config.jinja2.xml]
<= copy-netconf-to-instance <= copy-netconf-to-instance
filename = cu_config.jinja2.xml filename = cu_config.jinja2.xml
[software_install.jinja2.xml]
<= copy-netconf-to-instance
filename = software_install.jinja2.xml
# Download gadget files # Download gadget files
[software.cfg.html] [software.cfg.html]
......
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