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
b4bc9ce7
Commit
b4bc9ce7
authored
Dec 28, 2023
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
bae72d37
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
3 deletions
+5
-3
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+1
-1
software/ors-amarisoft/instance-ors-enb.jinja2.cfg
software/ors-amarisoft/instance-ors-enb.jinja2.cfg
+2
-0
software/ors-amarisoft/instance-ors-gnb-input-schema.json
software/ors-amarisoft/instance-ors-gnb-input-schema.json
+2
-1
software/ors-amarisoft/test/test_ors.py
software/ors-amarisoft/test/test_ors.py
+0
-1
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
b4bc9ce7
...
@@ -92,7 +92,7 @@ md5sum = 6434819165cefda0ed9f9ecd46f39e46
...
@@ -92,7 +92,7 @@ md5sum = 6434819165cefda0ed9f9ecd46f39e46
[template-ors-enb]
[template-ors-enb]
_update_hash_filename_ = instance-ors-enb.jinja2.cfg
_update_hash_filename_ = instance-ors-enb.jinja2.cfg
md5sum =
155a5df1a0ba6c133bced5b674c88400
md5sum =
ce77962cf769d2f47eae13ddab871522
[template-core-network]
[template-core-network]
_update_hash_filename_ = instance-core-network.jinja2.cfg
_update_hash_filename_ = instance-core-network.jinja2.cfg
...
...
software/ors-amarisoft/instance-ors-enb.jinja2.cfg
View file @
b4bc9ce7
...
@@ -31,6 +31,7 @@
...
@@ -31,6 +31,7 @@
"n_antenna_ul": 2,
"n_antenna_ul": 2,
"rf_mode": "tdd",
"rf_mode": "tdd",
"tdd_ul_dl_config": "5ms 2UL 7DL 4/6 (default)",
"tdd_ul_dl_config": "5ms 2UL 7DL 4/6 (default)",
"ssb_pos_bitmap": "10000000",
"pci": 500,
"pci": 500,
"cell_id": "0x01",
"cell_id": "0x01",
"gnb_id": "0x12345",
"gnb_id": "0x12345",
...
@@ -94,6 +95,7 @@
...
@@ -94,6 +95,7 @@
'dl_nr_arfcn': ors_version['current-nr-arfcn'],
'dl_nr_arfcn': ors_version['current-nr-arfcn'],
'nr_band': ors_version['current-nr-band'],
'nr_band': ors_version['current-nr-band'],
'bandwidth': slapparameter_dict.nr_bandwidth,
'bandwidth': slapparameter_dict.nr_bandwidth,
'ssb_pos_bitmap': slapparameter_dict.ssb_pos_bitmap,
'root_sequence_index': 1,
'root_sequence_index': 1,
}
}
%}
%}
...
...
software/ors-amarisoft/instance-ors-gnb-input-schema.json
View file @
b4bc9ce7
...
@@ -26,7 +26,8 @@
...
@@ -26,7 +26,8 @@
"$ref"
:
"cell/nr/input-schema.json#/properties/nr_band"
"$ref"
:
"cell/nr/input-schema.json#/properties/nr_band"
},
},
"ssb_pos_bitmap"
:
{
"ssb_pos_bitmap"
:
{
"$ref"
:
"cell/nr/input-schema.json#/properties/ssb_pos_bitmap"
"$ref"
:
"cell/nr/input-schema.json#/properties/ssb_pos_bitmap"
,
"default"
:
"10000000"
},
},
"pci"
:
{
"pci"
:
{
"$ref"
:
"cell/common.json#/properties/pci"
,
"$ref"
:
"cell/common.json#/properties/pci"
,
...
...
software/ors-amarisoft/test/test_ors.py
View file @
b4bc9ce7
...
@@ -202,7 +202,6 @@ def test_gnb_conf1(self):
...
@@ -202,7 +202,6 @@ def test_gnb_conf1(self):
nr_cell
=
conf
[
'nr_cell_list'
][
0
]
nr_cell
=
conf
[
'nr_cell_list'
][
0
]
self
.
assertEqual
(
nr_cell
[
'inactivity_timer'
],
gnb_param_dict1
[
'inactivity_timer'
])
self
.
assertEqual
(
nr_cell
[
'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
][
'dl_nr_arfcn'
],
gnb_param_dict1
[
'dl_nr_arfcn'
])
# XXX + ul_nr_arfcn ?
self
.
assertEqual
(
conf
[
'nr_cell_list'
][
0
][
'band'
],
gnb_param_dict1
[
'nr_band'
])
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'
])
self
.
assertEqual
(
conf
[
'nr_cell_list'
][
0
][
'ssb_pos_bitmap'
],
gnb_param_dict1
[
'ssb_pos_bitmap'
])
self
.
assertEqual
(
conf
[
'nr_cell_default'
][
'n_id_cell'
],
gnb_param_dict1
[
'pci'
])
self
.
assertEqual
(
conf
[
'nr_cell_default'
][
'n_id_cell'
],
gnb_param_dict1
[
'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