Merge remote-tracking branch 'upstream/master' into zope4py2

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = 8b275dc35fdb169eca6b087bc32a9286
+md5sum = fe055b993754ca665b8249cbfb9bbc8b
 
 [template-lte-enb-epc]
 _update_hash_filename_ = instance-enb-epc.jinja2.cfg
@@ -24,7 +24,7 @@ md5sum = c9994f2ef03edd7d6773307a6385c47c
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 7f101e9777fb53e06e9138b3be562a68
+md5sum = e3c2063efb76759fc6e7600b2e1e2cfb
 
 [template-lte-gnb-epc]
 _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
@@ -36,7 +36,7 @@ md5sum = b17674f523adce9b0dda942c1493674d
 
 [template-lte-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = 69faf2e00fd0beb906bf11f40a4e4d91
+md5sum = 1fefb9b0bf1ce6a93e8f0cb993c2f63d
 
 [template-lte-mme]
 _update_hash_filename_ = instance-mme.jinja2.cfg
@@ -56,7 +56,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = de256b536ef731f123d9f9a239cdce06
+md5sum = 9fd6abb1e69fe59af0dafbb336f24f8d
 
 [sib23.asn]
 filename = config/sib23.asn
@@ -64,7 +64,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a
 
 [gnb.jinja2.cfg]
 filename = config/gnb.jinja2.cfg
-md5sum = 8d0c56aef8446b4f5b41353f1ee775f6
+md5sum = 0ad683812818a02ef5010d087ec7138b
 
 [ltelogs.jinja2.sh]
 filename = ltelogs.jinja2.sh
@@ -80,15 +80,15 @@ md5sum = 36281b03597252cf75169417d02fc28c
 
 [ue-lte.jinja2.cfg]
 filename = config/ue-lte.jinja2.cfg
-md5sum = ee034558efb3e1fad4687fcd2f448872
+md5sum = b90ac384eca6fcd4249fbf0b2cf63e1e
 
 [ue-nr.jinja2.cfg]
 filename = config/ue-nr.jinja2.cfg
-md5sum = 2082bcb28d9be653225ce6db46dc236a
+md5sum = a904db3ba9518ae0edf0ddcccfa57485
 
 [sdr-busy-promise]
 _update_hash_filename_ = promise/check_sdr_busy.py
-md5sum = e5853b4fecae68debcb7b32d3c13368c
+md5sum = a9d7a06c43410e02070b9ddae7b46b38
 
 [interface-up-promise]
 _update_hash_filename_ = promise/check_interface_up.py

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

@@ -205,7 +205,7 @@
     cipher_algo_pref: [],
     integ_algo_pref: [2, 1],
 
-    inactivity_timer: 10000,
+    inactivity_timer: {{ slapparameter_dict.get('inactivity_timer', slap_configuration['configuration.default_lte_inactivity_timer']) }},
 
     srb_config: [
       {

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

@@ -577,7 +577,7 @@
     cipher_algo_pref: [],
     integ_algo_pref: [2, 1],
 
-    inactivity_timer: 10000,
+    inactivity_timer: {{ slapparameter_dict.get('inactivity_timer', slap_configuration['configuration.default_nr_inactivity_timer']) }},
 
 #ifndef EPS_FALLBACK
 #define EPS_FALLBACK 0

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

@@ -28,6 +28,12 @@ rf_driver: {
   }],
   ue_list: [
     {
+    sim_algo: "{{ slapparameter_dict.get('sim_algo', 'milenage') }}",
+    opc: "{{ slapparameter_dict.get('opc', '') }}",
+    amf: {{ slapparameter_dict.get('amf', '0x9001') }},
+    sqn: "{{ slapparameter_dict.get('sqn', '000000000000') }}",
+    impu: "{{ slapparameter_dict.get('impu', '') }}",
+    impi: "{{ slapparameter_dict.get('impi', '') }}",
     imsi: "{{ slapparameter_dict.get('imsi', slap_configuration['configuration.default_lte_imsi']) }}",
     K: "{{ slapparameter_dict.get('k', slap_configuration['configuration.default_lte_k']) }}",
     rue_addr: "{{ slapparameter_dict.get('rue_addr') }}",

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

@@ -29,6 +29,12 @@ rf_driver: {
     }],
     ue_list: [
       {
+      sim_algo: "{{ slapparameter_dict.get('sim_algo', 'milenage') }}",
+      opc: "{{ slapparameter_dict.get('opc', '') }}",
+      amf: {{ slapparameter_dict.get('amf', '0x9001') }},
+      sqn: "{{ slapparameter_dict.get('sqn', '000000000000') }}",
+      impu: "{{ slapparameter_dict.get('impu', '') }}",
+      impi: "{{ slapparameter_dict.get('impi', '') }}",
       imsi: "{{ slapparameter_dict.get('imsi', slap_configuration['configuration.default_nr_imsi']) }}",
       K: "{{ slapparameter_dict.get('k', slap_configuration['configuration.default_nr_k']) }}",
       rue_addr: "{{ slapparameter_dict.get('rue_addr') }}",

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

@@ -108,6 +108,12 @@
       "type": "object",
       "default": {}
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": {{ default_lte_inactivity_timer }}
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-enb.jinja2.cfg

@@ -36,6 +36,7 @@ configuration.default_lte_band = {{ default_lte_band }}
 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_inactivity_timer = {{ default_lte_inactivity_timer }}
 
 [directory]
 recipe = slapos.cookbook:mkdirectory

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

@@ -150,6 +150,12 @@
       "type": "object",
       "default": {}
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": {{ default_nr_inactivity_timer }}
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-gnb.jinja2.cfg

@@ -35,6 +35,7 @@ configuration.default_nr_band = {{ default_nr_band }}
 configuration.default_nr_dl_freq = {{ default_nr_dl_freq }}
 configuration.default_nr_bandwidth = {{ default_nr_bandwidth }}
 configuration.default_nr_tx_gain = {{ default_nr_tx_gain }}
+configuration.default_nr_inactivity_timer = {{ default_nr_inactivity_timer }}
 configuration.default_nr_rx_gain = {{ default_nr_rx_gain }}
 configuration.default_nr_ssb_pos_bitmap = {{ default_nr_ssb_pos_bitmap }}
 

software/ors-amarisoft/instance-tdd1900-enb-epc-input-schema.json

@@ -106,6 +106,12 @@
       "type": "object",
       "default": {}
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

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

@@ -88,6 +88,12 @@
       "type": "object",
       "default": {}
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-tdd1900-gnb-epc-input-schema.json

@@ -148,6 +148,12 @@
       "type": "object",
       "default": {}
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json

@@ -130,6 +130,12 @@
       "type": "object",
       "default": {}
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-tdd1900-ue-lte-input-schema.json

@@ -56,6 +56,42 @@
       "description": "Set the user secret key (as a 16 bytes hexadecimal string, or eventually 32 bytes hexadecimal string for TUAK).",
       "type": "string",
       "default": "00112233445566778899aabbccddeeff"
+    },
+    "sim_algo": {
+      "title": "sim_algo",
+      "description": "Optional enumeration. xor, milenage or tuak (default = milenage). Set the USIM authentication algorithm. Note: test USIM cards use the XOR algorithm.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "opc": {
+      "title": "opc",
+      "description": "Optional string. Operator key preprocessed with the user secret key (as a 16 byte hexadecimal string). When the Milenage authentication algorithm is used, either op or opc must be set.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "amf": {
+      "title": "amf",
+      "description": "Range: 0 to 65535. Set the Authentication Management Field.",
+      "type": "string",
+      "default": "0x9001"
+    },
+    "sqn": {
+      "title": "sqn",
+      "description": "Optional String (6 byte hexadecimal string). Default = '000000000000'. Set the initial sequence number. For the XOR algorithm, the actual value does not matter. For the Milenage or TUAK algorithm, a sequence number resynchronization is initiated if the sequence number does not match the one stored in the USIM.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "Array of string or object. Each string represent an IMPU and can be a sip URI or a telephone number.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
+      "type": "string",
+      "default": ""
     }
   }
 }

software/ors-amarisoft/instance-tdd1900-ue-nr-input-schema.json

@@ -68,6 +68,42 @@
       "description": "Set the user secret key (as a 16 bytes hexadecimal string, or eventually 32 bytes hexadecimal string for TUAK).",
       "type": "string",
       "default": "00112233445566778899aabbccddeeff"
+    },
+    "sim_algo": {
+      "title": "sim_algo",
+      "description": "Optional enumeration. xor, milenage or tuak (default = milenage). Set the USIM authentication algorithm. Note: test USIM cards use the XOR algorithm.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "opc": {
+      "title": "opc",
+      "description": "Optional string. Operator key preprocessed with the user secret key (as a 16 byte hexadecimal string). When the Milenage authentication algorithm is used, either op or opc must be set.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "amf": {
+      "title": "amf",
+      "description": "Range: 0 to 65535. Set the Authentication Management Field.",
+      "type": "string",
+      "default": "0x9001"
+    },
+    "sqn": {
+      "title": "sqn",
+      "description": "Optional String (6 byte hexadecimal string). Default = '000000000000'. Set the initial sequence number. For the XOR algorithm, the actual value does not matter. For the Milenage or TUAK algorithm, a sequence number resynchronization is initiated if the sequence number does not match the one stored in the USIM.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "Array of string or object. Each string represent an IMPU and can be a sip URI or a telephone number.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
+      "type": "string",
+      "default": ""
     }
   }
 }

