ors-amarisoft: ue instance fixup

software/ors-amarisoft/buildout.hash.cfg

@@ -44,15 +44,15 @@ md5sum = 728f4d3ae248710c23e4b73eea4d628e
 
 [template-lte-ue-lte]
 _update_hash_filename_ = instance-ue-lte.jinja2.cfg
-md5sum = 6cd860289282c98be745ea027c76c997
+md5sum = db6bd2f8100df126296f37ecf1845454
 
 [template-lte-ue-nr]
 _update_hash_filename_ = instance-ue-lte.jinja2.cfg
-md5sum = 6cd860289282c98be745ea027c76c997
+md5sum = db6bd2f8100df126296f37ecf1845454
 
 [ue_db.jinja2.cfg]
 filename = config/ue_db.jinja2.cfg
-md5sum = dcaac06553a3222b14c0013a13f4a149
+md5sum = dcaac06553a3222b1
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg

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

 [buildout]
 parts =
   directory
-  lte-ue-lte-request
+  ltelogs
+  lte-ue-lte-config
+  lte-ue-service
+  sdr-busy-promise
+  monitor-base
   publish-connection-information
 
 extends = {{ monitor_template }}
@@ -18,6 +22,13 @@ url = {{ slap_connection['server-url'] }}
 key = {{ slap_connection['key-file'] }}
 cert = {{ slap_connection['cert-file'] }}
 
+configuration.default_dl_earfcn = {{ default_dl_earfcn }}
+configuration.default_lte_n_rb_dl = {{ default_lte_n_rb_dl }}
+configuration.default_lte_tx_gain = {{ default_lte_tx_gain }}
+configuration.default_lte_rx_gain = {{ default_lte_rx_gain }}
+configuration.default_lte_imsi = {{ default_lte_imsi }}
+configuration.default_lte_k = {{default_lte_k}}
+
 [directory]
 recipe = slapos.cookbook:mkdirectory
 software = {{ buildout_directory }}
@@ -26,38 +37,95 @@ etc = ${:home}/etc
 var = ${:home}/var
 etc = ${:home}/etc
 bin = ${:home}/bin
+tmp = ${:home}/tmp
 run = ${:var}/run
 script = ${:etc}/run
 service = ${:etc}/service
 promise = ${:etc}/promise
 log = ${:var}/log
 
-[request-common-base]
-recipe = slapos.cookbook:request.serialised
-software-url = {{ slap_connection['software-release-url'] }}
-server-url = {{ slap_connection['server-url'] }}
-computer-id = {{ slap_connection['computer-id'] }}
-partition-id = {{ slap_connection['partition-id'] }}
-key-file = {{ slap_connection['key-file'] }}
-cert-file = {{ slap_connection['cert-file'] }}
+[ltelogs]
+recipe = slapos.recipe.template:jinja2
+url = {{ ltelogs_template }}
+output = ${directory:home}/ltelogs.sh
+extensions = jinja2.ext.do
+context =
+  section directory directory
+
+{% if slapparameter_dict.get("ue_lte_config_link", None) %}
+[ue-lte-config-dl]
+recipe = slapos.recipe.build:download
+url = {{ slapparameter_dict.get("ue_lte_config_link") }}
+version = {{ slapparameter_dict.get("ue_lte_config_version") }}
+offline = false
+{% endif %}
 
-sla-computer_guid = {{ slap_connection['computer-id'] }}
+[lte-ue-sh-wrapper]
+recipe = slapos.recipe.template
+output = ${directory:bin}/${:_buildout_section_name_}
+inline =
+  #!/bin/sh
+{% if not slapparameter_dict.get("testing", False) %}
+  sudo /opt/amarisoft/rm-tmp-lte | true;
+  {{ ue }}/lteue ${directory:etc}/ue.cfg >> ${directory:log}/ue-output.log 2>> ${directory:log}/ue-output.log
+{% endif %}
 
-config-monitor-password = ${monitor-htpasswd:passwd}
+### User Equipment (UE)
+[lte-ue-service]
+recipe = slapos.cookbook:wrapper
+init = ${ltelogs:output} ${directory:log}/ue.log; sleep 2
+command-line = ${lte-ue-sh-wrapper:output}
+wrapper-path = ${directory:service}/lte-ue
+mode = 0775
+reserve-cpu = True
+pidfile = ${directory:run}/ue.pid
+hash-files =
+  ${lte-ue-lte-config:output}
+  ${lte-ue-sh-wrapper:output}
+environment =
+  LD_LIBRARY_PATH={{ openssl_location }}/lib
+  AMARISOFT_PATH=/opt/amarisoft/.amarisoft
 
