ors-amarisoft: add jinjia2.cfg for ue software type

software/ors-amarisoft/buildout.hash.cfg

@@ -42,6 +42,14 @@ md5sum = 9732653a0e2c7fe91d80da80762430d2
 _update_hash_filename_ = instance-mme.jinja2.cfg
 md5sum = 728f4d3ae248710c23e4b73eea4d628e
 
+[template-lte-ue-lte]
+_update_hash_filename_ = instance-ue-lte.jinja2.cfg
+md5sum = 5647ccbf4c91edcd60beaadcb69715a6
+
+[template-lte-ue-nr]
+_update_hash_filename_ = instance-ue-lte.jinja2.cfg
+md5sum = 5647ccbf4c91edcd60beaadcb69715a6
+
 [ue_db.jinja2.cfg]
 filename = config/ue_db.jinja2.cfg
 md5sum = dcaac06553a3222b14c0013a13f4a149
@@ -70,6 +78,10 @@ md5sum = 21e24367dd8213a00f6c777df33d5c03
 filename = config/ims.jinja2.cfg
 md5sum = 36281b03597252cf75169417d02fc28c
 
+[ue.jinja2.cfg]
+filename = config/ue.jinja2.cfg
+md5sum = a839fb12bc5a713dbceb45fb940928bc
+
 [sdr-busy-promise]
 _update_hash_filename_ = promise/check_sdr_busy.jinja2.py
 md5sum = 93dacb1da15310eb70d0815711a06cdf

software/ors-amarisoft/config/ue.jinja2.cfg

+{
+  log_options: "all.level=debug,all.max_size=1",
+  log_filename: "/tmp/ue0.log",
+  com_addr: "0.0.0.0:9002",
+rf_driver: {
+    name: "sdr",
+    args: "dev0=/dev/sdr0",
+    rx_antenna:"rx",
+},
+tx_gain: 49.0,
+rx_gain: 50.0,
+  cell_groups: [{
+    group_type: "nr",
+    multi_ue: false,
+    cells: [{
+      rf_port: 0,
+      bandwidth: 20,
+      band: 78,
+      dl_nr_arfcn: 646666,
+      ssb_nr_arfcn: 646656,
+      subcarrier_spacing: 30,
+      n_antenna_dl: 2,
+      n_antenna_ul: 2,
+    }],
+  }],
+  ue_list: [
+    {
+    imsi: "001010123456789",
+    K: "00112233445566778899aabbccddeeff",
+    as_release: 15,
+    ue_category: "nr",
+    tun_setup_script: "ue-ifup",
+    apn: "internet",
+    }
+  ],
+}

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