software/ors-amarisoft/instance-tdd2600-enb-epc-input-schema.json

@@ -106,6 +106,12 @@
       "type": "object",
       "default": {}
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

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

@@ -88,6 +88,12 @@
       "type": "object",
       "default": {}
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-tdd2600-gnb-epc-input-schema.json

@@ -148,6 +148,12 @@
       "type": "object",
       "default": {}
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json

@@ -130,6 +130,12 @@
       "type": "object",
       "default": {}
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-tdd2600-ue-lte-input-schema.json

@@ -56,6 +56,42 @@
       "description": "Set the user secret key (as a 16 bytes hexadecimal string, or eventually 32 bytes hexadecimal string for TUAK).",
       "type": "string",
       "default": "00112233445566778899aabbccddeeff"
+    },
+    "sim_algo": {
+      "title": "sim_algo",
+      "description": "Optional enumeration. xor, milenage or tuak (default = milenage). Set the USIM authentication algorithm. Note: test USIM cards use the XOR algorithm.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "opc": {
+      "title": "opc",
+      "description": "Optional string. Operator key preprocessed with the user secret key (as a 16 byte hexadecimal string). When the Milenage authentication algorithm is used, either op or opc must be set.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "amf": {
+      "title": "amf",
+      "description": "Range: 0 to 65535. Set the Authentication Management Field.",
+      "type": "string",
+      "default": "0x9001"
+    },
+    "sqn": {
+      "title": "sqn",
+      "description": "Optional String (6 byte hexadecimal string). Default = '000000000000'. Set the initial sequence number. For the XOR algorithm, the actual value does not matter. For the Milenage or TUAK algorithm, a sequence number resynchronization is initiated if the sequence number does not match the one stored in the USIM.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "Array of string or object. Each string represent an IMPU and can be a sip URI or a telephone number.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
+      "type": "string",
+      "default": ""
     }
   }
 }