-[lte-ue-lte-request]
-<= request-common-base
-name = UE-LTE
-software-type = ue-lte
-config-name = ue-lte
-{%- for key, value in slapparameter_dict.items() %}
-config-{{ key }} = {{ dumps(value) }}
-{% endfor -%}
-return = monitor-base-url
+[config-base]
+recipe = slapos.recipe.template:jinja2
+extensions = jinja2.ext.do
+context =
+  section directory directory
+  section slap_configuration slap-configuration
+  key slapparameter_dict slap-configuration:configuration
 
-[monitor-base-url-dict]
-lte-ue-lte-request =  ${lte-ue-lte-request:connection-monitor-base-url}
+[lte-ue-lte-config]
+<= config-base
+{% if slapparameter_dict.get("ue_lte_config_link", None) %}
+url = ${ue-lte-config-dl:target}
+{% else %}
+url = {{ ue_lte_template }}
+{% endif %}
+output = ${directory:etc}/ue-lte.cfg
 
 [publish-connection-information]
-recipe = slapos.cookbook:publish.serialised
 <= monitor-publish
+recipe = slapos.cookbook:publish.serialised
+
+[monitor-instance-parameter]
+{% if slapparameter_dict.get("name", None) %}
+monitor-title = {{ slapparameter_dict['name'] | string }}
+{% endif %}
+{% if slapparameter_dict.get("monitor-password", None) %}
+password = {{ slapparameter_dict['monitor-password'] | string }}
+{% endif %}
+
+[sdr-busy-promise-template]
+recipe = slapos.recipe.template:jinja2
+url = {{ sdr_busy_promise }}
+output = ${directory:etc}/check-sdr-busy.py
+extensions = jinja2.ext.do
+context =
+  key slapparameter_dict slap-configuration:configuration
+
+# Add custom promise to check if /dev/sdr0 is busy
+[sdr-busy-promise]
+recipe = slapos.cookbook:promise.plugin
+eggs = slapos.core
+file = ${sdr-busy-promise-template:output}
+output = ${directory:plugins}/check-sdr-busy.py

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

 [buildout]
 parts =
   directory
-  lte-ue-nr-request
+  ltelogs
+  lte-ue-nr-config
+  lte-ue-service
+  sdr-busy-promise
+  monitor-base
   publish-connection-information
 
 extends = {{ monitor_template }}
@@ -18,6 +22,14 @@ url = {{ slap_connection['server-url'] }}
 key = {{ slap_connection['key-file'] }}
 cert = {{ slap_connection['cert-file'] }}
 
+configuration.default_dl_nr_arfcn = {{ default_dl_nr_arfcn }}
+configuration.default_nr_bandwidth = {{ default_nr_bandwidth }}
+configuration.default_nr_tx_gain = {{ default_nr_tx_gain }}
+configuration.default_nr_rx_gain = {{ default_nr_rx_gain }}
+configuration.default_ssb_nr_arfcn = {{ default_ssb_nr_arfcn }}
+configuration.default_nr_imsi = {{ default_nr_imsi }}
+configuration.default_nr_k = {{ default_nr_k }}
+
 [directory]
 recipe = slapos.cookbook:mkdirectory
 software = {{ buildout_directory }}
@@ -26,38 +38,95 @@ etc = ${:home}/etc
 var = ${:home}/var
 etc = ${:home}/etc
 bin = ${:home}/bin
+tmp = ${:home}/tmp
 run = ${:var}/run
 script = ${:etc}/run
 service = ${:etc}/service
 promise = ${:etc}/promise
 log = ${:var}/log
 
-[request-common-base]
-recipe = slapos.cookbook:request.serialised
-software-url = {{ slap_connection['software-release-url'] }}
-server-url = {{ slap_connection['server-url'] }}
-computer-id = {{ slap_connection['computer-id'] }}
-partition-id = {{ slap_connection['partition-id'] }}
-key-file = {{ slap_connection['key-file'] }}
-cert-file = {{ slap_connection['cert-file'] }}
+[ltelogs]
+recipe = slapos.recipe.template:jinja2
+url = {{ ltelogs_template }}
+output = ${directory:home}/ltelogs.sh
+extensions = jinja2.ext.do
+context =
+  section directory directory
+
+{% if slapparameter_dict.get("ue_nr_config_link", None) %}
+[ue-nr-config-dl]
+recipe = slapos.recipe.build:download
+url = {{ slapparameter_dict.get("ue_nr_config_link") }}
+version = {{ slapparameter_dict.get("ue_nr_config_version") }}
+offline = false
+{% endif %}
 
-sla-computer_guid = {{ slap_connection['computer-id'] }}
+[lte-ue-sh-wrapper]
+recipe = slapos.recipe.template
+output = ${directory:bin}/${:_buildout_section_name_}
+inline =
+  #!/bin/sh
+{% if not slapparameter_dict.get("testing", False) %}
+  sudo /opt/amarisoft/rm-tmp-lte | true;
+  {{ ue }}/lteue ${directory:etc}/ue.cfg >> ${directory:log}/ue-output.log 2>> ${directory:log}/ue-output.log
+{% endif %}
 
