Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
6268abe3
Commit
6268abe3
authored
Oct 10, 2022
by
Joanne Hugé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ors-amarisoft: add inactivity_timer parameter
parent
0c5a61d0
Pipeline
#24092
failed with stage
Changes
35
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
35 changed files
with
203 additions
and
64 deletions
+203
-64
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+6
-6
software/ors-amarisoft/config/enb.jinja2.cfg
software/ors-amarisoft/config/enb.jinja2.cfg
+1
-1
software/ors-amarisoft/config/gnb.jinja2.cfg
software/ors-amarisoft/config/gnb.jinja2.cfg
+1
-1
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
+6
-0
software/ors-amarisoft/instance-enb.jinja2.cfg
software/ors-amarisoft/instance-enb.jinja2.cfg
+1
-0
software/ors-amarisoft/instance-gnb-input-schema.json.jinja2
software/ors-amarisoft/instance-gnb-input-schema.json.jinja2
+6
-0
software/ors-amarisoft/instance-gnb.jinja2.cfg
software/ors-amarisoft/instance-gnb.jinja2.cfg
+1
-0
software/ors-amarisoft/instance-tdd1900-enb-epc-input-schema.json
.../ors-amarisoft/instance-tdd1900-enb-epc-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd1900-enb-input-schema.json
...ware/ors-amarisoft/instance-tdd1900-enb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd1900-gnb-epc-input-schema.json
.../ors-amarisoft/instance-tdd1900-gnb-epc-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json
...ware/ors-amarisoft/instance-tdd1900-gnb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd2600-enb-epc-input-schema.json
.../ors-amarisoft/instance-tdd2600-enb-epc-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd2600-enb-input-schema.json
...ware/ors-amarisoft/instance-tdd2600-enb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd2600-gnb-epc-input-schema.json
.../ors-amarisoft/instance-tdd2600-gnb-epc-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json
...ware/ors-amarisoft/instance-tdd2600-gnb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd3500-enb-epc-input-schema.json
.../ors-amarisoft/instance-tdd3500-enb-epc-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd3500-enb-input-schema.json
...ware/ors-amarisoft/instance-tdd3500-enb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd3500-gnb-epc-input-schema.json
.../ors-amarisoft/instance-tdd3500-gnb-epc-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json
...ware/ors-amarisoft/instance-tdd3500-gnb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd3700-enb-epc-input-schema.json
.../ors-amarisoft/instance-tdd3700-enb-epc-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd3700-enb-input-schema.json
...ware/ors-amarisoft/instance-tdd3700-enb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd3700-gnb-epc-input-schema.json
.../ors-amarisoft/instance-tdd3700-gnb-epc-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json
...ware/ors-amarisoft/instance-tdd3700-gnb-input-schema.json
+6
-0
software/ors-amarisoft/instance.cfg
software/ors-amarisoft/instance.cfg
+2
-0
software/ors-amarisoft/render-templates
software/ors-amarisoft/render-templates
+58
-56
software/ors-amarisoft/software-tdd1900.cfg
software/ors-amarisoft/software-tdd1900.cfg
+2
-0
software/ors-amarisoft/software-tdd2600.cfg
software/ors-amarisoft/software-tdd2600.cfg
+2
-0
software/ors-amarisoft/software-tdd3500.cfg
software/ors-amarisoft/software-tdd3500.cfg
+2
-0
software/ors-amarisoft/software-tdd3700.cfg
software/ors-amarisoft/software-tdd3700.cfg
+2
-0
software/ors-amarisoft/software.jinja2.cfg
software/ors-amarisoft/software.jinja2.cfg
+2
-0
software/ors-amarisoft/test/test.jinja2.py
software/ors-amarisoft/test/test.jinja2.py
+3
-0
software/ors-amarisoft/test/testTDD1900.py
software/ors-amarisoft/test/testTDD1900.py
+3
-0
software/ors-amarisoft/test/testTDD2600.py
software/ors-amarisoft/test/testTDD2600.py
+3
-0
software/ors-amarisoft/test/testTDD3500.py
software/ors-amarisoft/test/testTDD3500.py
+3
-0
software/ors-amarisoft/test/testTDD3700.py
software/ors-amarisoft/test/testTDD3700.py
+3
-0
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
6268abe3
...
...
@@ -16,7 +16,7 @@
[template]
filename = instance.cfg
md5sum =
e72c0abf26cb451cef9e30d9fbfe9327
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
...
...
@@ -88,7 +88,7 @@ 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
View file @
6268abe3
...
...
@@ -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
View file @
6268abe3
...
...
@@ -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/instance-enb-input-schema.json.jinja2
View file @
6268abe3
...
...
@@ -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
View file @
6268abe3
...
...
@@ -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
View file @
6268abe3
...
...
@@ -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
View file @
6268abe3
...
...
@@ -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
View file @
6268abe3
...
...
@@ -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
View file @
6268abe3
...
...
@@ -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
View file @
6268abe3
...
...
@@ -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
View file @
6268abe3
...
...
@@ -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-enb-epc-input-schema.json
View file @
6268abe3
...
...
@@ -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
View file @
6268abe3
...
...
@@ -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
View file @
6268abe3
...
...
@@ -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
View file @
6268abe3
...
...
@@ -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-enb-epc-input-schema.json
View file @
6268abe3
...
...
@@ -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
View file @
6268abe3
...
...
@@ -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
View file @
6268abe3
...
...
@@ -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
View file @
6268abe3
...
...
@@ -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-enb-epc-input-schema.json
View file @
6268abe3
...
...
@@ -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
View file @
6268abe3
...
...
@@ -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
View file @
6268abe3
...
...
@@ -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
View file @
6268abe3
...
...
@@ -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.cfg
View file @
6268abe3
...
...
@@ -112,6 +112,7 @@ extra-context =
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}
...
...
@@ -134,6 +135,7 @@ extra-context =
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}
...
...
software/ors-amarisoft/render-templates
View file @
6268abe3
...
...
@@ -66,6 +66,7 @@ for i in range (4):
'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
,
...
...
@@ -73,6 +74,7 @@ for i in range (4):
'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/ors-amarisoft/software-tdd1900.cfg
View file @
6268abe3
...
...
@@ -10,6 +10,7 @@ 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
View file @
6268abe3
...
...
@@ -10,6 +10,7 @@ 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
View file @
6268abe3
...
...
@@ -10,6 +10,7 @@ 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
View file @
6268abe3
...
...
@@ -10,6 +10,7 @@ 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
View file @
6268abe3
...
...
@@ -10,6 +10,7 @@ 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 }}
...
...
software/ors-amarisoft/test/test.jinja2.py
View file @
6268abe3
...
...
@@ -64,6 +64,7 @@ param_dict = {
'rue_addr'
:
"192.168.99.88"
,
'n_antenna_dl'
:
2
,
'n_antenna_ul'
:
2
,
'inactivity_timer'
:
17
,
'gnb_id'
:
"0x17"
,
'ssb_pos_bitmap'
:
"10"
,
'amf_list'
:
{
...
...
@@ -110,6 +111,7 @@ class TestGNBParameters1(ORSTestCase):
conf
=
yaml
.
load
(
f
)
self
.
assertEqual
(
conf
[
'tx_gain'
],
gnb_param_dict1
[
'tx_gain'
])
self
.
assertEqual
(
conf
[
'rx_gain'
],
gnb_param_dict1
[
'rx_gain'
])
self
.
assertEqual
(
conf
[
'nr_cell_default'
][
'inactivity_timer'
],
gnb_param_dict1
[
'inactivity_timer'
])
self
.
assertEqual
(
conf
[
'nr_cell_list'
][
0
][
'dl_nr_arfcn'
],
gnb_param_dict1
[
'dl_nr_arfcn'
])
self
.
assertEqual
(
conf
[
'nr_cell_list'
][
0
][
'band'
],
gnb_param_dict1
[
'nr_band'
])
self
.
assertEqual
(
conf
[
'nr_cell_list'
][
0
][
'ssb_pos_bitmap'
],
gnb_param_dict1
[
'ssb_pos_bitmap'
])
...
...
@@ -155,6 +157,7 @@ def test_enb_conf(self):
conf
=
yaml
.
load
(
f
)
self
.
assertEqual
(
conf
[
'tx_gain'
],
enb_param_dict
[
'tx_gain'
])
self
.
assertEqual
(
conf
[
'rx_gain'
],
enb_param_dict
[
'rx_gain'
])
self
.
assertEqual
(
conf
[
'cell_default'
][
'inactivity_timer'
],
enb_param_dict
[
'inactivity_timer'
])
self
.
assertEqual
(
conf
[
'cell_list'
][
0
][
'dl_earfcn'
],
enb_param_dict
[
'dl_earfcn'
])
self
.
assertEqual
(
conf
[
'enb_id'
],
int
(
enb_param_dict
[
'enb_id'
],
16
))
self
.
assertEqual
(
conf
[
'cell_list'
][
0
][
'n_id_cell'
],
enb_param_dict
[
'pci'
])
...
...
software/ors-amarisoft/test/testTDD1900.py
View file @
6268abe3
...
...
@@ -64,6 +64,7 @@ param_dict = {
'rue_addr'
:
"192.168.99.88"
,
'n_antenna_dl'
:
2
,
'n_antenna_ul'
:
2
,
'inactivity_timer'
:
17
,
'gnb_id'
:
"0x17"
,
'ssb_pos_bitmap'
:
"10"
,
'amf_list'
:
{
...
...
@@ -110,6 +111,7 @@ class TestGNBParameters1(ORSTestCase):
conf
=
yaml
.
load
(
f
)
self
.
assertEqual
(
conf
[
'tx_gain'
],
gnb_param_dict1
[
'tx_gain'
])
self
.
assertEqual
(
conf
[
'rx_gain'
],
gnb_param_dict1
[
'rx_gain'
])
self
.
assertEqual
(
conf
[
'nr_cell_default'
][
'inactivity_timer'
],
gnb_param_dict1
[
'inactivity_timer'
])
self
.
assertEqual
(
conf
[
'nr_cell_list'
][
0
][
'dl_nr_arfcn'
],
gnb_param_dict1
[
'dl_nr_arfcn'
])
self
.
assertEqual
(
conf
[
'nr_cell_list'
][
0
][
'band'
],
gnb_param_dict1
[
'nr_band'
])
self
.
assertEqual
(
conf
[
'nr_cell_list'
][
0
][
'ssb_pos_bitmap'
],
gnb_param_dict1
[
'ssb_pos_bitmap'
])
...
...
@@ -155,6 +157,7 @@ def test_enb_conf(self):
conf
=
yaml
.
load
(
f
)
self
.
assertEqual
(
conf
[
'tx_gain'
],
enb_param_dict
[
'tx_gain'
])
self
.
assertEqual
(
conf
[
'rx_gain'
],
enb_param_dict
[
'rx_gain'
])
self
.
assertEqual
(
conf
[
'cell_default'
][
'inactivity_timer'
],
enb_param_dict
[
'inactivity_timer'
])
self
.
assertEqual
(
conf
[
'cell_list'
][
0
][
'dl_earfcn'
],
enb_param_dict
[
'dl_earfcn'
])
self
.
assertEqual
(
conf
[
'enb_id'
],
int
(
enb_param_dict
[
'enb_id'
],
16
))
self
.
assertEqual
(
conf
[
'cell_list'
][
0
][
'n_id_cell'
],
enb_param_dict
[
'pci'
])
...
...
software/ors-amarisoft/test/testTDD2600.py
View file @
6268abe3
...
...
@@ -64,6 +64,7 @@ param_dict = {
'rue_addr'
:
"192.168.99.88"
,
'n_antenna_dl'
:
2
,
'n_antenna_ul'
:
2
,
'inactivity_timer'
:
17
,
'gnb_id'
:
"0x17"
,
'ssb_pos_bitmap'
:
"10"
,
'amf_list'
:
{
...
...
@@ -110,6 +111,7 @@ class TestGNBParameters1(ORSTestCase):
conf
=
yaml
.
load
(
f
)
self
.
assertEqual
(
conf
[
'tx_gain'
],
gnb_param_dict1
[
'tx_gain'
])
self
.
assertEqual
(
conf
[
'rx_gain'
],
gnb_param_dict1
[
'rx_gain'
])
self
.
assertEqual
(
conf
[
'nr_cell_default'
][
'inactivity_timer'
],
gnb_param_dict1
[
'inactivity_timer'
])
self
.
assertEqual
(
conf
[
'nr_cell_list'
][
0
][
'dl_nr_arfcn'
],
gnb_param_dict1
[
'dl_nr_arfcn'
])
self
.
assertEqual
(
conf
[
'nr_cell_list'
][
0
][
'band'
],
gnb_param_dict1
[
'nr_band'
])
self
.
assertEqual
(
conf
[
'nr_cell_list'
][
0
][
'ssb_pos_bitmap'
],
gnb_param_dict1
[
'ssb_pos_bitmap'
])
...
...
@@ -155,6 +157,7 @@ def test_enb_conf(self):
conf
=
yaml
.
load
(
f
)
self
.
assertEqual
(
conf
[
'tx_gain'
],
enb_param_dict
[
'tx_gain'
])
self
.
assertEqual
(
conf
[
'rx_gain'
],
enb_param_dict
[
'rx_gain'
])
self
.
assertEqual
(
conf
[
'cell_default'
][
'inactivity_timer'
],
enb_param_dict
[
'inactivity_timer'
])
self
.
assertEqual
(
conf
[
'cell_list'
][
0
][
'dl_earfcn'
],
enb_param_dict
[
'dl_earfcn'
])
self
.
assertEqual
(
conf
[
'enb_id'
],
int
(
enb_param_dict
[
'enb_id'
],
16
))
self
.
assertEqual
(
conf
[
'cell_list'
][
0
][
'n_id_cell'
],
enb_param_dict
[
'pci'
])
...
...
software/ors-amarisoft/test/testTDD3500.py
View file @
6268abe3
...
...
@@ -64,6 +64,7 @@ param_dict = {
'rue_addr'
:
"192.168.99.88"
,
'n_antenna_dl'
:
2
,
'n_antenna_ul'
:
2
,
'inactivity_timer'
:
17
,
'gnb_id'
:
"0x17"
,
'ssb_pos_bitmap'
:
"10"
,
'amf_list'
:
{
...
...
@@ -110,6 +111,7 @@ class TestGNBParameters1(ORSTestCase):
conf
=
yaml
.
load
(
f
)
self
.
assertEqual
(
conf
[
'tx_gain'
],
gnb_param_dict1
[
'tx_gain'
])
self
.
assertEqual
(
conf
[
'rx_gain'
],
gnb_param_dict1
[
'rx_gain'
])
self
.
assertEqual
(
conf
[
'nr_cell_default'
][
'inactivity_timer'
],
gnb_param_dict1
[
'inactivity_timer'
])
self
.
assertEqual
(
conf
[
'nr_cell_list'
][
0
][
'dl_nr_arfcn'
],
gnb_param_dict1
[
'dl_nr_arfcn'
])
self
.
assertEqual
(
conf
[
'nr_cell_list'
][
0
][
'band'
],
gnb_param_dict1
[
'nr_band'
])
self
.
assertEqual
(
conf
[
'nr_cell_list'
][
0
][
'ssb_pos_bitmap'
],
gnb_param_dict1
[
'ssb_pos_bitmap'
])
...
...
@@ -155,6 +157,7 @@ def test_enb_conf(self):
conf
=
yaml
.
load
(
f
)
self
.
assertEqual
(
conf
[
'tx_gain'
],
enb_param_dict
[
'tx_gain'
])
self
.
assertEqual
(
conf
[
'rx_gain'
],
enb_param_dict
[
'rx_gain'
])
self
.
assertEqual
(
conf
[
'cell_default'
][
'inactivity_timer'
],
enb_param_dict
[
'inactivity_timer'
])
self
.
assertEqual
(
conf
[
'cell_list'
][
0
][
'dl_earfcn'
],
enb_param_dict
[
'dl_earfcn'
])
self
.
assertEqual
(
conf
[
'enb_id'
],
int
(
enb_param_dict
[
'enb_id'
],
16
))
self
.
assertEqual
(
conf
[
'cell_list'
][
0
][
'n_id_cell'
],
enb_param_dict
[
'pci'
])
...
...
software/ors-amarisoft/test/testTDD3700.py
View file @
6268abe3
...
...
@@ -64,6 +64,7 @@ param_dict = {
'rue_addr'
:
"192.168.99.88"
,
'n_antenna_dl'
:
2
,
'n_antenna_ul'
:
2
,
'inactivity_timer'
:
17
,
'gnb_id'
:
"0x17"
,
'ssb_pos_bitmap'
:
"10"
,
'amf_list'
:
{
...
...
@@ -110,6 +111,7 @@ class TestGNBParameters1(ORSTestCase):
conf
=
yaml
.
load
(
f
)
self
.
assertEqual
(
conf
[
'tx_gain'
],
gnb_param_dict1
[
'tx_gain'
])
self
.
assertEqual
(
conf
[
'rx_gain'
],
gnb_param_dict1
[
'rx_gain'
])
self
.
assertEqual
(
conf
[
'nr_cell_default'
][
'inactivity_timer'
],
gnb_param_dict1
[
'inactivity_timer'
])
self
.
assertEqual
(
conf
[
'nr_cell_list'
][
0
][
'dl_nr_arfcn'
],
gnb_param_dict1
[
'dl_nr_arfcn'
])
self
.
assertEqual
(
conf
[
'nr_cell_list'
][
0
][
'band'
],
gnb_param_dict1
[
'nr_band'
])
self
.
assertEqual
(
conf
[
'nr_cell_list'
][
0
][
'ssb_pos_bitmap'
],
gnb_param_dict1
[
'ssb_pos_bitmap'
])
...
...
@@ -155,6 +157,7 @@ def test_enb_conf(self):
conf
=
yaml
.
load
(
f
)
self
.
assertEqual
(
conf
[
'tx_gain'
],
enb_param_dict
[
'tx_gain'
])
self
.
assertEqual
(
conf
[
'rx_gain'
],
enb_param_dict
[
'rx_gain'
])
self
.
assertEqual
(
conf
[
'cell_default'
][
'inactivity_timer'
],
enb_param_dict
[
'inactivity_timer'
])
self
.
assertEqual
(
conf
[
'cell_list'
][
0
][
'dl_earfcn'
],
enb_param_dict
[
'dl_earfcn'
])
self
.
assertEqual
(
conf
[
'enb_id'
],
int
(
enb_param_dict
[
'enb_id'
],
16
))
self
.
assertEqual
(
conf
[
'cell_list'
][
0
][
'n_id_cell'
],
enb_param_dict
[
'pci'
])
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment