.

software/ors-amarisoft/buildout.hash.cfg

@@ -58,8 +58,8 @@ md5sum = 63316f6a8a6a480e10db7e78cca72f3b
 _update_hash_filename_ = ru/lopcomm/stats.jinja2.py
 md5sum = 059fa51fd30372e4382e1c143e718791
 
-[lopcomm-rrh-config.jinja2.py]
-_update_hash_filename_ = lopcomm-rrh-config.jinja2.py
+[ru_lopcomm_config.jinja2.py]
+_update_hash_filename_ = ru/lopcomm/config.jinja2.py
 md5sum = f117548e01a88c408c482d079ec4b018
 
 [ru_lopcomm_software.jinja2.py]

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

@@ -17,7 +17,6 @@ parts =
 # XXX -> ru/lopcomm
 {% if ru == "lopcomm" %}
   lopcomm-rrh-supervision-service
-  lopcomm-rrh-config-template
   netconf-connection-promise
   lopcomm-cu-config
   sshd-service
@@ -457,12 +456,3 @@ output = ${directory:plugins}/check-amarisoft-stats-log.py
 config-testing = {{ slapparameter_dict.get("testing", False) }}
 config-amarisoft-stats-log = ${amarisoft-stats-template:log-output}
 config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
-
-
-# XXX -> ru/lopcomm
-[check-lopcomm-config-log.py]
-<= macro.promise
-promise = check_lopcomm_config_log
-config-testing = {{ slapparameter_dict.get("testing", False) }}
-config-config-log = ${lopcomm-rrh-config-template:log-output}
-config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}

software/ors-amarisoft/instance.cfg

@@ -260,7 +260,7 @@ extra-context =
     raw amarisoft_stats_template   ${amarisoft-stats.jinja2.py:target}
     raw amarisoft_rf_info_template   ${amarisoft-rf-info.jinja2.py:target}
     raw ru_lopcomm_stats_template   ${ru_lopcomm_stats.jinja2.py:target}
-    raw lopcomm_rrh_config_template   ${lopcomm-rrh-config.jinja2.py:target}
+    raw ru_lopcomm_config_template   ${ru_lopcomm_config.jinja2.py:target}
     raw ru_lopcomm_software_template   ${ru_lopcomm_software.jinja2.py:target}
     raw lopcomm_rrh_supervision_template   ${lopcomm-rrh-supervision.jinja2.py:target}
     raw ru_lopcomm_CreateProcessingEle_template   ${ru_lopcomm_CreateProcessingEle.jinja2.xml:target}

software/ors-amarisoft/ru/lopcomm/buildout.cfg

@@ -5,6 +5,9 @@ parts +=
 [ru_lopcomm_libinstance.jinja2.cfg]
 <= download-base
 
+[ru_lopcomm_config.jinja2.py]
+<= download-base
+
 [ru_lopcomm_stats.jinja2.py]
 <= download-base
 

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

@@ -80,10 +80,19 @@ context =
   key cu_config_template {{ru_ref}}-cu-config:output
   import netaddr netaddr
 mode = 0775
-url = {{ lopcomm_rrh_config_template }}
+url = {{ ru_lopcomm_config_template }}
 output = ${directory:script}/{{ru_ref}}-config.py
 
 
+# XXX -> ru/lopcomm
+[check-lopcomm-config-log.py]
+<= macro.promise
+promise = check_lopcomm_config_log
+config-testing = {{ slapparameter_dict.get("testing", False) }}
+config-config-log = ${lopcomm-rrh-config-template:log-output}
+config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
+
+
 {#-  handle notifications from RU #}
 
 [{{ru_ref}}-stats-template]

software/ors-amarisoft/software-base.cfg

@@ -64,9 +64,6 @@ url = ${:_profile_base_location_}/${:_update_hash_filename_}
 <= download-base
 
 # XXX -> rrh_lopcom
-[lopcomm-rrh-config.jinja2.py]
-<= download-base
-
 [lopcomm-rrh-supervision.jinja2.py]
 <= download-base