software/ors-amarisoft/instance-tdd2600-ue-nr-input-schema.json

@@ -68,6 +68,42 @@
       "description": "Set the user secret key (as a 16 bytes hexadecimal string, or eventually 32 bytes hexadecimal string for TUAK).",
       "type": "string",
       "default": "00112233445566778899aabbccddeeff"
+    },
+    "sim_algo": {
+      "title": "sim_algo",
+      "description": "Optional enumeration. xor, milenage or tuak (default = milenage). Set the USIM authentication algorithm. Note: test USIM cards use the XOR algorithm.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "opc": {
+      "title": "opc",
+      "description": "Optional string. Operator key preprocessed with the user secret key (as a 16 byte hexadecimal string). When the Milenage authentication algorithm is used, either op or opc must be set.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "amf": {
+      "title": "amf",
+      "description": "Range: 0 to 65535. Set the Authentication Management Field.",
+      "type": "string",
+      "default": "0x9001"
+    },
+    "sqn": {
+      "title": "sqn",
+      "description": "Optional String (6 byte hexadecimal string). Default = '000000000000'. Set the initial sequence number. For the XOR algorithm, the actual value does not matter. For the Milenage or TUAK algorithm, a sequence number resynchronization is initiated if the sequence number does not match the one stored in the USIM.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "Array of string or object. Each string represent an IMPU and can be a sip URI or a telephone number.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
+      "type": "string",
+      "default": ""
     }
   }
 }

software/ors-amarisoft/instance-tdd3500-enb-epc-input-schema.json

@@ -106,6 +106,12 @@
       "type": "object",
       "default": {}
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

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

@@ -88,6 +88,12 @@
       "type": "object",
       "default": {}
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-tdd3500-gnb-epc-input-schema.json

@@ -148,6 +148,12 @@
       "type": "object",
       "default": {}
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json

@@ -130,6 +130,12 @@
       "type": "object",
       "default": {}
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-tdd3500-ue-lte-input-schema.json

@@ -56,6 +56,42 @@
       "description": "Set the user secret key (as a 16 bytes hexadecimal string, or eventually 32 bytes hexadecimal string for TUAK).",
       "type": "string",
       "default": "00112233445566778899aabbccddeeff"
+    },
+    "sim_algo": {
+      "title": "sim_algo",
+      "description": "Optional enumeration. xor, milenage or tuak (default = milenage). Set the USIM authentication algorithm. Note: test USIM cards use the XOR algorithm.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "opc": {
+      "title": "opc",
+      "description": "Optional string. Operator key preprocessed with the user secret key (as a 16 byte hexadecimal string). When the Milenage authentication algorithm is used, either op or opc must be set.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "amf": {
+      "title": "amf",
+      "description": "Range: 0 to 65535. Set the Authentication Management Field.",
+      "type": "string",
+      "default": "0x9001"
+    },
+    "sqn": {
+      "title": "sqn",
+      "description": "Optional String (6 byte hexadecimal string). Default = '000000000000'. Set the initial sequence number. For the XOR algorithm, the actual value does not matter. For the Milenage or TUAK algorithm, a sequence number resynchronization is initiated if the sequence number does not match the one stored in the USIM.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "Array of string or object. Each string represent an IMPU and can be a sip URI or a telephone number.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
+      "type": "string",
+      "default": ""
     }
   }
 }

software/ors-amarisoft/instance-tdd3500-ue-nr-input-schema.json

@@ -68,6 +68,42 @@
       "description": "Set the user secret key (as a 16 bytes hexadecimal string, or eventually 32 bytes hexadecimal string for TUAK).",
       "type": "string",
       "default": "00112233445566778899aabbccddeeff"
+    },
+    "sim_algo": {
+      "title": "sim_algo",
+      "description": "Optional enumeration. xor, milenage or tuak (default = milenage). Set the USIM authentication algorithm. Note: test USIM cards use the XOR algorithm.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "opc": {
+      "title": "opc",
+      "description": "Optional string. Operator key preprocessed with the user secret key (as a 16 byte hexadecimal string). When the Milenage authentication algorithm is used, either op or opc must be set.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "amf": {
+      "title": "amf",
+      "description": "Range: 0 to 65535. Set the Authentication Management Field.",
+      "type": "string",
+      "default": "0x9001"
+    },
+    "sqn": {
+      "title": "sqn",
+      "description": "Optional String (6 byte hexadecimal string). Default = '000000000000'. Set the initial sequence number. For the XOR algorithm, the actual value does not matter. For the Milenage or TUAK algorithm, a sequence number resynchronization is initiated if the sequence number does not match the one stored in the USIM.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "Array of string or object. Each string represent an IMPU and can be a sip URI or a telephone number.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
+      "type": "string",
+      "default": ""
     }
   }
 }

