Commit cd817930 authored by francescomani's avatar francescomani

fix tests after review and LOG_E to avoid assertion on channel raster

parent ce7d6cc3
...@@ -32,7 +32,7 @@ gNBs = ...@@ -32,7 +32,7 @@ gNBs =
# downlinkConfigCommon # downlinkConfigCommon
#frequencyInfoDL #frequencyInfoDL
# this is 2150 MHz + 43 PRBs@30kHz SCS (same as initial BWP) # this is 2150 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
absoluteFrequencySSB = 432880; absoluteFrequencySSB = 433096;
dl_frequencyBand = 66; dl_frequencyBand = 66;
# this is 2150 MHz # this is 2150 MHz
dl_absoluteFrequencyPointA = 430000; dl_absoluteFrequencyPointA = 430000;
......
...@@ -29,7 +29,7 @@ gNBs = ...@@ -29,7 +29,7 @@ gNBs =
# downlinkConfigCommon # downlinkConfigCommon
#frequencyInfoDL #frequencyInfoDL
# this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP) # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
absoluteFrequencySSB = 433096; absoluteFrequencySSB = 432990;
dl_frequencyBand = 66; dl_frequencyBand = 66;
# this is 3600 MHz # this is 3600 MHz
dl_absoluteFrequencyPointA = 430000; dl_absoluteFrequencyPointA = 430000;
......
...@@ -29,7 +29,7 @@ gNBs = ...@@ -29,7 +29,7 @@ gNBs =
# downlinkConfigCommon # downlinkConfigCommon
#frequencyInfoDL #frequencyInfoDL
# this is 2150 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block # this is 2150 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block
absoluteFrequencySSB = 430600; absoluteFrequencySSB = 430590;
dl_frequencyBand = 66; dl_frequencyBand = 66;
# this is 2150 MHz # this is 2150 MHz
dl_absoluteFrequencyPointA = 430000; dl_absoluteFrequencyPointA = 430000;
......
...@@ -29,7 +29,7 @@ gNBs = ...@@ -29,7 +29,7 @@ gNBs =
# downlinkConfigCommon # downlinkConfigCommon
#frequencyInfoDL #frequencyInfoDL
# this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP) # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
absoluteFrequencySSB = 433000; absoluteFrequencySSB = 432990;
dl_frequencyBand = 66; dl_frequencyBand = 66;
# this is 3600 MHz # this is 3600 MHz
dl_absoluteFrequencyPointA = 430000; dl_absoluteFrequencyPointA = 430000;
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
--> -->
<testCaseList> <testCaseList>
<htmlTabRef>rfsim-5gnr-tdd-u0-25prb</htmlTabRef> <htmlTabRef>rfsim-5gnr-fdd-u0-25prb</htmlTabRef>
<htmlTabName>Monolithic SA TDD u0 25PRB gNB</htmlTabName> <htmlTabName>Monolithic SA FDD u0 25PRB gNB</htmlTabName>
<htmlTabIcon>wrench</htmlTabIcon> <htmlTabIcon>wrench</htmlTabIcon>
<repeatCount>1</repeatCount> <repeatCount>1</repeatCount>
<TestCaseRequestedList> <TestCaseRequestedList>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
--> -->
<testCaseList> <testCaseList>
<htmlTabRef>rfsim-5gnr-u0-25prb-down</htmlTabRef> <htmlTabRef>rfsim-5gnr-u0-25prb-down</htmlTabRef>
<htmlTabName>CleanUp SA Monolithic TDD u0 25PRB gNB</htmlTabName> <htmlTabName>CleanUp SA Monolithic FDD u0 25PRB gNB</htmlTabName>
<htmlTabIcon>trash</htmlTabIcon> <htmlTabIcon>trash</htmlTabIcon>
<TestCaseRequestedList> <TestCaseRequestedList>
100002 100002
......
...@@ -187,7 +187,7 @@ services: ...@@ -187,7 +187,7 @@ services:
container_name: rfsim5g-oai-nr-ue container_name: rfsim5g-oai-nr-ue
environment: environment:
RFSIMULATOR: 192.168.71.140 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 380 --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 378 --log_config.global_log_options level,nocolor,time
depends_on: depends_on:
- oai-gnb - oai-gnb
networks: networks:
......
...@@ -188,7 +188,7 @@ services: ...@@ -188,7 +188,7 @@ services:
container_name: rfsim5g-oai-nr-ue container_name: rfsim5g-oai-nr-ue
environment: environment:
RFSIMULATOR: 192.168.71.140 RFSIMULATOR: 192.168.71.140
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 USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152250000 --CO -400000000 --ssb 76 --log_config.global_log_options level,nocolor,time
depends_on: depends_on:
- oai-gnb - oai-gnb
networks: networks:
......
...@@ -2234,13 +2234,12 @@ static const uint16_t table_7_3_1_1_2_32[3][15] = { ...@@ -2234,13 +2234,12 @@ static const uint16_t table_7_3_1_1_2_32[3][15] = {
{0, 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {0, 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
}; };
void get_delta_arfcn(int i, uint32_t nrarfcn, uint64_t N_OFFs){ void get_delta_arfcn(int i, uint32_t nrarfcn, uint64_t N_OFFs)
{
uint32_t delta_arfcn = nrarfcn - N_OFFs; uint32_t delta_arfcn = nrarfcn - N_OFFs;
if(delta_arfcn%(nr_bandtable[i].step_size)!=0) if(delta_arfcn % (nr_bandtable[i].step_size) != 0)
AssertFatal(1==0, "nrarfcn %u is not on the channel raster for step size %lu", nrarfcn, nr_bandtable[i].step_size); LOG_E(NR_MAC, "nrarfcn %u is not on the channel raster for step size %lu\n", nrarfcn, nr_bandtable[i].step_size);
} }
uint32_t to_nrarfcn(int nr_bandP, uint32_t to_nrarfcn(int nr_bandP,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment