Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
spbro
OpenXG-RAN
Commits
57be6ee2
Commit
57be6ee2
authored
May 31, 2023
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix rfsim CI tests not in sync raster
parent
3e7a0820
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
10 deletions
+10
-10
ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
+1
-1
ci-scripts/conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf
ci-scripts/conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf
+2
-2
ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
...onf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
+1
-1
ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
+1
-1
ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
...ripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
+1
-1
ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
...ts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
+1
-1
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+3
-3
No files found.
ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
View file @
57be6ee2
...
...
@@ -29,7 +29,7 @@ gNBs =
# downlinkConfigCommon
#frequencyInfoDL
# this is 2150 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block
absoluteFrequencySSB
=
430
504
;
absoluteFrequencySSB
=
430
600
;
dl_frequencyBand
=
66
;
# this is 2150 MHz
dl_absoluteFrequencyPointA
=
430000
;
...
...
ci-scripts/conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf
View file @
57be6ee2
...
...
@@ -29,10 +29,10 @@ gNBs =
# downlinkConfigCommon
#frequencyInfoDL
# this is 3600 MHz + 12 PRBs@30kHz SCS (same as initial BWP)
absoluteFrequencySSB
=
640
288
;
absoluteFrequencySSB
=
640
320
;
dl_frequencyBand
=
78
;
# this is 3600 MHz
dl_absoluteFrequencyPointA
=
6400
00
;
dl_absoluteFrequencyPointA
=
6400
32
;
#scs-SpecificCarrierList
dl_offstToCarrier
=
0
;
# subcarrierSpacing
...
...
ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
View file @
57be6ee2
...
...
@@ -29,7 +29,7 @@ gNBs =
# downlinkConfigCommon
#frequencyInfoDL
# this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
absoluteFrequencySSB
=
4330
96
;
absoluteFrequencySSB
=
4330
00
;
dl_frequencyBand
=
66
;
# this is 3600 MHz
dl_absoluteFrequencyPointA
=
430000
;
...
...
ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
View file @
57be6ee2
...
...
@@ -187,7 +187,7 @@ services:
container_name
:
rfsim5g-oai-nr-ue
environment
:
RFSIMULATOR
:
192.168.71.140
USE_ADDITIONAL_OPTIONS
:
-E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169080000 --CO -400000000 --ssb 3
96
--log_config.global_log_options level,nocolor,time
USE_ADDITIONAL_OPTIONS
:
-E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169080000 --CO -400000000 --ssb 3
80
--log_config.global_log_options level,nocolor,time
depends_on
:
-
oai-gnb
networks
:
...
...
ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
View file @
57be6ee2
...
...
@@ -187,7 +187,7 @@ services:
container_name
:
rfsim5g-oai-nr-ue
environment
:
RFSIMULATOR
:
192.168.71.140
USE_ADDITIONAL_OPTIONS
:
--sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604
32
0000 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time
USE_ADDITIONAL_OPTIONS
:
--sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604
80
0000 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time
depends_on
:
-
oai-gnb
networks
:
...
...
ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
View file @
57be6ee2
...
...
@@ -188,7 +188,7 @@ services:
container_name
:
rfsim5g-oai-nr-ue
environment
:
RFSIMULATOR
:
192.168.71.140
USE_ADDITIONAL_OPTIONS
:
--sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152250000 --CO -400000000 --ssb
48
--log_config.global_log_options level,nocolor,time
USE_ADDITIONAL_OPTIONS
:
--sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152250000 --CO -400000000 --ssb
80
--log_config.global_log_options level,nocolor,time
depends_on
:
-
oai-gnb
networks
:
...
...
openair2/GNB_APP/gnb_config.c
View file @
57be6ee2
...
...
@@ -1142,19 +1142,19 @@ void check_ssb_raster(long absolutefreqssb, int band, int scs)
break
;
}
}
AssertFatal
(
N
!=
0
,
"absoluteFrequencySSB %ld (%lu) not on the synchronization raster (N * 1200kHz + M * 50 kHz)
\n
"
,
AssertFatal
(
N
!=
0
,
"absoluteFrequencySSB %ld (%lu
Hz
) not on the synchronization raster (N * 1200kHz + M * 50 kHz)
\n
"
,
absolutefreqssb
,
freq
);
GSCN
=
(
3
*
N
)
+
(
M
-
3
)
/
2
;
}
else
if
(
freq
<=
24250000000
)
{
AssertFatal
((
freq
-
3000000000
)
%
1440000
==
0
,
"absoluteFrequencySSB %ld (%lu) not on the synchronization raster (3000 MHz + N * 1.44 MHz)
\n
"
,
"absoluteFrequencySSB %ld (%lu
Hz
) not on the synchronization raster (3000 MHz + N * 1.44 MHz)
\n
"
,
absolutefreqssb
,
freq
);
GSCN
=
((
freq
-
3000000000
)
/
1440000
)
+
7499
;
}
else
{
AssertFatal
((
freq
-
24250080000
)
%
17280000
==
0
,
"absoluteFrequencySSB %ld (%lu) not on the synchronization raster (24250.08 MHz + N * 17.28 MHz)
\n
"
,
"absoluteFrequencySSB %ld (%lu
Hz
) not on the synchronization raster (24250.08 MHz + N * 17.28 MHz)
\n
"
,
absolutefreqssb
,
freq
);
GSCN
=
((
freq
-
24250080000
)
/
17280000
)
+
22256
;
}
...
...
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