software/ors-amarisoft/instance-tdd3700-enb-epc-input-schema.json

@@ -106,6 +106,12 @@
       "type": "object",
       "default": {}
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

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

@@ -88,6 +88,12 @@
       "type": "object",
       "default": {}
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-tdd3700-gnb-epc-input-schema.json

@@ -148,6 +148,12 @@
       "type": "object",
       "default": {}
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json

@@ -130,6 +130,12 @@
       "type": "object",
       "default": {}
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-tdd3700-ue-lte-input-schema.json

@@ -56,6 +56,42 @@
       "description": "Set the user secret key (as a 16 bytes hexadecimal string, or eventually 32 bytes hexadecimal string for TUAK).",
       "type": "string",
       "default": "00112233445566778899aabbccddeeff"
+    },
+    "sim_algo": {
+      "title": "sim_algo",
+      "description": "Optional enumeration. xor, milenage or tuak (default = milenage). Set the USIM authentication algorithm. Note: test USIM cards use the XOR algorithm.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "opc": {
+      "title": "opc",
+      "description": "Optional string. Operator key preprocessed with the user secret key (as a 16 byte hexadecimal string). When the Milenage authentication algorithm is used, either op or opc must be set.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "amf": {
+      "title": "amf",
+      "description": "Range: 0 to 65535. Set the Authentication Management Field.",
+      "type": "string",
+      "default": "0x9001"
+    },
+    "sqn": {
+      "title": "sqn",
+      "description": "Optional String (6 byte hexadecimal string). Default = '000000000000'. Set the initial sequence number. For the XOR algorithm, the actual value does not matter. For the Milenage or TUAK algorithm, a sequence number resynchronization is initiated if the sequence number does not match the one stored in the USIM.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "Array of string or object. Each string represent an IMPU and can be a sip URI or a telephone number.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
+      "type": "string",
+      "default": ""
     }
   }
 }

software/ors-amarisoft/instance-tdd3700-ue-nr-input-schema.json

@@ -68,6 +68,42 @@
       "description": "Set the user secret key (as a 16 bytes hexadecimal string, or eventually 32 bytes hexadecimal string for TUAK).",
       "type": "string",
       "default": "00112233445566778899aabbccddeeff"
+    },
+    "sim_algo": {
+      "title": "sim_algo",
+      "description": "Optional enumeration. xor, milenage or tuak (default = milenage). Set the USIM authentication algorithm. Note: test USIM cards use the XOR algorithm.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "opc": {
+      "title": "opc",
+      "description": "Optional string. Operator key preprocessed with the user secret key (as a 16 byte hexadecimal string). When the Milenage authentication algorithm is used, either op or opc must be set.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "amf": {
+      "title": "amf",
+      "description": "Range: 0 to 65535. Set the Authentication Management Field.",
+      "type": "string",
+      "default": "0x9001"
+    },
+    "sqn": {
+      "title": "sqn",
+      "description": "Optional String (6 byte hexadecimal string). Default = '000000000000'. Set the initial sequence number. For the XOR algorithm, the actual value does not matter. For the Milenage or TUAK algorithm, a sequence number resynchronization is initiated if the sequence number does not match the one stored in the USIM.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "Array of string or object. Each string represent an IMPU and can be a sip URI or a telephone number.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
+      "type": "string",
+      "default": ""
     }
   }
 }

software/ors-amarisoft/instance-ue-lte-input-schema.json.jinja2

@@ -56,6 +56,42 @@
       "description": "Set the user secret key (as a 16 bytes hexadecimal string, or eventually 32 bytes hexadecimal string for TUAK).",
       "type": "string",
       "default": "{{ default_lte_k }}"
+    },
+    "sim_algo": {
+      "title": "sim_algo",
+      "description": "Optional enumeration. xor, milenage or tuak (default = milenage). Set the USIM authentication algorithm. Note: test USIM cards use the XOR algorithm.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "opc": {
+      "title": "opc",
+      "description": "Optional string. Operator key preprocessed with the user secret key (as a 16 byte hexadecimal string). When the Milenage authentication algorithm is used, either op or opc must be set.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "amf": {
+      "title": "amf",
+      "description": "Range: 0 to 65535. Set the Authentication Management Field.",
+      "type": "string",
+      "default": "0x9001"
+    },
+    "sqn": {
+      "title": "sqn",
+      "description": "Optional String (6 byte hexadecimal string). Default = '000000000000'. Set the initial sequence number. For the XOR algorithm, the actual value does not matter. For the Milenage or TUAK algorithm, a sequence number resynchronization is initiated if the sequence number does not match the one stored in the USIM.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "Array of string or object. Each string represent an IMPU and can be a sip URI or a telephone number.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
+      "type": "string",
+      "default": ""
     }
   }
 }

software/ors-amarisoft/instance-ue-nr-input-schema.json.jinja2

@@ -68,6 +68,42 @@
       "description": "Set the user secret key (as a 16 bytes hexadecimal string, or eventually 32 bytes hexadecimal string for TUAK).",
       "type": "string",
       "default": "{{ default_nr_k }}"
