ors-amarisoft: remove option to provide link to config file

software/ors-amarisoft/buildout.hash.cfg

@@ -44,7 +44,7 @@ md5sum = b7906ca3a6b17963f78f680fc0842b74
 
 [ru_lopcomm_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
-md5sum = 41ea7248b54ea893cb83a01655018711
+md5sum = b8131ea1a592ccd3f729a26d59e97d65
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
@@ -88,19 +88,19 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = f54bdbb308aee424b07ede8b551cfe5b
+md5sum = f4ee77799ef362f3bf66dd6876a15381
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
-md5sum = 601d6237059fa665d3f3ffb6a78ad9ca
+md5sum = 315633c8d09b84ef1c699094810c654a
 
 [template-core-network]
 _update_hash_filename_ = instance-core-network.jinja2.cfg
-md5sum = 326e194e9c98d58d926f89521bb95df5
+md5sum = 396e5aa119c7bec0ae8b24454a9b2d5c
 
 [template-ue]
 _update_hash_filename_ = instance-ue.jinja2.cfg
-md5sum = 812a43458c21f7d0cdb2141515a236ae
+md5sum = 574e525659bd73c5385c78469adadf91
 
 [template-obsolete]
 _update_hash_filename_ = instance-obsolete.jinja2.cfg

software/ors-amarisoft/instance-core-network.jinja2.cfg

@@ -135,14 +135,6 @@ service = ${:etc}/service
 promise = ${:etc}/promise
 log = ${:var}/log
 
-{% if slapparameter_dict.get("mme_config_link", None) %}
-[mme-config-dl]
-recipe = slapos.recipe.build:download
-url = {{ slapparameter_dict.get("mme_config_link") }}
-version = {{ slapparameter_dict.get("mme_config_version") }}
-offline = false
-{% endif %}
-
 ### IMS
 [ims-service]
 recipe = slapos.cookbook:wrapper
@@ -239,11 +231,7 @@ context =
 
 [mme-config]
 <= config-base
-{% if slapparameter_dict.get("mme_config_link", None) %}
-url = ${mme-config-dl:target}
-{% else %}
 url = {{ mme_template }}
-{% endif %}
 output = ${directory:etc}/mme.cfg
 
 {% if slapparameter_dict.get("local_domain", '') %}

software/ors-amarisoft/instance-enb.jinja2.cfg

@@ -81,14 +81,6 @@ service = ${:etc}/service
 promise = ${:etc}/promise
 log = ${:var}/log
 
-{% if slapparameter_dict.get("enb_config_link", None) %}
-[enb-config-dl]
-recipe = slapos.recipe.build:download
-url = {{ slapparameter_dict.get("enb_config_link") }}
-version = {{ slapparameter_dict.get("enb_config_version") }}
-offline = false
-{% endif %}
-
 [enb-sh-wrapper]
 recipe = slapos.recipe.template
 output = ${directory:bin}/${:_buildout_section_name_}
@@ -203,11 +195,7 @@ context =
 
 [enb-config]
 <= config-base
-{% if slapparameter_dict.get("enb_config_link", None) %}
-url = ${enb-config-dl:target}
-{% else %}
 url = {{ enb_template }}
-{% endif %}
 output = ${directory:etc}/enb.cfg
 import-list =
     rawfile slaplte.jinja2 {{ slaplte_template }}

software/ors-amarisoft/instance-ors-enb.jinja2.cfg

@@ -199,12 +199,6 @@
     are present, replace their generic enb_* counterparts with gnb_* ones #}
 {%- if enb_mode == 'gnb'  %}
 {%-   set _ = slapparameter_dict  %}
-{%-   if 'gnb_config_link' in _ %}
-{%-     do _.update({
-          'enb_config_link':    _.gnb_config_link,
-          'enb_config_version': _.get('gnb_config_version'),
-        })  %}
-{%-   endif %}
 {%-   if 'gnb_stats_fetch_period' in _  %}
 {%-     do _.update({'enb_stats_fetch_period': _.gnb_stats_fetch_period}) %}
 {%-   endif %}

software/ors-amarisoft/instance-ue.jinja2.cfg

@@ -58,14 +58,6 @@ service = ${:etc}/service
 promise = ${:etc}/promise
 log = ${:var}/log
 
-{% if slapparameter_dict.get("ue_config_link", None) %}
-[ue-config-dl]
-recipe = slapos.recipe.build:download
-url = {{ slapparameter_dict.get("ue_config_link") }}
-version = {{ slapparameter_dict.get("ue_config_version") }}
-offline = false
-{% endif %}
-
 [lte-ue-sh-wrapper]
 recipe = slapos.recipe.template
 output = ${directory:bin}/${:_buildout_section_name_}
@@ -110,11 +102,7 @@ context =
 
 [lte-ue-config]
 <= config-base
-{% if slapparameter_dict.get("ue_config_link", None) %}
-url = ${ue-config-dl:target}
-{% else %}
 url = {{ ue_template }}
-{% endif %}
 output = ${directory:etc}/ue.cfg
 import-list =
     rawfile slaplte.jinja2 {{ slaplte_template }}

software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg

@@ -56,21 +56,9 @@ config-command = [ -f ${ {{-B('%s-software-template' % ru_ref)}}:is_firmware_upd
 
 {#-  push config to RU #}
 
-{%   if ru.get("cu_config_link", None) %}
-[{{ B('%s-cu-config-dl' % ru_ref) }}]
-recipe = slapos.recipe.build:download
-url = {{ ru.cu_config_link }}
-version = {{ ru.get("cu_config_version") }}
-offline = false
-{%   endif %}
-
 [{{ B('%s-cu-config' % ru_ref) }}]
 <= config-base
-{% if ru.get("cu_config_link", None) %}
-url = ${ {{-B('%s-cu-config-dl' % ru_ref)}}:target}
-{% else %}
 url = {{ ru_lopcomm_cu_config_template }}
-{% endif %}
 output = ${directory:etc}/{{B('%s-cu_config.xml' % ru_ref)}}
 extra-context =
   import xearfcn_module  xlte.earfcn