.

software/ors-amarisoft/buildout.hash.cfg

@@ -28,7 +28,7 @@ md5sum = 8b24f6cf584eb096a61750e39e376ad0
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 737c794082be65a4711798dcc9b6044f
+md5sum = b71776599bf20493ed6914a7f017822e
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
@@ -36,7 +36,7 @@ md5sum = e27ebe0ff200a3e4492412f164ca9b73
 
 [ru_lopcomm_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
-md5sum = 9dd99a331bffe3bee34ab645242059cc
+md5sum = 8cfa2d8e5ef5ba3ecc7db2bcc5a0415d
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
@@ -50,8 +50,8 @@ md5sum = 674dcc250c0b6bb43d8546624552fc5d
 _update_hash_filename_ = amarisoft-rf-info.jinja2.py
 md5sum = d2fe2fbe70c6824c514a7c4034a2ddb3
 
-[ncclient_common]
-_update_hash_filename_ = ncclient_common.py
+[ru_lopcomm_ncclient_common.py]
+_update_hash_filename_ = ru/lopcomm/ncclient_common.py
 md5sum = 63316f6a8a6a480e10db7e78cca72f3b
 
 [ru_lopcomm_stats.jinja2.py]
@@ -62,7 +62,7 @@ md5sum = 059fa51fd30372e4382e1c143e718791
 _update_hash_filename_ = lopcomm-rrh-config.jinja2.py
 md5sum = f2f550b68c8ab243ce1a4bb73a9abc1c
 
-[ru_lopcomm-software.jinja2.py]
+[ru_lopcomm_software.jinja2.py]
 _update_hash_filename_ = ru/lopcomm/software.jinja2.py
 md5sum = 1cb238147b57241343a1e224f990265b
 

software/ors-amarisoft/instance.cfg

@@ -261,7 +261,7 @@ extra-context =
     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_software_template   ${ru_lopcomm-software.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 CreateProcessingEle_template   ${CreateProcessingEle.jinja2.xml:target}
     raw cu_config_template   ${cu_config.jinja2.xml:target}

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

@@ -4,12 +4,16 @@
 [ru_lopcomm_stats.jinja2.py]
 <= download-base
 
-[ru_lopcomm-software.jinja2.py]
+[ru_lopcomm_software.jinja2.py]
 <= download-base
 
-[ru_lopcomm-firmware-dl]
+[ru_lopcomm_firmware-dl]
 recipe = slapos.recipe.build:download
 url = https://lab.nexedi.com/nexedi/ors-utils/raw/master/lopcomm-firmware/${:filename}
 filename = PR.PRM61C70V1004.002.tar.gz
 md5sum = 4e06fd62968f9f53fd819ef8d880a8f4
 destination = ${directory:etc}/${:filename}
+
+[ru_lopcomm_ncclient_common]
+<= download-base
+#destination = ${buildout:directory}/ncclient_common.py

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

@@ -20,7 +20,7 @@ extensions = jinja2.ext.do
 _logbase = ${directory:var}/log/{{ru_ref}}-software
 log-output = ${:_logbase}.log
 software-reply-json-log-output = ${:_logbase}-reply.json.log
-remote-file-path = sftp://${user-info:pw-name}@[${slap-configuration:ipv6-random}]:${sshd-port:port}${ru_lopcomm-firmware-dl:destination}
+remote-file-path = sftp://${user-info:pw-name}@[${slap-configuration:ipv6-random}]:${sshd-port:port}${ru_lopcomm_firmware-dl:destination}
 context =
   section directory directory
   section slap_configuration slap-configuration
@@ -32,7 +32,7 @@ context =
   raw python_path {{ buildout_directory}}/bin/pythonwitheggs
   raw buildout_directory_path {{ buildout_directory }}
   raw is_firmware_updated ${directory:etc}/{{ru_ref}}.is_firmware_updated
-  raw firmware_name ${ru_lopcomm-firmware-dl:filename}
+  raw firmware_name ${ru_lopcomm_firmware-dl:filename}
   import netaddr netaddr
 mode = 0775
 url = {{ ru_lopcomm_software_template }}
@@ -42,11 +42,14 @@ output = ${directory:script}/{{ru_ref}}-software.py
 
 {{ promise('%s-firmware.py' % ru_ref) }}
 promise = check_command_execute
-#name = firmware-update-promise.py  XXX needed ?
 config-command = [ -f ${directory:etc}/{{ru_ref}}.is_firmware_updated ]
 
 
-{#-  notifications from RU #}
+{#-  push config to RU #}
+# XXX
+
+
+{#-  handle notifications from RU #}
 
 [{{ru_ref}}-stats-template]
 recipe = slapos.recipe.template:jinja2

software/ors-amarisoft/software-base.cfg

@@ -22,7 +22,6 @@ parts +=
   template
   slapos-cookbook
   ltelogs.jinja2.sh
-  ncclient_common
 # copy all configs by default
   mme.jinja2.cfg
   dnsmasq.jinja2.cfg
@@ -60,10 +59,6 @@ output = ${buildout:directory}/template.cfg
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
 
-[ncclient_common]
-<= download-base
-destination = ${buildout:directory}/ncclient_common.py
-
 [amarisoft-stats.jinja2.py]
 <= download-base