+    },
+    "sim_algo": {
+      "title": "sim_algo",
+      "description": "Optional enumeration. xor, milenage or tuak (default = milenage). Set the USIM authentication algorithm. Note: test USIM cards use the XOR algorithm.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "opc": {
+      "title": "opc",
+      "description": "Optional string. Operator key preprocessed with the user secret key (as a 16 byte hexadecimal string). When the Milenage authentication algorithm is used, either op or opc must be set.",
+      "type": "string",
+      "default": "milenage"
+    },
+    "amf": {
+      "title": "amf",
+      "description": "Range: 0 to 65535. Set the Authentication Management Field.",
+      "type": "string",
+      "default": "0x9001"
+    },
+    "sqn": {
+      "title": "sqn",
+      "description": "Optional String (6 byte hexadecimal string). Default = '000000000000'. Set the initial sequence number. For the XOR algorithm, the actual value does not matter. For the Milenage or TUAK algorithm, a sequence number resynchronization is initiated if the sequence number does not match the one stored in the USIM.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "Array of string or object. Each string represent an IMPU and can be a sip URI or a telephone number.",
+      "type": "string",
+      "default": "000000000000"
+    },
+    "impu": {
+      "title": "impu",
+      "description": "String. Defines user IMPI. Must be fully filled with hostname if necessary.",
+      "type": "string",
+      "default": ""
     }
   }
 }

software/ors-amarisoft/instance.cfg

@@ -106,14 +106,15 @@ extra-context =
     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 min_frequency ${enb:min-frequency}
-    raw max_frequency ${enb:max-frequency}
+    raw default_dl_earfcn ${default-params:default-dl-earfcn}
+    raw default_lte_dl_freq ${default-params:default-lte-dl-freq}
+    raw default_lte_band ${default-params:default-lte-band}
+    raw default_lte_n_rb_dl ${default-params:default-lte-n-rb-dl}
+    raw default_lte_tx_gain ${default-params:default-lte-tx-gain}
+    raw default_lte_rx_gain ${default-params:default-lte-rx-gain}
+    raw default_lte_inactivity_timer ${default-params:default-lte-inactivity-timer}
+    raw min_frequency ${default-params:min-frequency}
+    raw max_frequency ${default-params:max-frequency}
 
 [dynamic-template-lte-gnb]
 < = jinja2-template-base
@@ -127,15 +128,16 @@ extra-context =
     raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw sdr_busy_promise   ${sdr-busy-promise:target}
     raw openssl_location ${openssl:location}
-    raw default_dl_nr_arfcn ${enb:default-dl-nr-arfcn}
-    raw default_nr_band ${enb:default-nr-band}
-    raw default_nr_dl_freq ${enb:default-nr-dl-freq}
-    raw default_nr_bandwidth ${enb:default-nr-bandwidth}
-    raw default_nr_tx_gain ${enb:default-nr-tx-gain}
-    raw default_nr_rx_gain ${enb:default-nr-rx-gain}
-    raw default_nr_ssb_pos_bitmap ${enb:default-nr-ssb-pos-bitmap}
-    raw min_frequency ${enb:min-frequency}
-    raw max_frequency ${enb:max-frequency}
+    raw default_dl_nr_arfcn ${default-params:default-dl-nr-arfcn}
+    raw default_nr_band ${default-params:default-nr-band}
+    raw default_nr_dl_freq ${default-params:default-nr-dl-freq}
+    raw default_nr_bandwidth ${default-params:default-nr-bandwidth}
+    raw default_nr_tx_gain ${default-params:default-nr-tx-gain}
+    raw default_nr_rx_gain ${default-params:default-nr-rx-gain}
+    raw default_nr_ssb_pos_bitmap ${default-params:default-nr-ssb-pos-bitmap}
+    raw default_nr_inactivity_timer ${default-params:default-nr-inactivity-timer}
+    raw min_frequency ${default-params:min-frequency}
+    raw max_frequency ${default-params:max-frequency}
 
 [dynamic-template-lte-mme]
 < = jinja2-template-base
@@ -167,15 +169,15 @@ extra-context =
     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_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_n_antenna_dl ${enb:default-n-antenna-dl}
-    raw default_n_antenna_ul ${enb:default-n-antenna-ul}
-    raw default_lte_imsi ${enb:default-lte-imsi}
-    raw default_lte_k ${enb:default-lte-k}
+    raw default_dl_earfcn ${default-params:default-dl-earfcn}
+    raw default_lte_dl_freq ${default-params:default-lte-dl-freq}
+    raw default_lte_n_rb_dl ${default-params:default-lte-n-rb-dl}
+    raw default_lte_tx_gain ${default-params:default-lte-tx-gain}
+    raw default_lte_rx_gain ${default-params:default-lte-rx-gain}
+    raw default_n_antenna_dl ${default-params:default-n-antenna-dl}
+    raw default_n_antenna_ul ${default-params:default-n-antenna-ul}
+    raw default_lte_imsi ${default-params:default-lte-imsi}
+    raw default_lte_k ${default-params:default-lte-k}
 
 [dynamic-template-lte-ue-nr]
 < = jinja2-template-base
@@ -190,16 +192,16 @@ extra-context =
     raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw sdr_busy_promise   ${sdr-busy-promise:target}
     raw openssl_location ${openssl:location}