-config-monitor-password = ${monitor-htpasswd:passwd}
+### User Equipment (UE)
+[lte-ue-service]
+recipe = slapos.cookbook:wrapper
+init = ${ltelogs:output} ${directory:log}/ue.log; sleep 2
+command-line = ${lte-enb-sh-wrapper:output}
+wrapper-path = ${directory:service}/lte-ue
+mode = 0775
+reserve-cpu = True
+pidfile = ${directory:run}/ue.pid
+hash-files =
+  ${lte-ue-config:output}
+  ${lte-ue-sh-wrapper:output}
+environment =
+  LD_LIBRARY_PATH={{ openssl_location }}/lib
+  AMARISOFT_PATH=/opt/amarisoft/.amarisoft
 
-[lte-ue-nr-request]
-<= request-common-base
-name = UE-NR
-software-type = ue-nr
-config-name = ue-nr
-{%- for key, value in slapparameter_dict.items() %}
-config-{{ key }} = {{ dumps(value) }}
-{% endfor -%}
-return = monitor-base-url
+[config-base]
+recipe = slapos.recipe.template:jinja2
+extensions = jinja2.ext.do
+context =
+  section directory directory
+  section slap_configuration slap-configuration
+  key slapparameter_dict slap-configuration:configuration
 
-[monitor-base-url-dict]
-lte-ue-nr-request =  ${lte-ue-nr-request:connection-monitor-base-url}
+[lte-ue-nr-config]
+<= config-base
+{% if slapparameter_dict.get("ue_nr_config_link", None) %}
+url = ${ue-nr-config-dl:target}
+{% else %}
+url = {{ ue_nr_template }}
+{% endif %}
+output = ${directory:etc}/ue-nr.cfg
 
 [publish-connection-information]
-recipe = slapos.cookbook:publish.serialised
 <= monitor-publish
+recipe = slapos.cookbook:publish.serialised
+
+[monitor-instance-parameter]
+{% if slapparameter_dict.get("name", None) %}
+monitor-title = {{ slapparameter_dict['name'] | string }}
+{% endif %}
+{% if slapparameter_dict.get("monitor-password", None) %}
+password = {{ slapparameter_dict['monitor-password'] | string }}
+{% endif %}
+
+[sdr-busy-promise-template]
+recipe = slapos.recipe.template:jinja2
+url = {{ sdr_busy_promise }}
+output = ${directory:etc}/check-sdr-busy.py
+extensions = jinja2.ext.do
+context =
+  key slapparameter_dict slap-configuration:configuration
+
+# Add custom promise to check if /dev/sdr0 is busy
+[sdr-busy-promise]
+recipe = slapos.cookbook:promise.plugin
+eggs = slapos.core
+file = ${sdr-busy-promise-template:output}
+output = ${directory:plugins}/check-sdr-busy.py

software/ors-amarisoft/instance.cfg

@@ -162,21 +162,17 @@ extensions = jinja2.ext.do
 extra-context =
     raw monitor_template ${monitor2-template:output}
     key ue amarisoft:ue
-    raw ue_template   ${enb.jinja2.cfg:target}
-    raw sib23   ${sib23.asn:target}
+    raw ue_lte_template   ${enb.jinja2.cfg:target}
     raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw sdr_busy_promise   ${sdr-busy-promise:target}
     raw openssl_location ${openssl:location}
     raw default_dl_earfcn ${enb:default-dl-earfcn}
     raw default_lte_dl_freq ${enb:default-lte-dl-freq}
-    raw default_lte_band ${enb:default-lte-band}
     raw default_lte_n_rb_dl ${enb:default-lte-n-rb-dl}
     raw default_lte_tx_gain ${enb:default-lte-tx-gain}
     raw default_lte_rx_gain ${enb:default-lte-rx-gain}
     raw default_lte_imsi ${enb:default-lte-imsi}
     raw default_lte_k ${enb:default-lte-k}
-    raw min_frequency ${enb:min-frequency}
-    raw max_frequency ${enb:max-frequency}
 
 [dynamic-template-lte-ue-nr]
 < = jinja2-template-base
@@ -186,7 +182,7 @@ extensions = jinja2.ext.do
 extra-context =
     raw monitor_template ${monitor2-template:output}
     key ue amarisoft:ue
-    raw ue_template   ${enb.jinja2.cfg:target}
+    raw ue_nr_template   ${enb.jinja2.cfg:target}
     raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw sdr_busy_promise   ${sdr-busy-promise:target}
     raw openssl_location ${openssl:location}
@@ -200,8 +196,6 @@ extra-context =
     raw default_nr_imsi ${enb:default-nr-imsi}
     raw default_nr_k ${enb:default-nr-k}
     raw default_ssb_nr_arfcn ${enb:default-ssb-nr-arfcn}
-    raw min_frequency ${enb:min-frequency}
-    raw max_frequency ${enb:max-frequency}
 
 
 [ue-db-config]