.

software/ors-amarisoft/buildout.hash.cfg

@@ -58,14 +58,10 @@ md5sum = e758c9358c49360ef0b3db946ab0f493
 _update_hash_filename_ = instance-core-network.jinja2.cfg
 md5sum = eda157219444c3ac10272626dd5cea10
 
-[template-ue-lte]
-_update_hash_filename_ = instance-ue-lte.jinja2.cfg
+[template-ue]
+_update_hash_filename_ = instance-ue.jinja2.cfg
 md5sum = 587531b7a43fecbcdc2f1bffac74a363
 
-[template-ue-nr]
-_update_hash_filename_ = instance-ue-nr.jinja2.cfg
-md5sum = 3d6f3e864b6480a98c2699b11281182a
-
 [template-obsolete]
 _update_hash_filename_ = instance-obsolete.jinja2.cfg
 md5sum = c5f581ba01654b2aec46000abf8d0e35
@@ -102,14 +98,10 @@ md5sum = a8cb1c5e7827bddc5ab1f1ef00240b03
 filename = config/ims.jinja2.cfg
 md5sum = 36281b03597252cf75169417d02fc28c
 
-[ue-lte.jinja2.cfg]
-filename = config/ue-lte.jinja2.cfg
+[ue.jinja2.cfg]
+filename = config/ue.jinja2.cfg
 md5sum = c0313f9d15543361f7c8e19af96c737a
 
-[ue-nr.jinja2.cfg]
-filename = config/ue-nr.jinja2.cfg
-md5sum = 824233ab4d53ec428d358fb67bca8ba2
-
 [CreateProcessingEle.jinja2.xml]
 filename = netconf/CreateProcessingEle.jinja2.xml
 md5sum = e435990eb0a0d4be41efa9bd16dce09b

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

@@ -2,7 +2,7 @@
 parts =
   directory
   ltelogs
-  lte-ue-lte-config
+  lte-ue-config
   lte-ue-service
   check-sdr-busy.py
   monitor-base
@@ -65,11 +65,11 @@ extensions = jinja2.ext.do
 context =
   section directory directory
 
-{% if slapparameter_dict.get("ue_lte_config_link", None) %}
-[ue-lte-config-dl]
+{% if slapparameter_dict.get("ue_config_link", None) %}
+[ue-config-dl]
 recipe = slapos.recipe.build:download
-url = {{ slapparameter_dict.get("ue_lte_config_link") }}
-version = {{ slapparameter_dict.get("ue_lte_config_version") }}
+url = {{ slapparameter_dict.get("ue_config_link") }}
+version = {{ slapparameter_dict.get("ue_config_version") }}
 offline = false
 {% endif %}
 
@@ -97,7 +97,7 @@ mode = 0775
 reserve-cpu = True
 pidfile = ${directory:run}/ue.pid
 hash-files =
-  ${lte-ue-lte-config:output}
+  ${lte-ue-config:output}
   ${lte-ue-sh-wrapper:output}
 environment =
   LD_LIBRARY_PATH={{ openssl_location }}/lib
@@ -112,12 +112,12 @@ context =
   section pub_info publish-connection-information
   key slapparameter_dict slap-configuration:configuration
 
-[lte-ue-lte-config]
+[lte-ue-config]
 <= config-base
-{% if slapparameter_dict.get("ue_lte_config_link", None) %}
-url = ${ue-lte-config-dl:target}
+{% if slapparameter_dict.get("ue_config_link", None) %}
+url = ${ue-config-dl:target}
 {% else %}
-url = {{ ue_lte_template }}
+url = {{ ue_template }}
 {% endif %}
 output = ${directory:etc}/ue.cfg
 

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