-    raw default_dl_nr_arfcn ${enb:default-dl-nr-arfcn}
-    raw default_nr_band ${enb:default-nr-band}
-    raw default_nr_bandwidth ${enb:default-nr-bandwidth}
-    raw default_nr_tx_gain ${enb:default-nr-tx-gain}
-    raw default_nr_rx_gain ${enb:default-nr-rx-gain}
-    raw default_n_antenna_dl ${enb:default-n-antenna-dl}
-    raw default_n_antenna_ul ${enb:default-n-antenna-ul}
-    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 default_dl_nr_arfcn ${default-params:default-dl-nr-arfcn}
+    raw default_nr_band ${default-params:default-nr-band}
+    raw default_nr_bandwidth ${default-params:default-nr-bandwidth}
+    raw default_nr_tx_gain ${default-params:default-nr-tx-gain}
+    raw default_nr_rx_gain ${default-params:default-nr-rx-gain}
+    raw default_n_antenna_dl ${default-params:default-n-antenna-dl}
+    raw default_n_antenna_ul ${default-params:default-n-antenna-ul}
+    raw default_nr_imsi ${default-params:default-nr-imsi}
+    raw default_nr_k ${default-params:default-nr-k}
+    raw default_ssb_nr_arfcn ${default-params:default-ssb-nr-arfcn}
 
 [ue-db-config]
 recipe = slapos.recipe.template:jinja2

software/ors-amarisoft/promise/check_sdr_busy.py