+[buildout]
+parts =
+  directory
+  lte-ue-request
+  publish-connection-information
+
+extends = {{ monitor_template }}
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[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'] }}
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+software = {{ buildout_directory }}
+home = ${buildout:directory}
+etc = ${:home}/etc
+var = ${:home}/var
+etc = ${:home}/etc
+bin = ${:home}/bin
+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'] }}
+
+sla-computer_guid = {{ slap_connection['computer-id'] }}
+
+config-monitor-password = ${monitor-htpasswd:passwd}
+
+[lte-ue-request]
+<= request-common-base
+name = UE
+software-type = ue
+config-name = ue
+{%- for key, value in slapparameter_dict.items() %}
+config-{{ key }} = {{ dumps(value) }}
+{% endfor -%}
+config-slave-list = {{ dumps(slave_instance_list) }}
+return = monitor-base-url epc-ipv6
+
+[monitor-base-url-dict]
+lte-mme-request =  ${lte-mme-request:connection-monitor-base-url}
+lte-enb-request =  ${lte-enb-request:connection-monitor-base-url}
+
+[publish-connection-information]
+recipe = slapos.cookbook:publish.serialised
+<= monitor-publish
+epc-ipv6 =  ${lte-mme-request:connection-epc-ipv6}
+epc-ipv4 =  {{ epc_ipv4 }}

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

+[buildout]
+parts =
+  directory
+  lte-ue-request
+  publish-connection-information
+
+extends = {{ monitor_template }}
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[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'] }}
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+software = {{ buildout_directory }}
+home = ${buildout:directory}
+etc = ${:home}/etc
+var = ${:home}/var
+etc = ${:home}/etc
+bin = ${:home}/bin
+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'] }}
+
+sla-computer_guid = {{ slap_connection['computer-id'] }}
+
+config-monitor-password = ${monitor-htpasswd:passwd}
+
+[lte-ue-request]
+<= request-common-base
+name = UE
+software-type = ue
+config-name = ue
+{%- for key, value in slapparameter_dict.items() %}
+config-{{ key }} = {{ dumps(value) }}
+{% endfor -%}
+config-slave-list = {{ dumps(slave_instance_list) }}
+return = monitor-base-url epc-ipv6
+
+[monitor-base-url-dict]
+lte-mme-request =  ${lte-mme-request:connection-monitor-base-url}
+lte-enb-request =  ${lte-enb-request:connection-monitor-base-url}
+
+[publish-connection-information]
+recipe = slapos.cookbook:publish.serialised
+<= monitor-publish
+epc-ipv6 =  ${lte-mme-request:connection-epc-ipv6}
+epc-ipv4 =  {{ epc_ipv4 }}

software/ors-amarisoft/instance.cfg

@@ -39,6 +39,7 @@ init =
   options['enb'] = path + "/enb"
   options['mme'] = path + "/mme"
   options['ims'] = path + "/ims"
+  options['ue'] = path + "/ue"
 
 [ethernet-ip]
 recipe = slapos.recipe.build
@@ -61,6 +62,8 @@ epc = dynamic-template-lte-epc:output
 enb = dynamic-template-lte-enb:output
 gnb = dynamic-template-lte-gnb:output
 mme = dynamic-template-lte-mme:output
+ue-lte = dynamic-template-lte-ue-lte:output
+ue-nr = dynamic-template-lte-ue-nr:output
 RootSoftwareInstance = $${:enb-epc}
 
 [dynamic-template-lte-enb-epc]
@@ -151,6 +154,22 @@ extra-context =
     raw iperf3_location ${iperf3:location}
     key ue_db_path ue-db-config:output
 
+[dynamic-template-lte-ue-lte]
+< = jinja2-template-base
+url = ${template-lte-ue-lte:target}
+filename = instance-lte-ue-lte.cfg
+extensions = jinja2.ext.do
+extra-context =
+    raw monitor_template ${monitor2-template:output}
+
+[dynamic-template-lte-ue-nr]
+< = jinja2-template-base
+url = ${template-lte-ue-nr:target}
+filename = instance-lte-ue-nr.cfg
+extensions = jinja2.ext.do
+extra-context =
+    raw monitor_template ${monitor2-template:output}
+
 [ue-db-config]
 recipe = slapos.recipe.template:jinja2
 url = ${ue_db.jinja2.cfg:target}

software/ors-amarisoft/software.cfg

@@ -17,6 +17,7 @@ parts +=
   enb.jinja2.cfg
   gnb.jinja2.cfg
   ue_db.jinja2.cfg
+  ue.cfg
   sib23.asn
   iperf3
 # unimplemented parts - the http monitor and better log handling using logrotate
@@ -51,6 +52,12 @@ url = ${:_profile_base_location_}/${:_update_hash_filename_}
 [template-lte-mme]
 <= download-base
 
+[template-lte-ue-lte]
+<= download-base
+
+[template-lte-ue-nr]
+<= download-base
+
 [sdr-busy-promise]
 <= download-base
 
@@ -86,3 +93,6 @@ filename = mme.jinja2.cfg
 [ims.jinja2.cfg]
 <= copy-config-to-instance
 filename = ims.jinja2.cfg
+[ue.jinja2.cfg]
+<= copy-config-to-instance
+filename = ue.jinja2.cfg