-[buildout]
-parts =
-  directory
-  ltelogs
-  lte-ue-nr-config
-  lte-ue-service
-  check-sdr-busy.py
-  monitor-base
-  publish-connection-information
-
-extends = {{ monitor_template }}
-
-eggs-directory = {{ eggs_directory }}
-develop-eggs-directory = {{ develop_eggs_directory }}
-offline = true
-
-[monitor-httpd-conf-parameter]
-httpd-include-file = {{ buildout_directory }}/etc/httpd-include-file.conf
-port = ${monitor-instance-parameter:monitor-httpd-port}
-url = https://[${monitor-instance-parameter:monitor-httpd-ipv6}]:${:port}
-
-[monitor-instance-parameter]
-monitor-httpd-port = ${monitor-address:port}
-
-[monitor-address]
-recipe = slapos.cookbook:free_port
-minimum = 8035
-maximum = 8055
-ip = ${monitor-instance-parameter:monitor-httpd-ipv6}
-
-[slap-configuration]
-recipe = slapos.cookbook:slapconfiguration.serialised
-computer = {{ slap_connection['computer-id'] }}
-partition = {{ slap_connection['partition-id'] }}
-url = {{ slap_connection['server-url'] }}
-key = {{ slap_connection['key-file'] }}
-cert = {{ slap_connection['cert-file'] }}
-
-configuration.default_nr_bandwidth = {{ default_nr_bandwidth }}
-configuration.default_n_antenna_dl = {{ default_n_antenna_dl }}
-configuration.default_n_antenna_ul = {{ default_n_antenna_ul }}
-configuration.default_nr_imsi = {{ default_nr_imsi }}
-configuration.default_nr_k = {{ default_nr_k }}
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-software = {{ buildout_directory }}
-home = ${buildout:directory}
-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
-
-[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 %}
-
-[lte-ue-sh-wrapper]
-recipe = slapos.recipe.template
-output = ${directory:bin}/${:_buildout_section_name_}
-ue-log = ${directory:log}/ue-output.log
-inline =
-  #!/bin/sh
-{% if not slapparameter_dict.get("testing", False) %}
-  sudo /opt/amarisoft/rm-tmp-lte | true;
-  (echo && echo && date "+[%Y/%m/%d %T.%N %Z] Starting UE software..." && echo) >> ${:ue-log};
-  tail -c 1M ${:ue-log} > ${:ue-log}.tmp;
-  mv ${:ue-log}.tmp ${:ue-log};
-  {{ ue }}/lteue ${directory:etc}/ue.cfg >> ${:ue-log} 2>> ${:ue-log};
-{% endif %}
-
-### 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-nr-config:output}
-  ${lte-ue-sh-wrapper:output}
-environment =
-  LD_LIBRARY_PATH={{ openssl_location }}/lib
-  AMARISOFT_PATH=/opt/amarisoft/.amarisoft
-
-[config-base]
-recipe = slapos.recipe.template:jinja2
-extensions = jinja2.ext.do
-context =
-  section directory directory
-  section slap_configuration slap-configuration
-  section pub_info publish-connection-information
-  key slapparameter_dict slap-configuration:configuration
-
-[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.cfg
-
-
-[publish-connection-information]
-<= monitor-publish
-recipe = slapos.cookbook:publish.serialised
-rue_bind_addr = ${slap-configuration:ipv6-random}
-com_addr = [${slap-configuration:ipv6-random}]:9002
-monitor-gadget-url = ${:monitor-base-url}/gadget/software.cfg.html
-
-[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 %}
-
-[macro.promise]
-<= monitor-promise-base
-name = ${:_buildout_section_name_}
-
-[check-sdr-busy.py]
-<= macro.promise
-promise = check_sdr_busy
-config-testing = {{ slapparameter_dict.get("testing", False) }}
-config-sdr = {{ sdr }}

software/ors-amarisoft/instance.cfg

@@ -217,8 +217,7 @@ recipe = slapos.cookbook:switch-softwaretype
 enb = dynamic-template-enb:output
 gnb = dynamic-template-gnb:output
 core-network = dynamic-template-core-network:output
-ue-lte = dynamic-template-ue-lte:output
-ue-nr = dynamic-template-ue-nr:output
+ue = dynamic-template-ue:output
 RootSoftwareInstance = $${:core-network}
 obsolete = dynamic-template-obsolete:output
 enb-epc = $${:obsolete}
@@ -306,46 +305,21 @@ extra-context =
     key dnsmasq_config_path dnsmasq-config:output
     key slave_instance_list slap-configuration:slave-instance-list
 
-[dynamic-template-ue-lte]
+[dynamic-template-ue]
 < = jinja2-template-base
-url = ${template-ue-lte:target}
-filename = instance-ue-lte.cfg
+url = ${template-ue:target}
+filename = instance-ue.cfg
 extensions = jinja2.ext.do
 extra-context =
     raw monitor_template ${monitor2-template:output}
     key ue amarisoft:ue
     key sdr amarisoft:sdr
-    raw ue_lte_template   ${ue-lte.jinja2.cfg:target}
+    raw ue_template   ${ue.jinja2.cfg:target}
     raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw openssl_location ${openssl:location}
-# XXX ue -> multicell/multiru combining both LTE and NR
-    raw default_lte_bandwidth "20 MHz"
-    raw default_n_antenna_dl 2
-    raw default_n_antenna_ul 2
-#
     raw default_lte_imsi ${default-params:default-lte-imsi}
     raw default_lte_k ${default-params:default-lte-k}
 
-[dynamic-template-ue-nr]
-< = jinja2-template-base
-url = ${template-ue-nr:target}
-filename = instance-ue-nr.cfg
-extensions = jinja2.ext.do
-extra-context =
-    raw monitor_template ${monitor2-template:output}
-    key ue amarisoft:ue
-    key sdr amarisoft:sdr
-    raw ue_nr_template   ${ue-nr.jinja2.cfg:target}
-    raw ltelogs_template   ${ltelogs.jinja2.sh:target}
-    raw openssl_location ${openssl:location}
-# XXX see ^^^ about UE wrt multicell/multiru
-    raw default_nr_bandwidth 40
-    raw default_n_antenna_dl 2
-    raw default_n_antenna_ul 2
-#
-    raw default_nr_imsi ${default-params:default-nr-imsi}
-    raw default_nr_k ${default-params:default-nr-k}
-
 [ue-db-config]
 recipe = slapos.recipe.template:jinja2
 url = ${ue_db.jinja2.cfg:target}

software/ors-amarisoft/software-base.cfg

@@ -28,8 +28,7 @@ parts +=
   enb.jinja2.cfg
   gnb.jinja2.cfg
   ue_db.jinja2.cfg
-  ue-lte.jinja2.cfg
-  ue-nr.jinja2.cfg
+  ue.jinja2.cfg
   lte.jinja2
   CreateProcessingEle.jinja2.xml
   cu_config.jinja2.xml
@@ -92,10 +91,7 @@ destination = ${buildout:directory}/ncclient_common.py
 [template-core-network]
 <= download-base
 
-[template-ue-lte]
-<= download-base
-
-[template-ue-nr]
+[template-ue]
 <= download-base
 
 [template-obsolete]
@@ -162,12 +158,9 @@ filename = dnsmasq.jinja2.cfg
 [ims.jinja2.cfg]
 <= copy-config-to-instance
 filename = ims.jinja2.cfg
-[ue-lte.jinja2.cfg]
-<= copy-config-to-instance
-filename = ue-lte.jinja2.cfg
-[ue-nr.jinja2.cfg]
+[ue.jinja2.cfg]
 <= copy-config-to-instance
-filename = ue-nr.jinja2.cfg
+filename = ue.jinja2.cfg
 [lte.jinja2]
 <= copy-config-to-instance
 filename = lte.jinja2