@@ -27,7 +27,6 @@ class RunPromise(GenericPromise):
 
       In this case, check whether the file exists.
     """
-    testing = {{ slapparameter_dict.get('testing', False) }}
     testing = self.getConfig('testing') == "True"
     sdr_dev = '/dev/sdr0'
 

software/ors-amarisoft/render-templates

@@ -3,138 +3,80 @@
 from jinja2 import Template
 import os
 
-# Values: 6 (1.4 MHz), 15 (3MHz), 25 (5MHz), 50 (10MHz), 75 (15MHz), 100 (20MHz)
-LTE_N_RB_DL=100
-LTE_TX_GAIN=78
-LTE_RX_GAIN=40
-LTE_IMSI="001010123456789"
-LTE_K="00112233445566778899aabbccddeeff"
-
-NR_BANDWIDTH=40
-NR_TX_GAIN=78
-NR_RX_GAIN=40
-NR_IMSI="001010123456789"
-NR_K="00112233445566778899aabbccddeeff"
-
-N_ANTENNA_DL=2
-N_ANTENNA_UL=2
-
 global_context = {
         'generated_file_message': "This file was generated using a jinja2 template and the render-templates script, don't modify directly."
 }
 
 rf_mode_context_list = [
         {
-            'rf_mode': 'tdd1900',
-
-            'default_dl_earfcn': 38350,
-            'default_lte_dl_freq': 1890.0,
-            'default_lte_band': 39,
-            'default_lte_n_rb_dl': LTE_N_RB_DL,
-            'default_lte_tx_gain': LTE_TX_GAIN,
-            'default_lte_rx_gain': LTE_RX_GAIN,
-            'default_lte_imsi': LTE_IMSI,
-            'default_lte_k': LTE_K,
-
-            'default_dl_nr_arfcn': 378000,
-            'default_nr_band': 39,
-            'default_nr_dl_freq': 1890.0,
-            'default_nr_bandwidth': NR_BANDWIDTH,
-            'default_nr_tx_gain': NR_TX_GAIN,
-            'default_nr_rx_gain': NR_RX_GAIN,
-            'default_nr_ssb_pos_bitmap': "1000",
-            'default_ssb_nr_arfcn': 377790,
-            'default_nr_imsi': NR_IMSI,
-            'default_nr_k': NR_K,
-
-            'min_frequency': 1880.0,
-            'max_frequency': 1920,
-            'default_n_antenna_dl': N_ANTENNA_DL,
-            'default_n_antenna_ul': N_ANTENNA_UL,
+            'rf_mode'                      : 'tdd1900',
+            'default_dl_earfcn'            : 38350,
+            'default_lte_dl_freq'          : 1890.0,
+            'default_lte_band'             : 39,
+            'default_dl_nr_arfcn'          : 378000,
+            'default_nr_band'              : 39,
+            'default_nr_dl_freq'           : 1890.0,
+            'default_nr_ssb_pos_bitmap'    : "1000",
+            'default_ssb_nr_arfcn'         : 377790,
+            'min_frequency'                : 1880.0,
+            'max_frequency'                : 1920,
         }, {
-            'rf_mode': 'tdd2600',
-
-            'default_dl_earfcn': 38050,
-            'default_lte_dl_freq': 2600.0,
-            'default_lte_band': 38,
-            'default_lte_n_rb_dl': LTE_N_RB_DL,
-            'default_lte_tx_gain': LTE_TX_GAIN,
-            'default_lte_rx_gain': LTE_RX_GAIN,
-            'default_lte_imsi': LTE_IMSI,
-            'default_lte_k': LTE_K,
-
-            'default_dl_nr_arfcn': 520000,
-            'default_nr_band': 38,
-            'default_nr_dl_freq': 2600.0,
-            'default_nr_bandwidth': NR_BANDWIDTH,
-            'default_nr_tx_gain': NR_TX_GAIN,
-            'default_nr_rx_gain': NR_RX_GAIN,
-            'default_nr_ssb_pos_bitmap': "10000000",
-            'default_ssb_nr_arfcn': 517930,
-            'default_nr_imsi': NR_IMSI,
-            'default_nr_k': NR_K,
-
-            'min_frequency': 2570,
-            'max_frequency': 2620,
-            'default_n_antenna_dl': N_ANTENNA_DL,
-            'default_n_antenna_ul': N_ANTENNA_UL,
+            'rf_mode'                      : 'tdd2600',
+            'default_dl_earfcn'            : 38050,
+            'default_lte_dl_freq'          : 2600.0,
+            'default_lte_band'             : 38,
+            'default_dl_nr_arfcn'          : 520000,
+            'default_nr_band'              : 38,
+            'default_nr_dl_freq'           : 2600.0,
+            'default_nr_ssb_pos_bitmap'    : "10000000",
+            'default_ssb_nr_arfcn'         : 517930,
+            'min_frequency'                : 2570,
+            'max_frequency'                : 2620,
         }, {
-            'rf_mode': 'tdd3500',
-
-            'default_dl_earfcn': 42590,
-            'default_lte_dl_freq': 3500.0,
-            'default_lte_band': 42,
-            'default_lte_n_rb_dl': LTE_N_RB_DL,
-            'default_lte_tx_gain': LTE_TX_GAIN,
-            'default_lte_rx_gain': LTE_RX_GAIN,
-            'default_lte_imsi': LTE_IMSI,
-            'default_lte_k': LTE_K,
-
-            'default_dl_nr_arfcn': 632628,
-            'default_nr_band': 78,
-            'default_nr_dl_freq': 3489.42,
-            'default_nr_bandwidth': NR_BANDWIDTH,
-            'default_nr_tx_gain': NR_TX_GAIN,
-            'default_nr_rx_gain': NR_RX_GAIN,
-            'default_nr_ssb_pos_bitmap': "10000000",
-            'default_ssb_nr_arfcn': 632544,
-            'default_nr_imsi': NR_IMSI,
-            'default_nr_k': NR_K,
-
-            'min_frequency': 3400,
-            'max_frequency': 3600,
-            'default_n_antenna_dl': N_ANTENNA_DL,
-            'default_n_antenna_ul': N_ANTENNA_UL,
+            'rf_mode'                      : 'tdd3500',
+            'default_dl_earfcn'            : 42590,
+            'default_lte_dl_freq'          : 3500.0,
+            'default_lte_band'             : 42,
+            'default_dl_nr_arfcn'          : 632628,
+            'default_nr_band'              : 78,
+            'default_nr_dl_freq'           : 3489.42,
+            'default_nr_ssb_pos_bitmap'    : "10000000",
+            'default_ssb_nr_arfcn'         : 632544,
+            'min_frequency'                : 3400,
+            'max_frequency'                : 3600,
         }, {
-            'rf_mode': 'tdd3700',
-
-            'default_dl_earfcn': 44590,
-            'default_lte_dl_freq': 3700.0,
-            'default_lte_band': 43,
-            'default_lte_n_rb_dl': LTE_N_RB_DL,
-            'default_lte_tx_gain': LTE_TX_GAIN,
-            'default_lte_rx_gain': LTE_RX_GAIN,
-            'default_lte_imsi': LTE_IMSI,
-            'default_lte_k': LTE_K,
-
-            'default_dl_nr_arfcn': 646666,
-            'default_nr_band': 78,
-            'default_nr_dl_freq': 3699.99,
-            'default_nr_bandwidth': NR_BANDWIDTH,
-            'default_nr_tx_gain': NR_TX_GAIN,
-            'default_nr_rx_gain': NR_RX_GAIN,
-            'default_nr_ssb_pos_bitmap': "10000000",
-            'default_ssb_nr_arfcn': 646656,
-            'default_nr_imsi': NR_IMSI,
-            'default_nr_k': NR_K,
-
-            'min_frequency': 3600,
-            'max_frequency': 3800,
-            'default_n_antenna_dl': N_ANTENNA_DL,
-            'default_n_antenna_ul': N_ANTENNA_UL,
+            'rf_mode'                      : 'tdd3700',
+            'default_dl_earfcn'            : 44590,
+            'default_lte_dl_freq'          : 3700.0,
+            'default_lte_band'             : 43,
+            'default_dl_nr_arfcn'          : 646666,
+            'default_nr_band'              : 78,
+            'default_nr_dl_freq'           : 3699.99,
+            'default_nr_ssb_pos_bitmap'    : "10000000",
+            'default_ssb_nr_arfcn'         : 646656,
+            'min_frequency'                : 3600,
+            'max_frequency'                : 3800,
         }
 ]
 
+for i in range (4):
+    rf_mode_context_list[i].update({
+            'default_lte_n_rb_dl'          : 100,
+            'default_lte_tx_gain'          : 78,
+            'default_lte_rx_gain'          : 40,
+            'default_lte_imsi'             : "001010123456789",
+            'default_lte_k'                : "00112233445566778899aabbccddeeff",
+            'default_lte_inactivity_timer' : 10000,
+            'default_nr_bandwidth'         : 40,
+            'default_nr_tx_gain'           : 78,
+            'default_nr_rx_gain'           : 40,
+            'default_nr_imsi'              : "001010123456789",
+            'default_nr_k'                 : "00112233445566778899aabbccddeeff",
+            'default_n_antenna_dl'         : 2,
+            'default_n_antenna_ul'         : 2,
+            'default_nr_inactivity_timer' : 10000,
+    })
+
 with open('software.cfg.json.jinja2', 'r') as f:
     software_json_template = Template(f.read())
 with open('instance-enb-input-schema.json.jinja2', 'r') as f:

software/ors-amarisoft/software-tdd1900.cfg

@@ -3,13 +3,14 @@
 extends =
   software.cfg
 
-[enb]
+[default-params]
 default-dl-earfcn = 38350
 default-lte-dl-freq = 1890.0
 default-lte-band = 39
 default-lte-n-rb-dl = 100
 default-lte-tx-gain = 78
 default-lte-rx-gain = 40
+default-lte-inactivity-timer = 10000
 default-lte-imsi = 001010123456789
 default-lte-k = 00112233445566778899aabbccddeeff
 
@@ -21,6 +22,7 @@ default-nr-tx-gain = 78
 default-nr-rx-gain = 40
 default-nr-ssb-pos-bitmap = 1000
 default-ssb-nr-arfcn = 377790
+default-nr-inactivity-timer = 10000
 default-nr-imsi = 001010123456789
 default-nr-k = 00112233445566778899aabbccddeeff
 

software/ors-amarisoft/software-tdd2600.cfg

@@ -3,13 +3,14 @@
 extends =
   software.cfg
 
-[enb]
+[default-params]
 default-dl-earfcn = 38050
 default-lte-dl-freq = 2600.0
 default-lte-band = 38
 default-lte-n-rb-dl = 100
 default-lte-tx-gain = 78
 default-lte-rx-gain = 40
+default-lte-inactivity-timer = 10000
 default-lte-imsi = 001010123456789
 default-lte-k = 00112233445566778899aabbccddeeff
 
@@ -21,6 +22,7 @@ default-nr-tx-gain = 78
 default-nr-rx-gain = 40
 default-nr-ssb-pos-bitmap = 10000000
 default-ssb-nr-arfcn = 517930
+default-nr-inactivity-timer = 10000
 default-nr-imsi = 001010123456789
 default-nr-k = 00112233445566778899aabbccddeeff
 

software/ors-amarisoft/software-tdd3500.cfg

@@ -3,13 +3,14 @@
 extends =
   software.cfg
 
-[enb]
+[default-params]
 default-dl-earfcn = 42590
 default-lte-dl-freq = 3500.0
 default-lte-band = 42
 default-lte-n-rb-dl = 100
 default-lte-tx-gain = 78
 default-lte-rx-gain = 40
+default-lte-inactivity-timer = 10000
 default-lte-imsi = 001010123456789
 default-lte-k = 00112233445566778899aabbccddeeff
 
@@ -21,6 +22,7 @@ default-nr-tx-gain = 78
 default-nr-rx-gain = 40
 default-nr-ssb-pos-bitmap = 10000000
 default-ssb-nr-arfcn = 632544
+default-nr-inactivity-timer = 10000
 default-nr-imsi = 001010123456789
 default-nr-k = 00112233445566778899aabbccddeeff
 

software/ors-amarisoft/software-tdd3700.cfg

@@ -3,13 +3,14 @@
 extends =
   software.cfg
 
-[enb]
+[default-params]
 default-dl-earfcn = 44590
 default-lte-dl-freq = 3700.0
 default-lte-band = 43
 default-lte-n-rb-dl = 100
 default-lte-tx-gain = 78
 default-lte-rx-gain = 40
+default-lte-inactivity-timer = 10000
 default-lte-imsi = 001010123456789
 default-lte-k = 00112233445566778899aabbccddeeff
 
@@ -21,6 +22,7 @@ default-nr-tx-gain = 78
 default-nr-rx-gain = 40
 default-nr-ssb-pos-bitmap = 10000000
 default-ssb-nr-arfcn = 646656
+default-nr-inactivity-timer = 10000
 default-nr-imsi = 001010123456789
 default-nr-k = 00112233445566778899aabbccddeeff
 

software/ors-amarisoft/software.jinja2.cfg

@@ -3,13 +3,14 @@
 extends =
   software.cfg
 
-[enb]
+[default-params]
 default-dl-earfcn = {{ default_dl_earfcn }}
 default-lte-dl-freq = {{ default_lte_dl_freq }}
 default-lte-band = {{ default_lte_band }}
 default-lte-n-rb-dl = {{ default_lte_n_rb_dl }}
 default-lte-tx-gain = {{ default_lte_tx_gain }}
 default-lte-rx-gain = {{ default_lte_rx_gain }}
+default-lte-inactivity-timer = {{ default_lte_inactivity_timer }}
 default-lte-imsi = {{ default_lte_imsi }}
 default-lte-k = {{ default_lte_k }}
 
@@ -21,6 +22,7 @@ default-nr-tx-gain = {{ default_nr_tx_gain }}
 default-nr-rx-gain = {{ default_nr_rx_gain }}
 default-nr-ssb-pos-bitmap = {{ default_nr_ssb_pos_bitmap }}
 default-ssb-nr-arfcn = {{ default_ssb_nr_arfcn }}
+default-nr-inactivity-timer = {{ default_nr_inactivity_timer }}
 default-nr-imsi = {{ default_nr_imsi }}
 default-nr-k = {{ default_nr_k }}