sw upgrading wip

software/ors-amarisoft/buildout.hash.cfg

@@ -40,7 +40,7 @@ md5sum = 20764fa7554d90d040f3847a9573ef93
 
 [lopcomm-rrh-software.jinja2.py]
 _update_hash_filename_ = lopcomm-rrh-software.jinja2.py
-md5sum = 673516819477d924f94315ffc734a1cc
+md5sum = 126641b08c026206d8728a20135eb964
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg

software/ors-amarisoft/instance-enb-input-schema.json.jinja2

@@ -118,10 +118,14 @@
       "textarea": true,
       "type": "string"
     },
-    "customised_download_rpc_xml": {
-      "title": "Firmware Download XML",
-      "description": "Customised firmware download XML",
-      "textarea": true,
+    "sftp_remote_file_path": {
+      "title": "SFTP Remote file path",
+      "description": "SFTP Remote file path. e.g. sftp://user@ip_address:port:/path/to/file",
+      "type": "string"
+    },
+    "sftp_remote_file_path_password": {
+      "title": "SFTP Remote file path password",
+      "description": "SFTP Remote file path password",
       "type": "string"
     },
     "firmware_name": {

software/ors-amarisoft/instance-fdd-enb-input-schema.json

@@ -117,10 +117,14 @@
       "textarea": true,
       "type": "string"
     },
-    "customised_download_rpc_xml": {
-      "title": "Firmware Download XML",
-      "description": "Customised firmware download XML",
-      "textarea": true,
+    "sftp_remote_file_path": {
+      "title": "SFTP Remote file path",
+      "description": "SFTP Remote file path. e.g. sftp://user@ip_address:port:/path/to/file",
+      "type": "string"
+    },
+    "sftp_remote_file_path_password": {
+      "title": "SFTP Remote file path password",
+      "description": "SFTP Remote file path password",
       "type": "string"
     },
     "firmware_name": {

software/ors-amarisoft/lopcomm-rrh-software.jinja2.py

@@ -26,23 +26,30 @@ if __name__ == '__main__':
           if running_slot_name and nonrunning_slot_name:
               if running_slot_name:
                   nc.logger.info("One slot is running and one is non-running. Proceeding...")
-{% if slapparameter_dict.get('customised_download_rpc_xml') %}
+{% if slapparameter_dict.get('sftp_remote_file_path') %}
     {% set firmware_name = slapparameter_dict.get('firmware_name') %}
+    {% set remote_file_path = slapparameter_dict.get('sftp_remote_file_path') %}
 {% else %}
     {% set firmware_name = "{{ firmware_name }}" %} 
+    {% set remote_file_path = {{ remote_file_path }} %}
 {% endif %}
                   if running_slot_name_build_version in firmware_name:
                       nc.logger.info("Running slot's build-version %s is already updated. Skipping install." % running_slot_name_build_version)
                   else:
                       nc.logger.info("Current build version: %s" % running_slot_name_build_version)
-{% if slapparameter_dict.get('customised_download_rpc_xml') %}
+{% if slapparameter_dict.get('sftp_remote_file_path') %}
                       download_rpc_xml = f"""
-                      {{ slapparameter_dict.get('customised_download_rpc_xml') }}
+                          <software-download xmlns="urn:o-ran:software-management:1.0">
+                              <remote-file-path>{ remote_file_path }/{firmware_name}</remote-file-path>
+	                            <password>
+                                	<password>{{slapparameter_dict.get('sftp_remote_file_path_password')}}</password>        
+    	                        </password>
+                          </software-download>
                       """
 {% else %}
                       download_rpc_xml = f"""
                           <software-download xmlns="urn:o-ran:software-management:1.0">
-                              <remote-file-path>{{ remote_file_path }}/{firmware_name}</remote-file-path>
+                              <remote-file-path>{ remote_file_path }/{firmware_name}</remote-file-path>
                           </software-download>
                       """
 {% endif %}