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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-RAN
Commits
5c45b4e6
Commit
5c45b4e6
authored
Mar 22, 2024
by
Robert Schmidt
Committed by
sagar arora
May 22, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove interface names from F1 and nFAPI (4G+5G)
parent
c46f29fa
Changes
52
Hide whitespace changes
Inline
Side-by-side
Showing
52 changed files
with
165 additions
and
252 deletions
+165
-252
ci-scripts/conf_files/enb.band7.25prb.l2sim.conf
ci-scripts/conf_files/enb.band7.25prb.l2sim.conf
+0
-1
ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
+0
-1
ci-scripts/conf_files/gnb-cu.sa.f1.conf
ci-scripts/conf_files/gnb-cu.sa.f1.conf
+0
-1
ci-scripts/conf_files/gnb-cucp.sa.f1.conf
ci-scripts/conf_files/gnb-cucp.sa.f1.conf
+0
-1
ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf
ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf
+0
-1
ci-scripts/conf_files/gnb-cuup.sa.f1.conf
ci-scripts/conf_files/gnb-cuup.sa.f1.conf
+0
-1
ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf
ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf
+0
-1
ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf
ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf
+0
-1
ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
+0
-1
ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
+0
-1
ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
+0
-1
ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
+0
-1
ci-scripts/conf_files/gnb.sa.band78.106prb.l2sim.conf
ci-scripts/conf_files/gnb.sa.band78.106prb.l2sim.conf
+0
-1
ci-scripts/conf_files/lteue.band7.25prb.l2sim.conf
ci-scripts/conf_files/lteue.band7.25prb.l2sim.conf
+0
-1
ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf
ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf
+0
-1
ci-scripts/conf_files/untested/episci/episci_nr-ue.nfapi.conf
...cripts/conf_files/untested/episci/episci_nr-ue.nfapi.conf
+0
-1
ci-scripts/conf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf
...onf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf
+0
-1
ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf
...s/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf
+0
-1
ci-scripts/conf_files/untested/episci/episci_ue.nfapi.conf
ci-scripts/conf_files/untested/episci/episci_ue.nfapi.conf
+0
-1
ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf
...s/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf
+0
-1
ci-scripts/conf_files/untested/episci/proxy_nr-ue.nfapi.conf
ci-scripts/conf_files/untested/episci/proxy_nr-ue.nfapi.conf
+0
-1
ci-scripts/conf_files/untested/episci/proxy_rcc.band7.tm1.nfapi.conf
...conf_files/untested/episci/proxy_rcc.band7.tm1.nfapi.conf
+0
-1
ci-scripts/conf_files/untested/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf
...es/untested/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf
+0
-1
ci-scripts/conf_files/untested/episci/proxy_ue.nfapi.conf
ci-scripts/conf_files/untested/episci/proxy_ue.nfapi.conf
+0
-1
ci-scripts/conf_files/untested/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
...les/untested/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
+0
-1
ci-scripts/conf_files/untested/rcc.band7.tm1.nfapi.conf
ci-scripts/conf_files/untested/rcc.band7.tm1.nfapi.conf
+0
-1
ci-scripts/yaml_files/5g_l2sim_tdd/README.md
ci-scripts/yaml_files/5g_l2sim_tdd/README.md
+1
-2
doc/F1-design.md
doc/F1-design.md
+1
-3
doc/L2NFAPI_NOS1.md
doc/L2NFAPI_NOS1.md
+0
-2
doc/L2NFAPI_S1.md
doc/L2NFAPI_S1.md
+0
-2
openair2/ENB_APP/L1_paramdef.h
openair2/ENB_APP/L1_paramdef.h
+22
-25
openair2/ENB_APP/MACRLC_paramdef.h
openair2/ENB_APP/MACRLC_paramdef.h
+22
-28
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+0
-2
openair2/ENB_APP/enb_paramdef.h
openair2/ENB_APP/enb_paramdef.h
+31
-38
openair2/GNB_APP/L1_nr_paramdef.h
openair2/GNB_APP/L1_nr_paramdef.h
+17
-20
openair2/GNB_APP/MACRLC_nr_paramdef.h
openair2/GNB_APP/MACRLC_nr_paramdef.h
+31
-39
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+4
-4
openair2/GNB_APP/gnb_paramdef.h
openair2/GNB_APP/gnb_paramdef.h
+36
-43
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+0
-2
openair2/PHY_INTERFACE/phy_stub_UE.c
openair2/PHY_INTERFACE/phy_stub_UE.c
+0
-2
targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf
+0
-1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/du.lte.band7.10MHz.if4p5.conf
...OJECTS/GENERIC-LTE-EPC/CONF/du.lte.band7.10MHz.if4p5.conf
+0
-1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf
...s/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf
+0
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf
...s/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf
+0
-1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf
.../GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf
+0
-1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
...JECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
+0
-1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf
...CTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf
+0
-1
targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
+0
-1
targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
+0
-1
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.aerial.conf
.../GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.aerial.conf
+0
-1
targets/PROJECTS/GENERIC-NR-5GC/CONF/pnf.sa.band78.rfsim.conf
...ets/PROJECTS/GENERIC-NR-5GC/CONF/pnf.sa.band78.rfsim.conf
+0
-1
targets/PROJECTS/GENERIC-NR-5GC/CONF/vnf.sa.band78.106prb.rfsim.conf
...JECTS/GENERIC-NR-5GC/CONF/vnf.sa.band78.106prb.rfsim.conf
+0
-1
No files found.
ci-scripts/conf_files/enb.band7.25prb.l2sim.conf
View file @
5c45b4e6
...
@@ -204,7 +204,6 @@ eNBs =
...
@@ -204,7 +204,6 @@ eNBs =
MACRLCs
= (
MACRLCs
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
local_s_if_name
=
"lo"
;
remote_s_address
=
"127.0.0.1"
;
remote_s_address
=
"127.0.0.1"
;
local_s_address
=
"127.0.0.1"
;
local_s_address
=
"127.0.0.1"
;
local_s_portc
=
50001
;
local_s_portc
=
50001
;
...
...
ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
View file @
5c45b4e6
...
@@ -22,7 +22,6 @@ gNBs =
...
@@ -22,7 +22,6 @@ gNBs =
tr_s_preference
=
"f1"
;
tr_s_preference
=
"f1"
;
local_s_if_name
=
"eth0"
;
local_s_address
=
"192.168.71.150"
;
local_s_address
=
"192.168.71.150"
;
remote_s_address
=
"192.168.71.171"
;
remote_s_address
=
"192.168.71.171"
;
local_s_portc
=
501
;
local_s_portc
=
501
;
...
...
ci-scripts/conf_files/gnb-cu.sa.f1.conf
View file @
5c45b4e6
...
@@ -22,7 +22,6 @@ gNBs =
...
@@ -22,7 +22,6 @@ gNBs =
tr_s_preference
=
"f1"
;
tr_s_preference
=
"f1"
;
local_s_if_name
=
"eth0"
;
local_s_address
=
"192.168.68.194"
;
local_s_address
=
"192.168.68.194"
;
remote_s_address
=
"192.168.68.195"
;
remote_s_address
=
"192.168.68.195"
;
local_s_portc
=
501
;
local_s_portc
=
501
;
...
...
ci-scripts/conf_files/gnb-cucp.sa.f1.conf
View file @
5c45b4e6
...
@@ -23,7 +23,6 @@ gNBs =
...
@@ -23,7 +23,6 @@ gNBs =
tr_s_preference
=
"f1"
;
tr_s_preference
=
"f1"
;
local_s_if_name
=
"lo"
;
local_s_address
=
"192.168.71.150"
;
local_s_address
=
"192.168.71.150"
;
remote_s_address
=
"0.0.0.0"
;
# multiple DUs
remote_s_address
=
"0.0.0.0"
;
# multiple DUs
local_s_portc
=
501
;
local_s_portc
=
501
;
...
...
ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf
View file @
5c45b4e6
...
@@ -23,7 +23,6 @@ gNBs =
...
@@ -23,7 +23,6 @@ gNBs =
tr_s_preference
=
"f1"
;
tr_s_preference
=
"f1"
;
local_s_if_name
=
"eth0"
;
local_s_address
=
"192.168.68.194"
;
local_s_address
=
"192.168.68.194"
;
remote_s_address
=
"192.168.68.195"
;
remote_s_address
=
"192.168.68.195"
;
local_s_portc
=
501
;
local_s_portc
=
501
;
...
...
ci-scripts/conf_files/gnb-cuup.sa.f1.conf
View file @
5c45b4e6
...
@@ -21,7 +21,6 @@ gNBs =
...
@@ -21,7 +21,6 @@ gNBs =
tr_s_preference
=
"f1"
;
tr_s_preference
=
"f1"
;
local_s_if_name
=
"lo"
;
local_s_address
=
"192.168.72.161"
;
local_s_address
=
"192.168.72.161"
;
remote_s_address
=
"192.168.72.171"
;
remote_s_address
=
"192.168.72.171"
;
local_s_portc
=
501
;
local_s_portc
=
501
;
...
...
ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf
View file @
5c45b4e6
...
@@ -21,7 +21,6 @@ gNBs =
...
@@ -21,7 +21,6 @@ gNBs =
tr_s_preference
=
"f1"
;
tr_s_preference
=
"f1"
;
local_s_if_name
=
"lo"
;
local_s_address
=
"192.168.68.196"
;
local_s_address
=
"192.168.68.196"
;
remote_s_address
=
"192.168.68.195"
;
remote_s_address
=
"192.168.68.195"
;
local_s_portc
=
501
;
local_s_portc
=
501
;
...
...
ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf
View file @
5c45b4e6
...
@@ -168,7 +168,6 @@ MACRLCs = (
...
@@ -168,7 +168,6 @@ MACRLCs = (
num_cc
=
1
;
num_cc
=
1
;
tr_s_preference
=
"local_L1"
;
tr_s_preference
=
"local_L1"
;
tr_n_preference
=
"f1"
;
tr_n_preference
=
"f1"
;
local_n_if_name
=
"eth0"
;
local_n_address
=
"192.168.72.142"
;
local_n_address
=
"192.168.72.142"
;
remote_n_address
=
"192.168.72.140"
;
remote_n_address
=
"192.168.72.140"
;
local_n_portc
=
500
;
local_n_portc
=
500
;
...
...
ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
View file @
5c45b4e6
...
@@ -162,7 +162,6 @@ MACRLCs = (
...
@@ -162,7 +162,6 @@ MACRLCs = (
num_cc
=
1
;
num_cc
=
1
;
tr_s_preference
=
"local_L1"
;
tr_s_preference
=
"local_L1"
;
tr_n_preference
=
"f1"
;
tr_n_preference
=
"f1"
;
local_n_if_name
=
"eth0"
;
local_n_address
=
"192.168.68.195"
;
local_n_address
=
"192.168.68.195"
;
remote_n_address
=
"192.168.68.194"
;
remote_n_address
=
"192.168.68.194"
;
local_n_portc
=
500
;
local_n_portc
=
500
;
...
...
ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
View file @
5c45b4e6
...
@@ -168,7 +168,6 @@ MACRLCs = (
...
@@ -168,7 +168,6 @@ MACRLCs = (
num_cc
=
1
;
num_cc
=
1
;
tr_s_preference
=
"local_L1"
;
tr_s_preference
=
"local_L1"
;
tr_n_preference
=
"f1"
;
tr_n_preference
=
"f1"
;
local_n_if_name
=
"eth0"
;
local_n_address
=
"192.168.71.171"
;
local_n_address
=
"192.168.71.171"
;
remote_n_address
=
"192.168.71.150"
;
remote_n_address
=
"192.168.71.150"
;
local_n_portc
=
500
;
local_n_portc
=
500
;
...
...
ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
View file @
5c45b4e6
...
@@ -169,7 +169,6 @@ MACRLCs = (
...
@@ -169,7 +169,6 @@ MACRLCs = (
num_cc
=
1
;
num_cc
=
1
;
tr_s_preference
=
"local_L1"
;
tr_s_preference
=
"local_L1"
;
tr_n_preference
=
"f1"
;
tr_n_preference
=
"f1"
;
local_n_if_name
=
"eth0"
;
local_n_address
=
"192.168.68.195"
;
local_n_address
=
"192.168.68.195"
;
remote_n_address
=
"192.168.68.194"
;
remote_n_address
=
"192.168.68.194"
;
local_n_portc
=
500
;
local_n_portc
=
500
;
...
...
ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
View file @
5c45b4e6
...
@@ -211,7 +211,6 @@ gNBs =
...
@@ -211,7 +211,6 @@ gNBs =
MACRLCs
= (
MACRLCs
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
local_s_if_name
=
"lo:"
;
remote_s_address
=
"127.0.0.1"
; //
pnf
addr
[!]
remote_s_address
=
"127.0.0.1"
; //
pnf
addr
[!]
local_s_address
=
"127.0.0.2"
; //
vnf
addr
local_s_address
=
"127.0.0.2"
; //
vnf
addr
local_s_portc
=
50001
; //
vnf
p5
port
local_s_portc
=
50001
; //
vnf
p5
port
...
...
ci-scripts/conf_files/gnb.sa.band78.106prb.l2sim.conf
View file @
5c45b4e6
...
@@ -179,7 +179,6 @@ gNBs =
...
@@ -179,7 +179,6 @@ gNBs =
MACRLCs
= (
MACRLCs
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
local_s_if_name
=
"lo:"
;
remote_s_address
=
"127.0.0.1"
; //
pnf
addr
[!]
remote_s_address
=
"127.0.0.1"
; //
pnf
addr
[!]
local_s_address
=
"127.0.0.2"
; //
vnf
addr
local_s_address
=
"127.0.0.2"
; //
vnf
addr
local_s_portc
=
50601
; //
vnf
p5
port
local_s_portc
=
50601
; //
vnf
p5
port
...
...
ci-scripts/conf_files/lteue.band7.25prb.l2sim.conf
View file @
5c45b4e6
...
@@ -13,7 +13,6 @@ L1s = (
...
@@ -13,7 +13,6 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"nfapi"
;
tr_n_preference
=
"nfapi"
;
local_n_if_name
=
"eno1"
;
remote_n_address
=
"127.0.0.1"
;
remote_n_address
=
"127.0.0.1"
;
local_n_address
=
"127.0.0.1"
;
local_n_address
=
"127.0.0.1"
;
local_n_portc
=
50000
;
local_n_portc
=
50000
;
...
...
ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf
View file @
5c45b4e6
...
@@ -21,7 +21,6 @@ MACRLCs = (
...
@@ -21,7 +21,6 @@ MACRLCs = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"nfapi"
;
tr_n_preference
=
"nfapi"
;
local_n_if_name
=
"eno1"
;
remote_n_address
=
"127.0.0.1"
; //
Proxy
IP
remote_n_address
=
"127.0.0.1"
; //
Proxy
IP
local_n_address
=
"127.0.0.1"
;
local_n_address
=
"127.0.0.1"
;
local_n_portc
=
50600
;
local_n_portc
=
50600
;
...
...
ci-scripts/conf_files/untested/episci/episci_nr-ue.nfapi.conf
View file @
5c45b4e6
...
@@ -21,7 +21,6 @@ MACRLCs = (
...
@@ -21,7 +21,6 @@ MACRLCs = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"nfapi"
;
tr_n_preference
=
"nfapi"
;
local_n_if_name
=
"ens3"
;
remote_n_address
=
"127.0.0.1"
; //
Proxy
IP
remote_n_address
=
"127.0.0.1"
; //
Proxy
IP
local_n_address
=
"127.0.0.1"
;
local_n_address
=
"127.0.0.1"
;
local_n_portc
=
50600
;
local_n_portc
=
50600
;
...
...
ci-scripts/conf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf
View file @
5c45b4e6
...
@@ -204,7 +204,6 @@ eNBs =
...
@@ -204,7 +204,6 @@ eNBs =
MACRLCs
= (
MACRLCs
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
local_s_if_name
=
"lo"
;
remote_s_address
=
"127.0.0.1"
;
remote_s_address
=
"127.0.0.1"
;
local_s_address
=
"127.0.0.1"
;
local_s_address
=
"127.0.0.1"
;
local_s_portc
=
50001
;
local_s_portc
=
50001
;
...
...
ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf
View file @
5c45b4e6
...
@@ -198,7 +198,6 @@ gNBs =
...
@@ -198,7 +198,6 @@ gNBs =
MACRLCs
= (
MACRLCs
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
local_s_if_name
=
"lo:"
;
remote_s_address
=
"127.0.0.1"
; //
pnf
addr
[!]
remote_s_address
=
"127.0.0.1"
; //
pnf
addr
[!]
local_s_address
=
"127.0.0.2"
; //
vnf
addr
local_s_address
=
"127.0.0.2"
; //
vnf
addr
local_s_portc
=
50601
; //
vnf
p5
port
local_s_portc
=
50601
; //
vnf
p5
port
...
...
ci-scripts/conf_files/untested/episci/episci_ue.nfapi.conf
View file @
5c45b4e6
...
@@ -13,7 +13,6 @@ L1s = (
...
@@ -13,7 +13,6 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"nfapi"
;
tr_n_preference
=
"nfapi"
;
local_n_if_name
=
"ens3"
;
remote_n_address
=
"127.0.0.1"
; //
Proxy
IP
remote_n_address
=
"127.0.0.1"
; //
Proxy
IP
local_n_address
=
"127.0.0.1"
;
local_n_address
=
"127.0.0.1"
;
local_n_portc
=
50000
;
local_n_portc
=
50000
;
...
...
ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf
View file @
5c45b4e6
...
@@ -182,7 +182,6 @@ gNBs =
...
@@ -182,7 +182,6 @@ gNBs =
MACRLCs
= (
MACRLCs
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
local_s_if_name
=
"lo:"
;
remote_s_address
=
"127.0.0.1"
; //
pnf
addr
[!]
remote_s_address
=
"127.0.0.1"
; //
pnf
addr
[!]
local_s_address
=
"127.0.0.2"
; //
vnf
addr
local_s_address
=
"127.0.0.2"
; //
vnf
addr
local_s_portc
=
50601
; //
vnf
p5
port
local_s_portc
=
50601
; //
vnf
p5
port
...
...
ci-scripts/conf_files/untested/episci/proxy_nr-ue.nfapi.conf
View file @
5c45b4e6
...
@@ -21,7 +21,6 @@ MACRLCs = (
...
@@ -21,7 +21,6 @@ MACRLCs = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"nfapi"
;
tr_n_preference
=
"nfapi"
;
local_n_if_name
=
"lo:"
;
remote_n_address
=
"127.0.0.1"
; //
Proxy
IP
remote_n_address
=
"127.0.0.1"
; //
Proxy
IP
local_n_address
=
"127.0.0.1"
;
local_n_address
=
"127.0.0.1"
;
local_n_portc
=
50600
;
local_n_portc
=
50600
;
...
...
ci-scripts/conf_files/untested/episci/proxy_rcc.band7.tm1.nfapi.conf
View file @
5c45b4e6
...
@@ -204,7 +204,6 @@ eNBs =
...
@@ -204,7 +204,6 @@ eNBs =
MACRLCs
= (
MACRLCs
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
local_s_if_name
=
"lo"
;
remote_s_address
=
"127.0.0.1"
;
remote_s_address
=
"127.0.0.1"
;
local_s_address
=
"127.0.0.1"
;
local_s_address
=
"127.0.0.1"
;
local_s_portc
=
50001
;
local_s_portc
=
50001
;
...
...
ci-scripts/conf_files/untested/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf
View file @
5c45b4e6
...
@@ -221,7 +221,6 @@ gNBs =
...
@@ -221,7 +221,6 @@ gNBs =
MACRLCs
= (
MACRLCs
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
local_s_if_name
=
"lo:"
;
remote_s_address
=
"127.0.0.1"
; //
pnf
addr
[!]
remote_s_address
=
"127.0.0.1"
; //
pnf
addr
[!]
local_s_address
=
"127.0.0.2"
; //
vnf
addr
local_s_address
=
"127.0.0.2"
; //
vnf
addr
local_s_portc
=
50601
; //
vnf
p5
port
local_s_portc
=
50601
; //
vnf
p5
port
...
...
ci-scripts/conf_files/untested/episci/proxy_ue.nfapi.conf
View file @
5c45b4e6
...
@@ -13,7 +13,6 @@ L1s = (
...
@@ -13,7 +13,6 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"nfapi"
;
tr_n_preference
=
"nfapi"
;
local_n_if_name
=
"lo"
;
remote_n_address
=
"127.0.0.1"
;
remote_n_address
=
"127.0.0.1"
;
local_n_address
=
"127.0.0.1"
;
local_n_address
=
"127.0.0.1"
;
local_n_portc
=
50000
;
local_n_portc
=
50000
;
...
...
ci-scripts/conf_files/untested/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
View file @
5c45b4e6
...
@@ -179,7 +179,6 @@ gNBs =
...
@@ -179,7 +179,6 @@ gNBs =
MACRLCs
= (
MACRLCs
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
local_s_if_name
=
"lo:"
;
remote_s_address
=
"127.0.0.1"
; //
pnf
addr
[!]
remote_s_address
=
"127.0.0.1"
; //
pnf
addr
[!]
local_s_address
=
"127.0.0.2"
; //
vnf
addr
local_s_address
=
"127.0.0.2"
; //
vnf
addr
local_s_portc
=
50601
; //
vnf
p5
port
local_s_portc
=
50601
; //
vnf
p5
port
...
...
ci-scripts/conf_files/untested/rcc.band7.tm1.nfapi.conf
View file @
5c45b4e6
...
@@ -204,7 +204,6 @@ eNBs =
...
@@ -204,7 +204,6 @@ eNBs =
MACRLCs
= (
MACRLCs
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
local_s_if_name
=
"ens3"
;
remote_s_address
=
"CI_UE_IP_ADDR"
;
remote_s_address
=
"CI_UE_IP_ADDR"
;
local_s_address
=
"CI_ENB_IP_ADDR"
;
local_s_address
=
"CI_ENB_IP_ADDR"
;
local_s_portc
=
50001
;
local_s_portc
=
50001
;
...
...
ci-scripts/yaml_files/5g_l2sim_tdd/README.md
View file @
5c45b4e6
...
@@ -56,7 +56,7 @@ file, in the section `oai-nr-ue0`:
...
@@ -56,7 +56,7 @@ file, in the section `oai-nr-ue0`:
-
../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results
-
../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results
```
```
In this section, you need to set the proper value
s for
`local_n_if_name`
and
`remote_n_address`
In this section, you need to set the proper value
`remote_n_address`
where the UE configuration (mounted to
`/opt/oai-nr-ue/etc/nr-ue.conf`
) reads:
where the UE configuration (mounted to
`/opt/oai-nr-ue/etc/nr-ue.conf`
) reads:
```
libconfig
```
libconfig
...
@@ -64,7 +64,6 @@ MACRLCs = (
...
@@ -64,7 +64,6 @@ MACRLCs = (
{
{
num_cc = 1;
num_cc = 1;
tr_n_preference = "nfapi";
tr_n_preference = "nfapi";
local_n_if_name = "eno1";
remote_n_address = "127.0.0.1"; //Proxy IP
remote_n_address = "127.0.0.1"; //Proxy IP
local_n_address = "127.0.0.1";
local_n_address = "127.0.0.1";
...
...
...
...
doc/F1-design.md
View file @
5c45b4e6
...
@@ -163,9 +163,7 @@ In the DU file:
...
@@ -163,9 +163,7 @@ In the DU file:
to
`127.0.0.3`
. This IP address is used as the CU destination IP address for
to
`127.0.0.3`
. This IP address is used as the CU destination IP address for
F1AP communication.
F1AP communication.
Note: all
`local_*_if_name`
parameters are ignored.
Note: at the DU, you can bind to different interfaces for F1-C and F1-U with
Note 2: at the DU, you can bind to different interfaces for F1-C and F1-U with
the options
`MACRLCs.[0].local_n_address`
and
the options
`MACRLCs.[0].local_n_address`
and
`MACRLCs.[0].local_n_address_f1u`
, respectively. Note that this is not foreseen
`MACRLCs.[0].local_n_address_f1u`
, respectively. Note that this is not foreseen
for the CU; in the case of the CU, please use separate CU-UP and CU-CP.
for the CU; in the case of the CU, please use separate CU-UP and CU-CP.
...
...
doc/L2NFAPI_NOS1.md
View file @
5c45b4e6
...
@@ -131,7 +131,6 @@ First verify the nFAPI interface setup on the physical ethernet interface of mac
...
@@ -131,7 +131,6 @@ First verify the nFAPI interface setup on the physical ethernet interface of mac
MACRLCs = (
MACRLCs = (
{
{
num_cc = 1;
num_cc = 1;
local_s_if_name = "ens3"; // <-- HERE
remote_s_address = "192.168.122.169"; // <-- HERE
remote_s_address = "192.168.122.169"; // <-- HERE
local_s_address = "192.168.122.31"; // <-- HERE
local_s_address = "192.168.122.31"; // <-- HERE
local_s_portc = 50001;
local_s_portc = 50001;
...
@@ -199,7 +198,6 @@ L1s = (
...
@@ -199,7 +198,6 @@ L1s = (
{
{
num_cc = 1;
num_cc = 1;
tr_n_preference = "nfapi";
tr_n_preference = "nfapi";
local_n_if_name = "ens3"; // <- HERE
remote_n_address = "192.168.122.31"; // <- HERE
remote_n_address = "192.168.122.31"; // <- HERE
local_n_address = "192.168.122.169"; // <- HERE
local_n_address = "192.168.122.169"; // <- HERE
local_n_portc = 50000;
local_n_portc = 50000;
...
...
doc/L2NFAPI_S1.md
View file @
5c45b4e6
...
@@ -136,7 +136,6 @@ First verify the nFAPI interface setup on the physical ethernet interface of mac
...
@@ -136,7 +136,6 @@ First verify the nFAPI interface setup on the physical ethernet interface of mac
MACRLCs = (
MACRLCs = (
{
{
num_cc = 1;
num_cc = 1;
local_s_if_name = "ens3"; // <-- HERE
remote_s_address = "192.168.122.169"; // <-- HERE
remote_s_address = "192.168.122.169"; // <-- HERE
local_s_address = "192.168.122.31"; // <-- HERE
local_s_address = "192.168.122.31"; // <-- HERE
local_s_portc = 50001;
local_s_portc = 50001;
...
@@ -204,7 +203,6 @@ L1s = (
...
@@ -204,7 +203,6 @@ L1s = (
{
{
num_cc = 1;
num_cc = 1;
tr_n_preference = "nfapi";
tr_n_preference = "nfapi";
local_n_if_name = "ens3"; // <- HERE
remote_n_address = "192.168.122.31"; // <- HERE
remote_n_address = "192.168.122.31"; // <- HERE
local_n_address = "192.168.122.169"; // <- HERE
local_n_address = "192.168.122.169"; // <- HERE
local_n_portc = 50000;
local_n_portc = 50000;
...
...
openair2/ENB_APP/L1_paramdef.h
View file @
5c45b4e6
...
@@ -38,7 +38,6 @@
...
@@ -38,7 +38,6 @@
/* L1 configuration parameters names */
/* L1 configuration parameters names */
#define CONFIG_STRING_L1_CC "num_cc"
#define CONFIG_STRING_L1_CC "num_cc"
#define CONFIG_STRING_L1_LOCAL_N_IF_NAME "local_n_if_name"
#define CONFIG_STRING_L1_LOCAL_N_ADDRESS "local_n_address"
#define CONFIG_STRING_L1_LOCAL_N_ADDRESS "local_n_address"
#define CONFIG_STRING_L1_REMOTE_N_ADDRESS "remote_n_address"
#define CONFIG_STRING_L1_REMOTE_N_ADDRESS "remote_n_address"
#define CONFIG_STRING_L1_LOCAL_N_PORTC "local_n_portc"
#define CONFIG_STRING_L1_LOCAL_N_PORTC "local_n_portc"
...
@@ -70,7 +69,6 @@
...
@@ -70,7 +69,6 @@
#define L1PARAMS_DESC { \
#define L1PARAMS_DESC { \
{CONFIG_STRING_L1_CC, NULL, 0, .uptr=NULL, .defintval=1, TYPE_UINT, 0}, \
{CONFIG_STRING_L1_CC, NULL, 0, .uptr=NULL, .defintval=1, TYPE_UINT, 0}, \
{CONFIG_STRING_L1_TRANSPORT_N_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_mac", TYPE_STRING, 0}, \
{CONFIG_STRING_L1_TRANSPORT_N_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_mac", TYPE_STRING, 0}, \
{CONFIG_STRING_L1_LOCAL_N_IF_NAME, NULL, 0, .strptr=NULL, .defstrval="lo", TYPE_STRING, 0}, \
{CONFIG_STRING_L1_LOCAL_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \
{CONFIG_STRING_L1_LOCAL_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \
{CONFIG_STRING_L1_REMOTE_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
{CONFIG_STRING_L1_REMOTE_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
{CONFIG_STRING_L1_LOCAL_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50030, TYPE_UINT, 0}, \
{CONFIG_STRING_L1_LOCAL_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50030, TYPE_UINT, 0}, \
...
@@ -98,29 +96,28 @@
...
@@ -98,29 +96,28 @@
#define L1_CC_IDX 0
#define L1_CC_IDX 0
#define L1_TRANSPORT_N_PREFERENCE_IDX 1
#define L1_TRANSPORT_N_PREFERENCE_IDX 1
#define L1_LOCAL_N_IF_NAME_IDX 2
#define L1_LOCAL_N_ADDRESS_IDX 2
#define L1_LOCAL_N_ADDRESS_IDX 3
#define L1_REMOTE_N_ADDRESS_IDX 3
#define L1_REMOTE_N_ADDRESS_IDX 4
#define L1_LOCAL_N_PORTC_IDX 4
#define L1_LOCAL_N_PORTC_IDX 5
#define L1_REMOTE_N_PORTC_IDX 5
#define L1_REMOTE_N_PORTC_IDX 6
#define L1_LOCAL_N_PORTD_IDX 6
#define L1_LOCAL_N_PORTD_IDX 7
#define L1_REMOTE_N_PORTD_IDX 7
#define L1_REMOTE_N_PORTD_IDX 8
#define L1_PRACH_DTX_THRESHOLD_IDX 8
#define L1_PRACH_DTX_THRESHOLD_IDX 9
#define L1_PUCCH1_DTX_THRESHOLD_IDX 9
#define L1_PUCCH1_DTX_THRESHOLD_IDX 10
#define L1_PUCCH1AB_DTX_THRESHOLD_IDX 10
#define L1_PUCCH1AB_DTX_THRESHOLD_IDX 11
#define L1_PRACH_DTX_EMTC0_THRESHOLD_IDX 11
#define L1_PRACH_DTX_EMTC0_THRESHOLD_IDX 12
#define L1_PUCCH1_DTX_EMTC0_THRESHOLD_IDX 12
#define L1_PUCCH1_DTX_EMTC0_THRESHOLD_IDX 13
#define L1_PUCCH1AB_DTX_EMTC0_THRESHOLD_IDX 13
#define L1_PUCCH1AB_DTX_EMTC0_THRESHOLD_IDX 14
#define L1_PRACH_DTX_EMTC1_THRESHOLD_IDX 14
#define L1_PRACH_DTX_EMTC1_THRESHOLD_IDX 15
#define L1_PUCCH1_DTX_EMTC1_THRESHOLD_IDX 15
#define L1_PUCCH1_DTX_EMTC1_THRESHOLD_IDX 16
#define L1_PUCCH1AB_DTX_EMTC1_THRESHOLD_IDX 16
#define L1_PUCCH1AB_DTX_EMTC1_THRESHOLD_IDX 17
#define L1_PRACH_DTX_EMTC2_THRESHOLD_IDX 17
#define L1_PRACH_DTX_EMTC2_THRESHOLD_IDX 18
#define L1_PUCCH1_DTX_EMTC2_THRESHOLD_IDX 18
#define L1_PUCCH1_DTX_EMTC2_THRESHOLD_IDX 19
#define L1_PUCCH1AB_DTX_EMTC2_THRESHOLD_IDX 19
#define L1_PUCCH1AB_DTX_EMTC2_THRESHOLD_IDX 20
#define L1_PRACH_DTX_EMTC3_THRESHOLD_IDX 20
#define L1_PRACH_DTX_EMTC3_THRESHOLD_IDX 21
#define L1_PUCCH1_DTX_EMTC3_THRESHOLD_IDX 21
#define L1_PUCCH1_DTX_EMTC3_THRESHOLD_IDX 22
#define L1_PUCCH1AB_DTX_EMTC3_THRESHOLD_IDX 22
#define L1_PUCCH1AB_DTX_EMTC3_THRESHOLD_IDX 23
#define L1_PUSCH_SIGNAL_THRESHOLD_IDX 23
#define L1_PUSCH_SIGNAL_THRESHOLD_IDX 24
/*----------------------------------------------------------------------------------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------------------------------------------------------------------------------*/
#endif
#endif
openair2/ENB_APP/MACRLC_paramdef.h
View file @
5c45b4e6
...
@@ -39,7 +39,6 @@
...
@@ -39,7 +39,6 @@
/* MACRLC configuration parameters names */
/* MACRLC configuration parameters names */
#define CONFIG_STRING_MACRLC_CC "num_cc"
#define CONFIG_STRING_MACRLC_CC "num_cc"
#define CONFIG_STRING_MACRLC_TRANSPORT_N_PREFERENCE "tr_n_preference"
#define CONFIG_STRING_MACRLC_TRANSPORT_N_PREFERENCE "tr_n_preference"
#define CONFIG_STRING_MACRLC_LOCAL_N_IF_NAME "local_n_if_name"
#define CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS "local_n_address"
#define CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS "local_n_address"
#define CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS "remote_n_address"
#define CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS "remote_n_address"
#define CONFIG_STRING_MACRLC_LOCAL_N_PORTC "local_n_portc"
#define CONFIG_STRING_MACRLC_LOCAL_N_PORTC "local_n_portc"
...
@@ -47,7 +46,6 @@
...
@@ -47,7 +46,6 @@
#define CONFIG_STRING_MACRLC_LOCAL_N_PORTD "local_n_portd"
#define CONFIG_STRING_MACRLC_LOCAL_N_PORTD "local_n_portd"
#define CONFIG_STRING_MACRLC_REMOTE_N_PORTD "remote_n_portd"
#define CONFIG_STRING_MACRLC_REMOTE_N_PORTD "remote_n_portd"
#define CONFIG_STRING_MACRLC_TRANSPORT_S_PREFERENCE "tr_s_preference"
#define CONFIG_STRING_MACRLC_TRANSPORT_S_PREFERENCE "tr_s_preference"
#define CONFIG_STRING_MACRLC_LOCAL_S_IF_NAME "local_s_if_name"
#define CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS "local_s_address"
#define CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS "local_s_address"
#define CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS "remote_s_address"
#define CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS "remote_s_address"
#define CONFIG_STRING_MACRLC_LOCAL_S_PORTC "local_s_portc"
#define CONFIG_STRING_MACRLC_LOCAL_S_PORTC "local_s_portc"
...
@@ -71,7 +69,6 @@
...
@@ -71,7 +69,6 @@
#define MACRLCPARAMS_DESC { \
#define MACRLCPARAMS_DESC { \
{CONFIG_STRING_MACRLC_CC, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_CC, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_TRANSPORT_N_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_L1", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_TRANSPORT_N_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_L1", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_N_IF_NAME, NULL, 0, .strptr=NULL, .defstrval="lo", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50010, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50010, TYPE_UINT, 0}, \
...
@@ -79,7 +76,6 @@
...
@@ -79,7 +76,6 @@
{CONFIG_STRING_MACRLC_LOCAL_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_REMOTE_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_REMOTE_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_TRANSPORT_S_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_RRC", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_TRANSPORT_S_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_RRC", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_S_IF_NAME, NULL, 0, .strptr=NULL, .defstrval="lo", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_S_PORTC, NULL, 0, .uptr=NULL, .defintval=50020, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_S_PORTC, NULL, 0, .uptr=NULL, .defintval=50020, TYPE_UINT, 0}, \
...
@@ -100,30 +96,28 @@
...
@@ -100,30 +96,28 @@
#define MACRLC_CC_IDX 0
#define MACRLC_CC_IDX 0
#define MACRLC_TRANSPORT_N_PREFERENCE_IDX 1
#define MACRLC_TRANSPORT_N_PREFERENCE_IDX 1
#define MACRLC_LOCAL_N_IF_NAME_IDX 2
#define MACRLC_LOCAL_N_ADDRESS_IDX 2
#define MACRLC_LOCAL_N_ADDRESS_IDX 3
#define MACRLC_REMOTE_N_ADDRESS_IDX 3
#define MACRLC_REMOTE_N_ADDRESS_IDX 4
#define MACRLC_LOCAL_N_PORTC_IDX 4
#define MACRLC_LOCAL_N_PORTC_IDX 5
#define MACRLC_REMOTE_N_PORTC_IDX 5
#define MACRLC_REMOTE_N_PORTC_IDX 6
#define MACRLC_LOCAL_N_PORTD_IDX 6
#define MACRLC_LOCAL_N_PORTD_IDX 7
#define MACRLC_REMOTE_N_PORTD_IDX 7
#define MACRLC_REMOTE_N_PORTD_IDX 8
#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 8
#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 9
#define MACRLC_LOCAL_S_ADDRESS_IDX 9
#define MACRLC_LOCAL_S_IF_NAME_IDX 10
#define MACRLC_REMOTE_S_ADDRESS_IDX 10
#define MACRLC_LOCAL_S_ADDRESS_IDX 11
#define MACRLC_LOCAL_S_PORTC_IDX 11
#define MACRLC_REMOTE_S_ADDRESS_IDX 12
#define MACRLC_REMOTE_S_PORTC_IDX 12
#define MACRLC_LOCAL_S_PORTC_IDX 13
#define MACRLC_LOCAL_S_PORTD_IDX 13
#define MACRLC_REMOTE_S_PORTC_IDX 14
#define MACRLC_REMOTE_S_PORTD_IDX 14
#define MACRLC_LOCAL_S_PORTD_IDX 15
#define MACRLC_SCHED_MODE_IDX 15
#define MACRLC_REMOTE_S_PORTD_IDX 16
#define MACRLC_PUSCH10xSNR_IDX 16
#define MACRLC_SCHED_MODE_IDX 17
#define MACRLC_PUCCH10xSNR_IDX 17
#define MACRLC_PUSCH10xSNR_IDX 18
#define MACRLC_DEFAULT_SCHED_DL_ALGO_IDX 18
#define MACRLC_PUCCH10xSNR_IDX 19
#define MACRLC_UE_MULTIPLE_MAX_IDX 19
#define MACRLC_DEFAULT_SCHED_DL_ALGO_IDX 20
#define MACRLC_USE_MCS_OFFSET_IDX 20
#define MACRLC_UE_MULTIPLE_MAX_IDX 21
#define MACRLC_BLER_TARGET_LOWER_IDX 21
#define MACRLC_USE_MCS_OFFSET_IDX 22
#define MACRLC_BLER_TARGET_UPPER_IDX 22
#define MACRLC_BLER_TARGET_LOWER_IDX 23
#define MACRLC_MAX_UL_RB_INDEX_IDX 23
#define MACRLC_BLER_TARGET_UPPER_IDX 24
#define MACRLC_MAX_UL_RB_INDEX_IDX 25
/*---------------------------------------------------------------------------------------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------------------------------------------------------------------------------------*/
#endif
#endif
openair2/ENB_APP/enb_config.c
View file @
5c45b4e6
...
@@ -101,7 +101,6 @@ void RCconfig_L1(void) {
...
@@ -101,7 +101,6 @@ void RCconfig_L1(void) {
if
(
strcmp
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"local_mac"
)
==
0
)
{
if
(
strcmp
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"local_mac"
)
==
0
)
{
}
else
if
(
strcmp
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"nfapi"
)
==
0
)
{
}
else
if
(
strcmp
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"nfapi"
)
==
0
)
{
RC
.
eNB
[
j
][
0
]
->
eth_params_n
.
local_if_name
=
strdup
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_LOCAL_N_IF_NAME_IDX
].
strptr
));
RC
.
eNB
[
j
][
0
]
->
eth_params_n
.
my_addr
=
strdup
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_LOCAL_N_ADDRESS_IDX
].
strptr
));
RC
.
eNB
[
j
][
0
]
->
eth_params_n
.
my_addr
=
strdup
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_LOCAL_N_ADDRESS_IDX
].
strptr
));
RC
.
eNB
[
j
][
0
]
->
eth_params_n
.
remote_addr
=
strdup
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_REMOTE_N_ADDRESS_IDX
].
strptr
));
RC
.
eNB
[
j
][
0
]
->
eth_params_n
.
remote_addr
=
strdup
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_REMOTE_N_ADDRESS_IDX
].
strptr
));
RC
.
eNB
[
j
][
0
]
->
eth_params_n
.
my_portc
=
*
(
L1_ParamList
.
paramarray
[
j
][
L1_LOCAL_N_PORTC_IDX
].
iptr
);
RC
.
eNB
[
j
][
0
]
->
eth_params_n
.
my_portc
=
*
(
L1_ParamList
.
paramarray
[
j
][
L1_LOCAL_N_PORTC_IDX
].
iptr
);
...
@@ -206,7 +205,6 @@ void RCconfig_macrlc(void)
...
@@ -206,7 +205,6 @@ void RCconfig_macrlc(void)
if
(
strcmp
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_S_PREFERENCE_IDX
].
strptr
),
"local_L1"
)
==
0
)
{
if
(
strcmp
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_S_PREFERENCE_IDX
].
strptr
),
"local_L1"
)
==
0
)
{
}
else
if
(
strcmp
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_S_PREFERENCE_IDX
].
strptr
),
"nfapi"
)
==
0
)
{
}
else
if
(
strcmp
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_S_PREFERENCE_IDX
].
strptr
),
"nfapi"
)
==
0
)
{
RC
.
mac
[
j
]
->
eth_params_s
.
local_if_name
=
strdup
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_S_IF_NAME_IDX
].
strptr
));
RC
.
mac
[
j
]
->
eth_params_s
.
my_addr
=
strdup
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_S_ADDRESS_IDX
].
strptr
));
RC
.
mac
[
j
]
->
eth_params_s
.
my_addr
=
strdup
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_S_ADDRESS_IDX
].
strptr
));
RC
.
mac
[
j
]
->
eth_params_s
.
remote_addr
=
strdup
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_REMOTE_S_ADDRESS_IDX
].
strptr
));
RC
.
mac
[
j
]
->
eth_params_s
.
remote_addr
=
strdup
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_REMOTE_S_ADDRESS_IDX
].
strptr
));
RC
.
mac
[
j
]
->
eth_params_s
.
my_portc
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_S_PORTC_IDX
].
iptr
);
RC
.
mac
[
j
]
->
eth_params_s
.
my_portc
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_S_PORTC_IDX
].
iptr
);
...
...
openair2/ENB_APP/enb_paramdef.h
View file @
5c45b4e6
...
@@ -262,7 +262,6 @@ typedef enum {
...
@@ -262,7 +262,6 @@ typedef enum {
#define ENB_CONFIG_STRING_MOBILE_COUNTRY_CODE_OLD "mobile_country_code"
#define ENB_CONFIG_STRING_MOBILE_COUNTRY_CODE_OLD "mobile_country_code"
#define ENB_CONFIG_STRING_MOBILE_NETWORK_CODE_OLD "mobile_network_code"
#define ENB_CONFIG_STRING_MOBILE_NETWORK_CODE_OLD "mobile_network_code"
#define ENB_CONFIG_STRING_TRANSPORT_S_PREFERENCE "tr_s_preference"
#define ENB_CONFIG_STRING_TRANSPORT_S_PREFERENCE "tr_s_preference"
#define ENB_CONFIG_STRING_LOCAL_S_IF_NAME "local_s_if_name"
#define ENB_CONFIG_STRING_LOCAL_S_ADDRESS "local_s_address"
#define ENB_CONFIG_STRING_LOCAL_S_ADDRESS "local_s_address"
#define ENB_CONFIG_STRING_REMOTE_S_ADDRESS "remote_s_address"
#define ENB_CONFIG_STRING_REMOTE_S_ADDRESS "remote_s_address"
#define ENB_CONFIG_STRING_LOCAL_S_PORTC "local_s_portc"
#define ENB_CONFIG_STRING_LOCAL_S_PORTC "local_s_portc"
...
@@ -293,7 +292,6 @@ typedef enum {
...
@@ -293,7 +292,6 @@ typedef enum {
{ENB_CONFIG_STRING_MOBILE_COUNTRY_CODE_OLD, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_MOBILE_COUNTRY_CODE_OLD, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_MOBILE_NETWORK_CODE_OLD, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_MOBILE_NETWORK_CODE_OLD, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_TRANSPORT_S_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_mac", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_TRANSPORT_S_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_mac", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_LOCAL_S_IF_NAME, NULL, 0, .strptr=NULL, .defstrval="lo", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_LOCAL_S_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_LOCAL_S_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_REMOTE_S_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_REMOTE_S_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_LOCAL_S_PORTC, NULL, 0, .uptr=NULL, .defuintval=50000, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_LOCAL_S_PORTC, NULL, 0, .uptr=NULL, .defuintval=50000, TYPE_UINT, 0}, \
...
@@ -321,24 +319,23 @@ typedef enum {
...
@@ -321,24 +319,23 @@ typedef enum {
#define ENB_MOBILE_COUNTRY_CODE_IDX_OLD 4
#define ENB_MOBILE_COUNTRY_CODE_IDX_OLD 4
#define ENB_MOBILE_NETWORK_CODE_IDX_OLD 5
#define ENB_MOBILE_NETWORK_CODE_IDX_OLD 5
#define ENB_TRANSPORT_S_PREFERENCE_IDX 6
#define ENB_TRANSPORT_S_PREFERENCE_IDX 6
#define ENB_LOCAL_S_IF_NAME_IDX 7
#define ENB_LOCAL_S_ADDRESS_IDX 7
#define ENB_LOCAL_S_ADDRESS_IDX 8
#define ENB_REMOTE_S_ADDRESS_IDX 8
#define ENB_REMOTE_S_ADDRESS_IDX 9
#define ENB_LOCAL_S_PORTC_IDX 9
#define ENB_LOCAL_S_PORTC_IDX 10
#define ENB_REMOTE_S_PORTC_IDX 10
#define ENB_REMOTE_S_PORTC_IDX 11
#define ENB_LOCAL_S_PORTD_IDX 11
#define ENB_LOCAL_S_PORTD_IDX 12
#define ENB_REMOTE_S_PORTD_IDX 12
#define ENB_REMOTE_S_PORTD_IDX 13
#define ENB_NRCELLID_IDX 13
#define ENB_NRCELLID_IDX 14
#define ENB_RRC_INACTIVITY_THRES_IDX 14
#define ENB_RRC_INACTIVITY_THRES_IDX 15
#define ENB_ENABLE_MEASUREMENT_REPORTS 15
#define ENB_ENABLE_MEASUREMENT_REPORTS 16
#define ENB_ENABLE_X2 16
#define ENB_ENABLE_X2 17
#define ENB_ENABLE_ENB_M2 17
#define ENB_ENABLE_ENB_M2 18
#define ENB_ENABLE_MCE_M2 18
#define ENB_ENABLE_MCE_M2 19
#define ENB_S1SETUP_RSP_TIMER_IDX 19
#define ENB_S1SETUP_RSP_TIMER_IDX 20
#define ENB_S1SETUP_REQ_TIMER_IDX 20
#define ENB_S1SETUP_REQ_TIMER_IDX 21
#define ENB_S1SETUP_REQ_COUNT_IDX 21
#define ENB_S1SETUP_REQ_COUNT_IDX 22
#define ENB_SCTP_REQ_TIMER_IDX 22
#define ENB_SCTP_REQ_TIMER_IDX 23
#define ENB_SCTP_REQ_COUNT_IDX 23
#define ENB_SCTP_REQ_COUNT_IDX 24
#define TRACKING_AREA_CODE_OKRANGE {0x0001,0xFFFD}
#define TRACKING_AREA_CODE_OKRANGE {0x0001,0xFFFD}
// clang-format off
// clang-format off
...
@@ -1192,7 +1189,6 @@ typedef struct srb1_params_s {
...
@@ -1192,7 +1189,6 @@ typedef struct srb1_params_s {
/* MACRLC configuration parameters names */
/* MACRLC configuration parameters names */
#define CONFIG_STRING_MACRLC_CC "num_cc"
#define CONFIG_STRING_MACRLC_CC "num_cc"
#define CONFIG_STRING_MACRLC_TRANSPORT_N_PREFERENCE "tr_n_preference"
#define CONFIG_STRING_MACRLC_TRANSPORT_N_PREFERENCE "tr_n_preference"
#define CONFIG_STRING_MACRLC_LOCAL_N_IF_NAME "local_n_if_name"
#define CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS "local_n_address"
#define CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS "local_n_address"
#define CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS "remote_n_address"
#define CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS "remote_n_address"
#define CONFIG_STRING_MACRLC_LOCAL_N_PORTC "local_n_portc"
#define CONFIG_STRING_MACRLC_LOCAL_N_PORTC "local_n_portc"
...
@@ -1200,7 +1196,6 @@ typedef struct srb1_params_s {
...
@@ -1200,7 +1196,6 @@ typedef struct srb1_params_s {
#define CONFIG_STRING_MACRLC_LOCAL_N_PORTD "local_n_portd"
#define CONFIG_STRING_MACRLC_LOCAL_N_PORTD "local_n_portd"
#define CONFIG_STRING_MACRLC_REMOTE_N_PORTD "remote_n_portd"
#define CONFIG_STRING_MACRLC_REMOTE_N_PORTD "remote_n_portd"
#define CONFIG_STRING_MACRLC_TRANSPORT_S_PREFERENCE "tr_s_preference"
#define CONFIG_STRING_MACRLC_TRANSPORT_S_PREFERENCE "tr_s_preference"
#define CONFIG_STRING_MACRLC_LOCAL_S_IF_NAME "local_s_if_name"
#define CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS "local_s_address"
#define CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS "local_s_address"
#define CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS "remote_s_address"
#define CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS "remote_s_address"
#define CONFIG_STRING_MACRLC_LOCAL_S_PORTC "local_s_portc"
#define CONFIG_STRING_MACRLC_LOCAL_S_PORTC "local_s_portc"
...
@@ -1211,22 +1206,20 @@ typedef struct srb1_params_s {
...
@@ -1211,22 +1206,20 @@ typedef struct srb1_params_s {
#define MACRLC_CC_IDX 0
#define MACRLC_CC_IDX 0
#define MACRLC_TRANSPORT_N_PREFERENCE_IDX 1
#define MACRLC_TRANSPORT_N_PREFERENCE_IDX 1
#define MACRLC_LOCAL_N_IF_NAME_IDX 2
#define MACRLC_LOCAL_N_ADDRESS_IDX 2
#define MACRLC_LOCAL_N_ADDRESS_IDX 3
#define MACRLC_REMOTE_N_ADDRESS_IDX 3
#define MACRLC_REMOTE_N_ADDRESS_IDX 4
#define MACRLC_LOCAL_N_PORTC_IDX 4
#define MACRLC_LOCAL_N_PORTC_IDX 5
#define MACRLC_REMOTE_N_PORTC_IDX 5
#define MACRLC_REMOTE_N_PORTC_IDX 6
#define MACRLC_LOCAL_N_PORTD_IDX 6
#define MACRLC_LOCAL_N_PORTD_IDX 7
#define MACRLC_REMOTE_N_PORTD_IDX 7
#define MACRLC_REMOTE_N_PORTD_IDX 8
#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 8
#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 9
#define MACRLC_LOCAL_S_ADDRESS_IDX 9
#define MACRLC_LOCAL_S_IF_NAME_IDX 10
#define MACRLC_REMOTE_S_ADDRESS_IDX 10
#define MACRLC_LOCAL_S_ADDRESS_IDX 11
#define MACRLC_LOCAL_S_PORTC_IDX 11
#define MACRLC_REMOTE_S_ADDRESS_IDX 12
#define MACRLC_REMOTE_S_PORTC_IDX 12
#define MACRLC_LOCAL_S_PORTC_IDX 13
#define MACRLC_LOCAL_S_PORTD_IDX 13
#define MACRLC_REMOTE_S_PORTC_IDX 14
#define MACRLC_REMOTE_S_PORTD_IDX 14
#define MACRLC_LOCAL_S_PORTD_IDX 15
#define MACRLC_SCHED_MODE_IDX 15
#define MACRLC_REMOTE_S_PORTD_IDX 16
#define MACRLC_SCHED_MODE_IDX 17
/*---------------------------------------------------------------------------------------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------------------------------------------------------------------------------------*/
/* thread configuration parameters section name */
/* thread configuration parameters section name */
...
...
openair2/GNB_APP/L1_nr_paramdef.h
View file @
5c45b4e6
...
@@ -38,7 +38,6 @@
...
@@ -38,7 +38,6 @@
/* L1 configuration parameters names */
/* L1 configuration parameters names */
#define CONFIG_STRING_L1_CC "num_cc"
#define CONFIG_STRING_L1_CC "num_cc"
#define CONFIG_STRING_L1_LOCAL_N_IF_NAME "local_n_if_name"
#define CONFIG_STRING_L1_LOCAL_N_ADDRESS "local_n_address"
#define CONFIG_STRING_L1_LOCAL_N_ADDRESS "local_n_address"
#define CONFIG_STRING_L1_REMOTE_N_ADDRESS "remote_n_address"
#define CONFIG_STRING_L1_REMOTE_N_ADDRESS "remote_n_address"
#define CONFIG_STRING_L1_LOCAL_N_PORTC "local_n_portc"
#define CONFIG_STRING_L1_LOCAL_N_PORTC "local_n_portc"
...
@@ -68,7 +67,6 @@
...
@@ -68,7 +67,6 @@
#define L1PARAMS_DESC { \
#define L1PARAMS_DESC { \
{CONFIG_STRING_L1_CC, NULL, 0, .uptr=NULL, .defintval=1, TYPE_UINT, 0}, \
{CONFIG_STRING_L1_CC, NULL, 0, .uptr=NULL, .defintval=1, TYPE_UINT, 0}, \
{CONFIG_STRING_L1_TRANSPORT_N_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_mac", TYPE_STRING, 0}, \
{CONFIG_STRING_L1_TRANSPORT_N_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_mac", TYPE_STRING, 0}, \
{CONFIG_STRING_L1_LOCAL_N_IF_NAME, NULL, 0, .strptr=NULL, .defstrval="lo", TYPE_STRING, 0}, \
{CONFIG_STRING_L1_LOCAL_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \
{CONFIG_STRING_L1_LOCAL_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \
{CONFIG_STRING_L1_REMOTE_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
{CONFIG_STRING_L1_REMOTE_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
{CONFIG_STRING_L1_LOCAL_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50030, TYPE_UINT, 0}, \
{CONFIG_STRING_L1_LOCAL_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50030, TYPE_UINT, 0}, \
...
@@ -90,24 +88,23 @@
...
@@ -90,24 +88,23 @@
// clang-format on
// clang-format on
#define L1_CC_IDX 0
#define L1_CC_IDX 0
#define L1_TRANSPORT_N_PREFERENCE_IDX 1
#define L1_TRANSPORT_N_PREFERENCE_IDX 1
#define L1_LOCAL_N_IF_NAME_IDX 2
#define L1_LOCAL_N_ADDRESS_IDX 2
#define L1_LOCAL_N_ADDRESS_IDX 3
#define L1_REMOTE_N_ADDRESS_IDX 3
#define L1_REMOTE_N_ADDRESS_IDX 4
#define L1_LOCAL_N_PORTC_IDX 4
#define L1_LOCAL_N_PORTC_IDX 5
#define L1_REMOTE_N_PORTC_IDX 5
#define L1_REMOTE_N_PORTC_IDX 6
#define L1_LOCAL_N_PORTD_IDX 6
#define L1_LOCAL_N_PORTD_IDX 7
#define L1_REMOTE_N_PORTD_IDX 7
#define L1_REMOTE_N_PORTD_IDX 8
#define L1_THREAD_POOL_SIZE 8
#define L1_THREAD_POOL_SIZE 9
#define L1_OFDM_OFFSET_DIVISOR 9
#define L1_OFDM_OFFSET_DIVISOR 10
#define L1_PUCCH0_DTX_THRESHOLD 10
#define L1_PUCCH0_DTX_THRESHOLD 11
#define L1_PRACH_DTX_THRESHOLD 11
#define L1_PRACH_DTX_THRESHOLD 12
#define L1_PUSCH_DTX_THRESHOLD 12
#define L1_PUSCH_DTX_THRESHOLD 13
#define L1_SRS_DTX_THRESHOLD 13
#define L1_SRS_DTX_THRESHOLD 14
#define L1_MAX_LDPC_ITERATIONS 14
#define L1_MAX_LDPC_ITERATIONS 15
#define L1_RX_THREAD_CORE 15
#define L1_RX_THREAD_CORE 16
#define L1_TX_THREAD_CORE 16
#define L1_TX_THREAD_CORE 17
#define L1_TX_AMP_BACKOFF_dB 17
#define L1_TX_AMP_BACKOFF_dB 18
#define L1_PHASE_COMP 18
#define L1_PHASE_COMP 19
/*----------------------------------------------------------------------------------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------------------------------------------------------------------------------*/
#endif
#endif
openair2/GNB_APP/MACRLC_nr_paramdef.h
View file @
5c45b4e6
...
@@ -39,7 +39,6 @@
...
@@ -39,7 +39,6 @@
/* MACRLC configuration parameters names */
/* MACRLC configuration parameters names */
#define CONFIG_STRING_MACRLC_CC "num_cc"
#define CONFIG_STRING_MACRLC_CC "num_cc"
#define CONFIG_STRING_MACRLC_TRANSPORT_N_PREFERENCE "tr_n_preference"
#define CONFIG_STRING_MACRLC_TRANSPORT_N_PREFERENCE "tr_n_preference"
#define CONFIG_STRING_MACRLC_LOCAL_N_IF_NAME "local_n_if_name"
#define CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS "local_n_address"
#define CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS "local_n_address"
#define CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS_F1U "local_n_address_f1u"
#define CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS_F1U "local_n_address_f1u"
#define CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS "remote_n_address"
#define CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS "remote_n_address"
...
@@ -48,7 +47,6 @@
...
@@ -48,7 +47,6 @@
#define CONFIG_STRING_MACRLC_LOCAL_N_PORTD "local_n_portd"
#define CONFIG_STRING_MACRLC_LOCAL_N_PORTD "local_n_portd"
#define CONFIG_STRING_MACRLC_REMOTE_N_PORTD "remote_n_portd"
#define CONFIG_STRING_MACRLC_REMOTE_N_PORTD "remote_n_portd"
#define CONFIG_STRING_MACRLC_TRANSPORT_S_PREFERENCE "tr_s_preference"
#define CONFIG_STRING_MACRLC_TRANSPORT_S_PREFERENCE "tr_s_preference"
#define CONFIG_STRING_MACRLC_LOCAL_S_IF_NAME "local_s_if_name"
#define CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS "local_s_address"
#define CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS "local_s_address"
#define CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS "remote_s_address"
#define CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS "remote_s_address"
#define CONFIG_STRING_MACRLC_LOCAL_S_PORTC "local_s_portc"
#define CONFIG_STRING_MACRLC_LOCAL_S_PORTC "local_s_portc"
...
@@ -94,7 +92,6 @@
...
@@ -94,7 +92,6 @@
#define MACRLCPARAMS_DESC { \
#define MACRLCPARAMS_DESC { \
{CONFIG_STRING_MACRLC_CC, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_CC, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_TRANSPORT_N_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_L1", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_TRANSPORT_N_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_L1", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_N_IF_NAME, NULL, 0, .strptr=NULL, .defstrval="lo", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50010, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50010, TYPE_UINT, 0}, \
...
@@ -102,7 +99,6 @@
...
@@ -102,7 +99,6 @@
{CONFIG_STRING_MACRLC_LOCAL_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_REMOTE_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_REMOTE_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_TRANSPORT_S_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_RRC", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_TRANSPORT_S_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_RRC", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_S_IF_NAME, NULL, 0, .strptr=NULL, .defstrval="lo", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_S_PORTC, NULL, 0, .uptr=NULL, .defintval=50020, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_LOCAL_S_PORTC, NULL, 0, .uptr=NULL, .defintval=50020, TYPE_UINT, 0}, \
...
@@ -132,39 +128,37 @@
...
@@ -132,39 +128,37 @@
#define MACRLC_CC_IDX 0
#define MACRLC_CC_IDX 0
#define MACRLC_TRANSPORT_N_PREFERENCE_IDX 1
#define MACRLC_TRANSPORT_N_PREFERENCE_IDX 1
#define MACRLC_LOCAL_N_IF_NAME_IDX 2
#define MACRLC_LOCAL_N_ADDRESS_IDX 2
#define MACRLC_LOCAL_N_ADDRESS_IDX 3
#define MACRLC_REMOTE_N_ADDRESS_IDX 3
#define MACRLC_REMOTE_N_ADDRESS_IDX 4
#define MACRLC_LOCAL_N_PORTC_IDX 4
#define MACRLC_LOCAL_N_PORTC_IDX 5
#define MACRLC_REMOTE_N_PORTC_IDX 5
#define MACRLC_REMOTE_N_PORTC_IDX 6
#define MACRLC_LOCAL_N_PORTD_IDX 6
#define MACRLC_LOCAL_N_PORTD_IDX 7
#define MACRLC_REMOTE_N_PORTD_IDX 7
#define MACRLC_REMOTE_N_PORTD_IDX 8
#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 8
#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 9
#define MACRLC_LOCAL_S_ADDRESS_IDX 9
#define MACRLC_LOCAL_S_IF_NAME_IDX 10
#define MACRLC_REMOTE_S_ADDRESS_IDX 10
#define MACRLC_LOCAL_S_ADDRESS_IDX 11
#define MACRLC_LOCAL_S_PORTC_IDX 11
#define MACRLC_REMOTE_S_ADDRESS_IDX 12
#define MACRLC_REMOTE_S_PORTC_IDX 12
#define MACRLC_LOCAL_S_PORTC_IDX 13
#define MACRLC_LOCAL_S_PORTD_IDX 13
#define MACRLC_REMOTE_S_PORTC_IDX 14
#define MACRLC_REMOTE_S_PORTD_IDX 14
#define MACRLC_LOCAL_S_PORTD_IDX 15
#define MACRLC_ULSCH_MAX_FRAME_INACTIVITY 15
#define MACRLC_REMOTE_S_PORTD_IDX 16
#define MACRLC_PUSCHTARGETSNRX10_IDX 16
#define MACRLC_ULSCH_MAX_FRAME_INACTIVITY 17
#define MACRLC_PUCCHTARGETSNRX10_IDX 17
#define MACRLC_PUSCHTARGETSNRX10_IDX 18
#define MACRLC_UL_PRBBLACK_SNR_THRESHOLD_IDX 18
#define MACRLC_PUCCHTARGETSNRX10_IDX 19
#define MACRLC_PUCCHFAILURETHRES_IDX 19
#define MACRLC_UL_PRBBLACK_SNR_THRESHOLD_IDX 20
#define MACRLC_PUSCHFAILURETHRES_IDX 20
#define MACRLC_PUCCHFAILURETHRES_IDX 21
#define MACRLC_DL_BLER_TARGET_UPPER_IDX 21
#define MACRLC_PUSCHFAILURETHRES_IDX 22
#define MACRLC_DL_BLER_TARGET_LOWER_IDX 22
#define MACRLC_DL_BLER_TARGET_UPPER_IDX 23
#define MACRLC_DL_MAX_MCS_IDX 23
#define MACRLC_DL_BLER_TARGET_LOWER_IDX 24
#define MACRLC_UL_BLER_TARGET_UPPER_IDX 24
#define MACRLC_DL_MAX_MCS_IDX 25
#define MACRLC_UL_BLER_TARGET_LOWER_IDX 25
#define MACRLC_UL_BLER_TARGET_UPPER_IDX 26
#define MACRLC_UL_MAX_MCS_IDX 26
#define MACRLC_UL_BLER_TARGET_LOWER_IDX 27
#define MACRLC_DL_HARQ_ROUND_MAX_IDX 27
#define MACRLC_UL_MAX_MCS_IDX 28
#define MACRLC_UL_HARQ_ROUND_MAX_IDX 28
#define MACRLC_DL_HARQ_ROUND_MAX_IDX 29
#define MACRLC_MIN_GRANT_PRB_IDX 29
#define MACRLC_UL_HARQ_ROUND_MAX_IDX 30
#define MACRLC_MIN_GRANT_MCS_IDX 30
#define MACRLC_MIN_GRANT_PRB_IDX 31
#define MACRLC_IDENTITY_PM_IDX 31
#define MACRLC_MIN_GRANT_MCS_IDX 32
#define MACRLC_LOCAL_N_ADDRESS_F1U_IDX 32
#define MACRLC_IDENTITY_PM_IDX 33
#define MACRLC_LOCAL_N_ADDRESS_F1U_IDX 34
#define MACRLCPARAMS_CHECK { \
#define MACRLCPARAMS_CHECK { \
{ .s5 = { NULL } }, \
{ .s5 = { NULL } }, \
...
@@ -194,8 +188,6 @@
...
@@ -194,8 +188,6 @@
{ .s5 = { NULL } }, \
{ .s5 = { NULL } }, \
{ .s5 = { NULL } }, \
{ .s5 = { NULL } }, \
{ .s5 = { NULL } }, \
{ .s5 = { NULL } }, \
{ .s5 = { NULL } }, \
{ .s5 = { NULL } }, \
{ .s2 = { config_check_intrange, {1, 8} } },
/* DL max HARQ rounds */
\
{ .s2 = { config_check_intrange, {1, 8} } },
/* DL max HARQ rounds */
\
{ .s2 = { config_check_intrange, {1, 8} } },
/* UL max HARQ rounds */
\
{ .s2 = { config_check_intrange, {1, 8} } },
/* UL max HARQ rounds */
\
{ .s5 = { NULL } }, \
{ .s5 = { NULL } }, \
...
...
openair2/GNB_APP/gnb_config.c
View file @
5c45b4e6
...
@@ -892,7 +892,6 @@ void RCconfig_NR_L1(void)
...
@@ -892,7 +892,6 @@ void RCconfig_NR_L1(void)
if
(
strcmp
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"local_mac"
)
==
0
)
{
if
(
strcmp
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"local_mac"
)
==
0
)
{
// sf_ahead = 2; // Need 4 subframe gap between RX and TX
// sf_ahead = 2; // Need 4 subframe gap between RX and TX
}
else
if
(
strcmp
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"nfapi"
)
==
0
)
{
}
else
if
(
strcmp
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"nfapi"
)
==
0
)
{
RC
.
gNB
[
j
]
->
eth_params_n
.
local_if_name
=
strdup
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_LOCAL_N_IF_NAME_IDX
].
strptr
));
RC
.
gNB
[
j
]
->
eth_params_n
.
my_addr
=
strdup
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_LOCAL_N_ADDRESS_IDX
].
strptr
));
RC
.
gNB
[
j
]
->
eth_params_n
.
my_addr
=
strdup
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_LOCAL_N_ADDRESS_IDX
].
strptr
));
RC
.
gNB
[
j
]
->
eth_params_n
.
remote_addr
=
strdup
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_REMOTE_N_ADDRESS_IDX
].
strptr
));
RC
.
gNB
[
j
]
->
eth_params_n
.
remote_addr
=
strdup
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_REMOTE_N_ADDRESS_IDX
].
strptr
));
RC
.
gNB
[
j
]
->
eth_params_n
.
my_portc
=
*
(
L1_ParamList
.
paramarray
[
j
][
L1_LOCAL_N_PORTC_IDX
].
iptr
);
RC
.
gNB
[
j
]
->
eth_params_n
.
my_portc
=
*
(
L1_ParamList
.
paramarray
[
j
][
L1_LOCAL_N_PORTC_IDX
].
iptr
);
...
@@ -1278,7 +1277,6 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg)
...
@@ -1278,7 +1277,6 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg)
}
else
if
(
strcmp
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"f1"
)
==
0
}
else
if
(
strcmp
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"f1"
)
==
0
||
strcmp
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"cudu"
)
==
0
)
{
||
strcmp
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"cudu"
)
==
0
)
{
printf
(
"Configuring F1 interfaces for MACRLC
\n
"
);
printf
(
"Configuring F1 interfaces for MACRLC
\n
"
);
RC
.
nrmac
[
j
]
->
eth_params_n
.
local_if_name
=
strdup
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_N_IF_NAME_IDX
].
strptr
));
char
**
f1caddr
=
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_N_ADDRESS_IDX
].
strptr
;
char
**
f1caddr
=
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_N_ADDRESS_IDX
].
strptr
;
RC
.
nrmac
[
j
]
->
eth_params_n
.
my_addr
=
strdup
(
*
f1caddr
);
RC
.
nrmac
[
j
]
->
eth_params_n
.
my_addr
=
strdup
(
*
f1caddr
);
char
**
f1uaddr
=
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_N_ADDRESS_F1U_IDX
].
strptr
;
char
**
f1uaddr
=
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_N_ADDRESS_F1U_IDX
].
strptr
;
...
@@ -1295,7 +1293,6 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg)
...
@@ -1295,7 +1293,6 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg)
if
(
strcmp
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_S_PREFERENCE_IDX
].
strptr
),
"local_L1"
)
==
0
)
{
if
(
strcmp
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_S_PREFERENCE_IDX
].
strptr
),
"local_L1"
)
==
0
)
{
}
else
if
(
strcmp
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_S_PREFERENCE_IDX
].
strptr
),
"nfapi"
)
==
0
)
{
}
else
if
(
strcmp
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_S_PREFERENCE_IDX
].
strptr
),
"nfapi"
)
==
0
)
{
RC
.
nrmac
[
j
]
->
eth_params_s
.
local_if_name
=
strdup
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_S_IF_NAME_IDX
].
strptr
));
RC
.
nrmac
[
j
]
->
eth_params_s
.
my_addr
=
strdup
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_S_ADDRESS_IDX
].
strptr
));
RC
.
nrmac
[
j
]
->
eth_params_s
.
my_addr
=
strdup
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_S_ADDRESS_IDX
].
strptr
));
RC
.
nrmac
[
j
]
->
eth_params_s
.
remote_addr
=
strdup
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_REMOTE_S_ADDRESS_IDX
].
strptr
));
RC
.
nrmac
[
j
]
->
eth_params_s
.
remote_addr
=
strdup
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_REMOTE_S_ADDRESS_IDX
].
strptr
));
RC
.
nrmac
[
j
]
->
eth_params_s
.
my_portc
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_S_PORTC_IDX
].
iptr
);
RC
.
nrmac
[
j
]
->
eth_params_s
.
my_portc
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_S_PORTC_IDX
].
iptr
);
...
@@ -1580,8 +1577,12 @@ void RCconfig_NRRRC(gNB_RRC_INST *rrc)
...
@@ -1580,8 +1577,12 @@ void RCconfig_NRRRC(gNB_RRC_INST *rrc)
config_get
(
config_get_if
(),
SCTPParams
,
sizeofArray
(
SCTPParams
),
aprefix
);
config_get
(
config_get_if
(),
SCTPParams
,
sizeofArray
(
SCTPParams
),
aprefix
);
LOG_I
(
GNB_APP
,
"F1AP: gNB_CU_id[%d] %d
\n
"
,
k
,
rrc
->
node_id
);
LOG_I
(
GNB_APP
,
"F1AP: gNB_CU_id[%d] %d
\n
"
,
k
,
rrc
->
node_id
);
rrc
->
node_name
=
strdup
(
*
(
GNBParamList
.
paramarray
[
0
][
GNB_GNB_NAME_IDX
].
strptr
));
rrc
->
node_name
=
strdup
(
*
(
GNBParamList
.
paramarray
[
0
][
GNB_GNB_NAME_IDX
].
strptr
));
<<<<<<<
HEAD
LOG_I
(
GNB_APP
,
"F1AP: gNB_CU_name[%d] %s
\n
"
,
k
,
rrc
->
node_name
);
LOG_I
(
GNB_APP
,
"F1AP: gNB_CU_name[%d] %s
\n
"
,
k
,
rrc
->
node_name
);
rrc
->
eth_params_s
.
local_if_name
=
strdup
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_LOCAL_S_IF_NAME_IDX
].
strptr
));
rrc
->
eth_params_s
.
local_if_name
=
strdup
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_LOCAL_S_IF_NAME_IDX
].
strptr
));
=======
LOG_I
(
GNB_APP
,
"F1AP: gNB_CU_name[%d] %s
\n
"
,
k
,
rrc
->
node_name
);
>>>>>>>
f21c2cf822
(
Remove
interface
names
from
F1
and
nFAPI
(
4
G
+
5
G
))
rrc
->
eth_params_s
.
my_addr
=
strdup
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_LOCAL_S_ADDRESS_IDX
].
strptr
));
rrc
->
eth_params_s
.
my_addr
=
strdup
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_LOCAL_S_ADDRESS_IDX
].
strptr
));
rrc
->
eth_params_s
.
remote_addr
=
strdup
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_REMOTE_S_ADDRESS_IDX
].
strptr
));
rrc
->
eth_params_s
.
remote_addr
=
strdup
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_REMOTE_S_ADDRESS_IDX
].
strptr
));
rrc
->
eth_params_s
.
my_portc
=
*
(
GNBParamList
.
paramarray
[
i
][
GNB_LOCAL_S_PORTC_IDX
].
uptr
);
rrc
->
eth_params_s
.
my_portc
=
*
(
GNBParamList
.
paramarray
[
i
][
GNB_LOCAL_S_PORTC_IDX
].
uptr
);
...
@@ -1598,7 +1599,6 @@ void RCconfig_NRRRC(gNB_RRC_INST *rrc)
...
@@ -1598,7 +1599,6 @@ void RCconfig_NRRRC(gNB_RRC_INST *rrc)
if
(
strcmp
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_TRANSPORT_S_PREFERENCE_IDX
].
strptr
),
"local_mac"
)
==
0
)
{
if
(
strcmp
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_TRANSPORT_S_PREFERENCE_IDX
].
strptr
),
"local_mac"
)
==
0
)
{
}
else
if
(
strcmp
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_TRANSPORT_S_PREFERENCE_IDX
].
strptr
),
"cudu"
)
==
0
)
{
}
else
if
(
strcmp
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_TRANSPORT_S_PREFERENCE_IDX
].
strptr
),
"cudu"
)
==
0
)
{
rrc
->
eth_params_s
.
local_if_name
=
strdup
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_LOCAL_S_IF_NAME_IDX
].
strptr
));
rrc
->
eth_params_s
.
my_addr
=
strdup
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_LOCAL_S_ADDRESS_IDX
].
strptr
));
rrc
->
eth_params_s
.
my_addr
=
strdup
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_LOCAL_S_ADDRESS_IDX
].
strptr
));
rrc
->
eth_params_s
.
remote_addr
=
strdup
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_REMOTE_S_ADDRESS_IDX
].
strptr
));
rrc
->
eth_params_s
.
remote_addr
=
strdup
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_REMOTE_S_ADDRESS_IDX
].
strptr
));
rrc
->
eth_params_s
.
my_portc
=
*
(
GNBParamList
.
paramarray
[
i
][
GNB_LOCAL_S_PORTC_IDX
].
uptr
);
rrc
->
eth_params_s
.
my_portc
=
*
(
GNBParamList
.
paramarray
[
i
][
GNB_LOCAL_S_PORTC_IDX
].
uptr
);
...
...
openair2/GNB_APP/gnb_paramdef.h
View file @
5c45b4e6
...
@@ -107,7 +107,6 @@ typedef enum {
...
@@ -107,7 +107,6 @@ typedef enum {
#define GNB_CONFIG_STRING_MOBILE_COUNTRY_CODE_OLD "mobile_country_code"
#define GNB_CONFIG_STRING_MOBILE_COUNTRY_CODE_OLD "mobile_country_code"
#define GNB_CONFIG_STRING_MOBILE_NETWORK_CODE_OLD "mobile_network_code"
#define GNB_CONFIG_STRING_MOBILE_NETWORK_CODE_OLD "mobile_network_code"
#define GNB_CONFIG_STRING_TRANSPORT_S_PREFERENCE "tr_s_preference"
#define GNB_CONFIG_STRING_TRANSPORT_S_PREFERENCE "tr_s_preference"
#define GNB_CONFIG_STRING_LOCAL_S_IF_NAME "local_s_if_name"
#define GNB_CONFIG_STRING_LOCAL_S_ADDRESS "local_s_address"
#define GNB_CONFIG_STRING_LOCAL_S_ADDRESS "local_s_address"
#define GNB_CONFIG_STRING_REMOTE_S_ADDRESS "remote_s_address"
#define GNB_CONFIG_STRING_REMOTE_S_ADDRESS "remote_s_address"
#define GNB_CONFIG_STRING_LOCAL_S_PORTC "local_s_portc"
#define GNB_CONFIG_STRING_LOCAL_S_PORTC "local_s_portc"
...
@@ -150,7 +149,6 @@ typedef enum {
...
@@ -150,7 +149,6 @@ typedef enum {
{GNB_CONFIG_STRING_MOBILE_COUNTRY_CODE_OLD, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_MOBILE_COUNTRY_CODE_OLD, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_MOBILE_NETWORK_CODE_OLD, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_MOBILE_NETWORK_CODE_OLD, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_TRANSPORT_S_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_mac", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_TRANSPORT_S_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_mac", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_LOCAL_S_IF_NAME, NULL, 0, .strptr=NULL, .defstrval="lo", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_LOCAL_S_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_LOCAL_S_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_REMOTE_S_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_REMOTE_S_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_LOCAL_S_PORTC, NULL, 0, .uptr=NULL, .defuintval=50000, TYPE_UINT, 0}, \
{GNB_CONFIG_STRING_LOCAL_S_PORTC, NULL, 0, .uptr=NULL, .defuintval=50000, TYPE_UINT, 0}, \
...
@@ -184,29 +182,28 @@ typedef enum {
...
@@ -184,29 +182,28 @@ typedef enum {
#define GNB_MOBILE_COUNTRY_CODE_IDX_OLD 4
#define GNB_MOBILE_COUNTRY_CODE_IDX_OLD 4
#define GNB_MOBILE_NETWORK_CODE_IDX_OLD 5
#define GNB_MOBILE_NETWORK_CODE_IDX_OLD 5
#define GNB_TRANSPORT_S_PREFERENCE_IDX 6
#define GNB_TRANSPORT_S_PREFERENCE_IDX 6
#define GNB_LOCAL_S_IF_NAME_IDX 7
#define GNB_LOCAL_S_ADDRESS_IDX 7
#define GNB_LOCAL_S_ADDRESS_IDX 8
#define GNB_REMOTE_S_ADDRESS_IDX 8
#define GNB_REMOTE_S_ADDRESS_IDX 9
#define GNB_LOCAL_S_PORTC_IDX 9
#define GNB_LOCAL_S_PORTC_IDX 10
#define GNB_REMOTE_S_PORTC_IDX 10
#define GNB_REMOTE_S_PORTC_IDX 11
#define GNB_LOCAL_S_PORTD_IDX 11
#define GNB_LOCAL_S_PORTD_IDX 12
#define GNB_REMOTE_S_PORTD_IDX 12
#define GNB_REMOTE_S_PORTD_IDX 13
#define GNB_PDSCH_ANTENNAPORTS_N1_IDX 13
#define GNB_PDSCH_ANTENNAPORTS_N1_IDX 14
#define GNB_PDSCH_ANTENNAPORTS_N2_IDX 14
#define GNB_PDSCH_ANTENNAPORTS_N2_IDX 15
#define GNB_PDSCH_ANTENNAPORTS_XP_IDX 15
#define GNB_PDSCH_ANTENNAPORTS_XP_IDX 16
#define GNB_PUSCH_ANTENNAPORTS_IDX 16
#define GNB_PUSCH_ANTENNAPORTS_IDX 17
#define GNB_SIB1_TDA_IDX 17
#define GNB_SIB1_TDA_IDX 18
#define GNB_DO_CSIRS_IDX 18
#define GNB_DO_CSIRS_IDX 19
#define GNB_DO_SRS_IDX 19
#define GNB_DO_SRS_IDX 20
#define GNB_NRCELLID_IDX 20
#define GNB_NRCELLID_IDX 21
#define GNB_MINRXTXTIME_IDX 21
#define GNB_MINRXTXTIME_IDX 22
#define GNB_ULPRBBLACKLIST_IDX 22
#define GNB_ULPRBBLACKLIST_IDX 23
#define GNB_UMONDEFAULTDRB_IDX 23
#define GNB_UMONDEFAULTDRB_IDX 24
#define GNB_FORCE256QAMOFF_IDX 24
#define GNB_FORCE256QAMOFF_IDX 25
#define GNB_ENABLE_SDAP_IDX 25
#define GNB_ENABLE_SDAP_IDX 26
#define GNB_DRBS 26
#define GNB_DRBS 27
#define GNB_GNB_DU_ID_IDX 27
#define GNB_GNB_DU_ID_IDX 28
#define GNB_GNB_CU_UP_ID_IDX 28
#define GNB_GNB_CU_UP_ID_IDX 29
#define TRACKING_AREA_CODE_OKRANGE {0x0001,0xFFFD}
#define TRACKING_AREA_CODE_OKRANGE {0x0001,0xFFFD}
#define GNBPARAMS_CHECK { \
#define GNBPARAMS_CHECK { \
...
@@ -406,7 +403,6 @@ typedef enum {
...
@@ -406,7 +403,6 @@ typedef enum {
/* MACRLC configuration parameters names */
/* MACRLC configuration parameters names */
#define CONFIG_STRING_MACRLC_CC "num_cc"
#define CONFIG_STRING_MACRLC_CC "num_cc"
#define CONFIG_STRING_MACRLC_TRANSPORT_N_PREFERENCE "tr_n_preference"
#define CONFIG_STRING_MACRLC_TRANSPORT_N_PREFERENCE "tr_n_preference"
#define CONFIG_STRING_MACRLC_LOCAL_N_IF_NAME "local_n_if_name"
#define CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS "local_n_address"
#define CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS "local_n_address"
#define CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS "remote_n_address"
#define CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS "remote_n_address"
#define CONFIG_STRING_MACRLC_LOCAL_N_PORTC "local_n_portc"
#define CONFIG_STRING_MACRLC_LOCAL_N_PORTC "local_n_portc"
...
@@ -414,7 +410,6 @@ typedef enum {
...
@@ -414,7 +410,6 @@ typedef enum {
#define CONFIG_STRING_MACRLC_LOCAL_N_PORTD "local_n_portd"
#define CONFIG_STRING_MACRLC_LOCAL_N_PORTD "local_n_portd"
#define CONFIG_STRING_MACRLC_REMOTE_N_PORTD "remote_n_portd"
#define CONFIG_STRING_MACRLC_REMOTE_N_PORTD "remote_n_portd"
#define CONFIG_STRING_MACRLC_TRANSPORT_S_PREFERENCE "tr_s_preference"
#define CONFIG_STRING_MACRLC_TRANSPORT_S_PREFERENCE "tr_s_preference"
#define CONFIG_STRING_MACRLC_LOCAL_S_IF_NAME "local_s_if_name"
#define CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS "local_s_address"
#define CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS "local_s_address"
#define CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS "remote_s_address"
#define CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS "remote_s_address"
#define CONFIG_STRING_MACRLC_LOCAL_S_PORTC "local_s_portc"
#define CONFIG_STRING_MACRLC_LOCAL_S_PORTC "local_s_portc"
...
@@ -425,22 +420,20 @@ typedef enum {
...
@@ -425,22 +420,20 @@ typedef enum {
#define MACRLC_CC_IDX 0
#define MACRLC_CC_IDX 0
#define MACRLC_TRANSPORT_N_PREFERENCE_IDX 1
#define MACRLC_TRANSPORT_N_PREFERENCE_IDX 1
#define MACRLC_LOCAL_N_IF_NAME_IDX 2
#define MACRLC_LOCAL_N_ADDRESS_IDX 2
#define MACRLC_LOCAL_N_ADDRESS_IDX 3
#define MACRLC_REMOTE_N_ADDRESS_IDX 3
#define MACRLC_REMOTE_N_ADDRESS_IDX 4
#define MACRLC_LOCAL_N_PORTC_IDX 4
#define MACRLC_LOCAL_N_PORTC_IDX 5
#define MACRLC_REMOTE_N_PORTC_IDX 5
#define MACRLC_REMOTE_N_PORTC_IDX 6
#define MACRLC_LOCAL_N_PORTD_IDX 6
#define MACRLC_LOCAL_N_PORTD_IDX 7
#define MACRLC_REMOTE_N_PORTD_IDX 7
#define MACRLC_REMOTE_N_PORTD_IDX 8
#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 8
#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 9
#define MACRLC_LOCAL_S_ADDRESS_IDX 9
#define MACRLC_LOCAL_S_IF_NAME_IDX 10
#define MACRLC_REMOTE_S_ADDRESS_IDX 10
#define MACRLC_LOCAL_S_ADDRESS_IDX 11
#define MACRLC_LOCAL_S_PORTC_IDX 11
#define MACRLC_REMOTE_S_ADDRESS_IDX 12
#define MACRLC_REMOTE_S_PORTC_IDX 12
#define MACRLC_LOCAL_S_PORTC_IDX 13
#define MACRLC_LOCAL_S_PORTD_IDX 13
#define MACRLC_REMOTE_S_PORTC_IDX 14
#define MACRLC_REMOTE_S_PORTD_IDX 14
#define MACRLC_LOCAL_S_PORTD_IDX 15
#define MACRLC_SCHED_MODE_IDX 15
#define MACRLC_REMOTE_S_PORTD_IDX 16
#define MACRLC_SCHED_MODE_IDX 17
/* thread configuration parameters section name */
/* thread configuration parameters section name */
...
...
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
View file @
5c45b4e6
...
@@ -1303,8 +1303,6 @@ void RCconfig_nr_ue_macrlc(void) {
...
@@ -1303,8 +1303,6 @@ void RCconfig_nr_ue_macrlc(void) {
if
(
MACRLC_ParamList
.
numelt
>
0
)
{
if
(
MACRLC_ParamList
.
numelt
>
0
)
{
for
(
j
=
0
;
j
<
MACRLC_ParamList
.
numelt
;
j
++
)
{
for
(
j
=
0
;
j
<
MACRLC_ParamList
.
numelt
;
j
++
)
{
if
(
strcmp
(
*
(
MACRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"nfapi"
)
==
0
)
{
if
(
strcmp
(
*
(
MACRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"nfapi"
)
==
0
)
{
stub_eth_params
.
local_if_name
=
strdup
(
*
(
MACRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_N_IF_NAME_IDX
].
strptr
));
stub_eth_params
.
my_addr
=
strdup
(
stub_eth_params
.
my_addr
=
strdup
(
*
(
MACRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_N_ADDRESS_IDX
].
strptr
));
*
(
MACRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_N_ADDRESS_IDX
].
strptr
));
stub_eth_params
.
remote_addr
=
strdup
(
stub_eth_params
.
remote_addr
=
strdup
(
...
...
openair2/PHY_INTERFACE/phy_stub_UE.c
View file @
5c45b4e6
...
@@ -1164,8 +1164,6 @@ void UE_config_stub_pnf(void) {
...
@@ -1164,8 +1164,6 @@ void UE_config_stub_pnf(void) {
// eth_params in the UE_mac_inst. Later I think we have to change that to
// eth_params in the UE_mac_inst. Later I think we have to change that to
// attribute eth_params to a global element for all the UEs.
// attribute eth_params to a global element for all the UEs.
else
if
(
strcmp
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"nfapi"
)
==
0
)
{
else
if
(
strcmp
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"nfapi"
)
==
0
)
{
stub_eth_params
.
local_if_name
=
strdup
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_LOCAL_N_IF_NAME_IDX
].
strptr
));
stub_eth_params
.
my_addr
=
strdup
(
stub_eth_params
.
my_addr
=
strdup
(
*
(
L1_ParamList
.
paramarray
[
j
][
L1_LOCAL_N_ADDRESS_IDX
].
strptr
));
*
(
L1_ParamList
.
paramarray
[
j
][
L1_LOCAL_N_ADDRESS_IDX
].
strptr
));
stub_eth_params
.
remote_addr
=
strdup
(
stub_eth_params
.
remote_addr
=
strdup
(
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf
View file @
5c45b4e6
...
@@ -19,7 +19,6 @@ eNBs = (
...
@@ -19,7 +19,6 @@ eNBs = (
tr_s_preference
=
"f1"
tr_s_preference
=
"f1"
local_s_if_name
=
"lo"
;
remote_s_address
=
"192.168.12.4"
;
remote_s_address
=
"192.168.12.4"
;
local_s_address
=
"192.168.12.45"
;
local_s_address
=
"192.168.12.45"
;
local_s_portc
=
501
;
local_s_portc
=
501
;
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/du.lte.band7.10MHz.if4p5.conf
View file @
5c45b4e6
...
@@ -63,7 +63,6 @@ MACRLCs = (
...
@@ -63,7 +63,6 @@ MACRLCs = (
num_cc
=
1
;
num_cc
=
1
;
tr_s_preference
=
"local_L1"
;
tr_s_preference
=
"local_L1"
;
tr_n_preference
=
"f1"
;
tr_n_preference
=
"f1"
;
local_n_if_name
=
"lo"
;
remote_n_address
=
"127.0.0.4"
;
remote_n_address
=
"127.0.0.4"
;
local_n_address
=
"127.0.0.3"
;
local_n_address
=
"127.0.0.3"
;
local_n_portc
=
500
;
local_n_portc
=
500
;
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf
View file @
5c45b4e6
...
@@ -13,7 +13,6 @@ log_config = {
...
@@ -13,7 +13,6 @@ log_config = {
# {
# {
# num_cc = 1;
# num_cc = 1;
# tr_n_preference = "nfapi";
# tr_n_preference = "nfapi";
# local_n_if_name = "eno1";
# remote_n_address = "192.168.1.28";
# remote_n_address = "192.168.1.28";
# local_n_address = "192.168.1.74";
# local_n_address = "192.168.1.74";
# local_n_portc = 50000;
# local_n_portc = 50000;
...
@@ -28,10 +27,8 @@ L1s = (
...
@@ -28,10 +27,8 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"nfapi"
;
tr_n_preference
=
"nfapi"
;
#local_n_if_name = "enp0s31f6";
#remote_n_address = "10.0.0.2";
#remote_n_address = "10.0.0.2";
#local_n_address = "10.0.0.1";
#local_n_address = "10.0.0.1";
local_n_if_name
=
"lo"
;
remote_n_address
=
"127.0.0.2"
;
remote_n_address
=
"127.0.0.2"
;
local_n_address
=
"127.0.0.1"
;
local_n_address
=
"127.0.0.1"
;
local_n_portc
=
50000
;
local_n_portc
=
50000
;
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf
View file @
5c45b4e6
...
@@ -14,7 +14,6 @@ L1s = (
...
@@ -14,7 +14,6 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"nfapi"
;
tr_n_preference
=
"nfapi"
;
local_n_if_name
=
"lo"
;
remote_n_address
=
"127.0.0.2"
; //
vnf
addr
remote_n_address
=
"127.0.0.2"
; //
vnf
addr
local_n_address
=
"127.0.0.1"
; //
pnf
addr
local_n_address
=
"127.0.0.1"
; //
pnf
addr
local_n_portc
=
50000
; //
pnf
p5
port
[!]
local_n_portc
=
50000
; //
pnf
p5
port
[!]
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf
View file @
5c45b4e6
...
@@ -173,7 +173,6 @@ eNBs =
...
@@ -173,7 +173,6 @@ eNBs =
MACRLCs
= (
MACRLCs
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
local_s_if_name
=
"eno1"
;
remote_s_address
=
"10.0.0.2"
;
remote_s_address
=
"10.0.0.2"
;
#local_s_address = "192.168.1.78";
#local_s_address = "192.168.1.78";
local_s_address
=
"10.0.0.1"
;
local_s_address
=
"10.0.0.1"
;
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
View file @
5c45b4e6
...
@@ -211,7 +211,6 @@ eNBs =
...
@@ -211,7 +211,6 @@ eNBs =
MACRLCs
= (
MACRLCs
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
local_s_if_name
=
"lo:"
;
remote_s_address
=
"127.0.0.1"
;
remote_s_address
=
"127.0.0.1"
;
local_s_address
=
"127.0.0.2"
;
local_s_address
=
"127.0.0.2"
;
local_s_portc
=
50001
;
local_s_portc
=
50001
;
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf
View file @
5c45b4e6
...
@@ -205,7 +205,6 @@ gNBs =
...
@@ -205,7 +205,6 @@ gNBs =
MACRLCs
= (
MACRLCs
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
local_s_if_name
=
"lo:"
;
remote_s_address
=
"127.0.0.1"
; //
pnf
addr
[!]
remote_s_address
=
"127.0.0.1"
; //
pnf
addr
[!]
local_s_address
=
"127.0.0.2"
; //
vnf
addr
local_s_address
=
"127.0.0.2"
; //
vnf
addr
local_s_portc
=
50001
; //
vnf
p5
port
local_s_portc
=
50001
; //
vnf
p5
port
...
...
targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
View file @
5c45b4e6
...
@@ -21,7 +21,6 @@ gNBs =
...
@@ -21,7 +21,6 @@ gNBs =
tr_s_preference
=
"f1"
;
tr_s_preference
=
"f1"
;
local_s_if_name
=
"lo"
;
local_s_address
=
"127.0.0.4"
;
local_s_address
=
"127.0.0.4"
;
remote_s_address
=
"127.0.0.3"
;
remote_s_address
=
"127.0.0.3"
;
local_s_portc
=
501
;
local_s_portc
=
501
;
...
...
targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
View file @
5c45b4e6
...
@@ -168,7 +168,6 @@ MACRLCs = (
...
@@ -168,7 +168,6 @@ MACRLCs = (
num_cc
=
1
;
num_cc
=
1
;
tr_s_preference
=
"local_L1"
;
tr_s_preference
=
"local_L1"
;
tr_n_preference
=
"f1"
;
tr_n_preference
=
"f1"
;
local_n_if_name
=
"lo"
;
local_n_address
=
"127.0.0.3"
;
local_n_address
=
"127.0.0.3"
;
remote_n_address
=
"127.0.0.4"
;
remote_n_address
=
"127.0.0.4"
;
local_n_portc
=
500
;
local_n_portc
=
500
;
...
...
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.aerial.conf
View file @
5c45b4e6
...
@@ -211,7 +211,6 @@ gNBs =
...
@@ -211,7 +211,6 @@ gNBs =
MACRLCs
= (
MACRLCs
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
local_s_if_name
=
"lo:"
;
remote_s_address
=
"127.0.0.1"
; //
pnf
addr
[!]
remote_s_address
=
"127.0.0.1"
; //
pnf
addr
[!]
local_s_address
=
"127.0.0.2"
; //
vnf
addr
local_s_address
=
"127.0.0.2"
; //
vnf
addr
local_s_portc
=
50001
; //
vnf
p5
port
local_s_portc
=
50001
; //
vnf
p5
port
...
...
targets/PROJECTS/GENERIC-NR-5GC/CONF/pnf.sa.band78.rfsim.conf
View file @
5c45b4e6
...
@@ -3,7 +3,6 @@ L1s = (
...
@@ -3,7 +3,6 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"nfapi"
;
tr_n_preference
=
"nfapi"
;
local_n_if_name
=
"lo"
;
remote_n_address
=
"127.0.0.2"
; //
vnf
addr
remote_n_address
=
"127.0.0.2"
; //
vnf
addr
local_n_address
=
"127.0.0.1"
; //
pnf
addr
local_n_address
=
"127.0.0.1"
; //
pnf
addr
local_n_portc
=
50000
; //
pnf
p5
port
[!]
local_n_portc
=
50000
; //
pnf
p5
port
[!]
...
...
targets/PROJECTS/GENERIC-NR-5GC/CONF/vnf.sa.band78.106prb.rfsim.conf
View file @
5c45b4e6
...
@@ -198,7 +198,6 @@ gNBs =
...
@@ -198,7 +198,6 @@ gNBs =
MACRLCs
= (
MACRLCs
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
local_s_if_name
=
"lo:"
;
remote_s_address
=
"127.0.0.1"
; //
pnf
addr
[!]
remote_s_address
=
"127.0.0.1"
; //
pnf
addr
[!]
local_s_address
=
"127.0.0.2"
; //
vnf
addr
local_s_address
=
"127.0.0.2"
; //
vnf
addr
local_s_portc
=
50001
; //
vnf
p5
port
local_s_portc
=
50001
; //
vnf
p5
port
...
...
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