From f21c2cf82257f5a8e84cbff4b41ca906628e58e5 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 22 Mar 2024 15:19:22 +0100 Subject: [PATCH] Remove interface names from F1 and nFAPI (4G+5G) --- .../conf_files/enb.band7.25prb.l2sim.conf | 1 - .../conf_files/gnb-cu.sa.band78.106prb.conf | 1 - ci-scripts/conf_files/gnb-cu.sa.f1.conf | 1 - ci-scripts/conf_files/gnb-cucp.sa.f1.conf | 1 - .../conf_files/gnb-cucp.sa.f1.quectel.conf | 1 - ci-scripts/conf_files/gnb-cuup.sa.f1.conf | 1 - .../conf_files/gnb-cuup.sa.f1.quectel.conf | 1 - .../gnb-du.band78.106prb.rfsim.conf | 1 - .../gnb-du.sa.band1.52prb.usrpb210.conf | 1 - .../gnb-du.sa.band78.106prb.rfsim.conf | 1 - .../gnb-du.sa.band78.106prb.usrpb200.conf | 1 - .../gnb-vnf.sa.band78.273prb.aerial.conf | 1 - .../gnb.sa.band78.106prb.l2sim.conf | 1 - .../conf_files/lteue.band7.25prb.l2sim.conf | 1 - .../conf_files/nrue.band78.106prb.l2sim.conf | 1 - .../untested/episci/episci_nr-ue.nfapi.conf | 1 - .../episci/episci_rcc.band7.tm1.nfapi.conf | 1 - .../episci_rcc.band78.tm1.106PRB.nfapi.conf | 1 - .../untested/episci/episci_ue.nfapi.conf | 1 - .../gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf | 1 - .../untested/episci/proxy_nr-ue.nfapi.conf | 1 - .../episci/proxy_rcc.band7.tm1.nfapi.conf | 1 - .../proxy_rcc.band78.tm1.106PRB.nfapi.conf | 1 - .../untested/episci/proxy_ue.nfapi.conf | 1 - ...oxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf | 1 - .../untested/rcc.band7.tm1.nfapi.conf | 1 - ci-scripts/yaml_files/5g_l2sim_tdd/README.md | 3 +- doc/F1-design.md | 4 +- doc/L2NFAPI_NOS1.md | 2 - doc/L2NFAPI_S1.md | 2 - openair2/ENB_APP/L1_paramdef.h | 47 ++++++----- openair2/ENB_APP/MACRLC_paramdef.h | 50 ++++++------ openair2/ENB_APP/enb_config.c | 2 - openair2/ENB_APP/enb_paramdef.h | 69 ++++++++-------- openair2/GNB_APP/L1_nr_paramdef.h | 37 ++++----- openair2/GNB_APP/MACRLC_nr_paramdef.h | 70 ++++++++-------- openair2/GNB_APP/gnb_config.c | 5 -- openair2/GNB_APP/gnb_paramdef.h | 79 +++++++++---------- openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c | 2 - openair2/PHY_INTERFACE/phy_stub_UE.c | 2 - .../PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf | 1 - .../CONF/du.lte.band7.10MHz.if4p5.conf | 1 - .../CONF/oaiL1.nfapi.usrpb210.conf | 3 - .../CONF/oaiL1.nfapi.usrpx300.conf | 1 - .../CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf | 1 - .../CONF/rcc.band7.tm1.50PRB.nfapi.conf | 1 - .../CONF/rcc.band78.tm1.106PRB.nfapi.conf | 1 - .../PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf | 1 - .../PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf | 1 - .../CONF/gnb-vnf.sa.band78.273prb.aerial.conf | 1 - .../CONF/pnf.sa.band78.rfsim.conf | 1 - .../CONF/vnf.sa.band78.106prb.rfsim.conf | 1 - 52 files changed, 161 insertions(+), 253 deletions(-) diff --git a/ci-scripts/conf_files/enb.band7.25prb.l2sim.conf b/ci-scripts/conf_files/enb.band7.25prb.l2sim.conf index d5003915ba..069539cbcb 100644 --- a/ci-scripts/conf_files/enb.band7.25prb.l2sim.conf +++ b/ci-scripts/conf_files/enb.band7.25prb.l2sim.conf @@ -204,7 +204,6 @@ eNBs = MACRLCs = ( { num_cc = 1; - local_s_if_name = "lo"; remote_s_address = "127.0.0.1"; local_s_address = "127.0.0.1"; local_s_portc = 50001; diff --git a/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf index f9b4723a9d..772766ecb4 100644 --- a/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf +++ b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf @@ -22,7 +22,6 @@ gNBs = tr_s_preference = "f1"; - local_s_if_name = "eth0"; local_s_address = "192.168.71.150"; remote_s_address = "192.168.71.171"; local_s_portc = 501; diff --git a/ci-scripts/conf_files/gnb-cu.sa.f1.conf b/ci-scripts/conf_files/gnb-cu.sa.f1.conf index 26a33d8d7e..97daeca9bc 100644 --- a/ci-scripts/conf_files/gnb-cu.sa.f1.conf +++ b/ci-scripts/conf_files/gnb-cu.sa.f1.conf @@ -22,7 +22,6 @@ gNBs = tr_s_preference = "f1"; - local_s_if_name = "eth0"; local_s_address = "192.168.68.194"; remote_s_address = "192.168.68.195"; local_s_portc = 501; diff --git a/ci-scripts/conf_files/gnb-cucp.sa.f1.conf b/ci-scripts/conf_files/gnb-cucp.sa.f1.conf index 2947ab3018..a62b4861f5 100644 --- a/ci-scripts/conf_files/gnb-cucp.sa.f1.conf +++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.conf @@ -23,7 +23,6 @@ gNBs = tr_s_preference = "f1"; - local_s_if_name = "lo"; local_s_address = "192.168.71.150"; remote_s_address = "0.0.0.0"; # multiple DUs local_s_portc = 501; diff --git a/ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf b/ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf index e2176e2921..9d17afbdef 100644 --- a/ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf +++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf @@ -23,7 +23,6 @@ gNBs = tr_s_preference = "f1"; - local_s_if_name = "eth0"; local_s_address = "192.168.68.194"; remote_s_address = "192.168.68.195"; local_s_portc = 501; diff --git a/ci-scripts/conf_files/gnb-cuup.sa.f1.conf b/ci-scripts/conf_files/gnb-cuup.sa.f1.conf index 1f060fc184..a7e2daa298 100644 --- a/ci-scripts/conf_files/gnb-cuup.sa.f1.conf +++ b/ci-scripts/conf_files/gnb-cuup.sa.f1.conf @@ -21,7 +21,6 @@ gNBs = tr_s_preference = "f1"; - local_s_if_name = "lo"; local_s_address = "192.168.72.161"; remote_s_address = "192.168.72.171"; local_s_portc = 501; diff --git a/ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf b/ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf index cba77ff4f5..2b231e950d 100644 --- a/ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf +++ b/ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf @@ -21,7 +21,6 @@ gNBs = tr_s_preference = "f1"; - local_s_if_name = "lo"; local_s_address = "192.168.68.196"; remote_s_address = "192.168.68.195"; local_s_portc = 501; diff --git a/ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf b/ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf index 919c1d219f..780d424671 100644 --- a/ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf @@ -168,7 +168,6 @@ MACRLCs = ( num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; - local_n_if_name = "eth0"; local_n_address = "192.168.72.142"; remote_n_address = "192.168.72.140"; local_n_portc = 500; diff --git a/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf b/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf index 5abf74a828..5afadb781a 100644 --- a/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf +++ b/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf @@ -162,7 +162,6 @@ MACRLCs = ( num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; - local_n_if_name = "eth0"; local_n_address = "192.168.68.195"; remote_n_address = "192.168.68.194"; local_n_portc = 500; diff --git a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf index 9d8a3cb57b..328feea420 100644 --- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf @@ -168,7 +168,6 @@ MACRLCs = ( num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; - local_n_if_name = "eth0"; local_n_address = "192.168.71.171"; remote_n_address = "192.168.71.150"; local_n_portc = 500; diff --git a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf index 5a8d1abd04..07be610807 100644 --- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf +++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf @@ -169,7 +169,6 @@ MACRLCs = ( num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; - local_n_if_name = "eth0"; local_n_address = "192.168.68.195"; remote_n_address = "192.168.68.194"; local_n_portc = 500; diff --git a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf index ea1ca8306a..b201943849 100644 --- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf +++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf @@ -211,7 +211,6 @@ gNBs = MACRLCs = ( { num_cc = 1; - local_s_if_name = "lo:"; remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.2"; // vnf addr local_s_portc = 50001; // vnf p5 port diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.l2sim.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.l2sim.conf index 0f579fd8a8..56c101d68b 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.l2sim.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.l2sim.conf @@ -179,7 +179,6 @@ gNBs = MACRLCs = ( { num_cc = 1; - local_s_if_name = "lo:"; remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.2"; // vnf addr local_s_portc = 50601; // vnf p5 port diff --git a/ci-scripts/conf_files/lteue.band7.25prb.l2sim.conf b/ci-scripts/conf_files/lteue.band7.25prb.l2sim.conf index 0d4ceb18b4..691a681a88 100644 --- a/ci-scripts/conf_files/lteue.band7.25prb.l2sim.conf +++ b/ci-scripts/conf_files/lteue.band7.25prb.l2sim.conf @@ -13,7 +13,6 @@ L1s = ( { num_cc = 1; tr_n_preference = "nfapi"; - local_n_if_name = "eno1"; remote_n_address = "127.0.0.1"; local_n_address = "127.0.0.1"; local_n_portc = 50000; diff --git a/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf b/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf index a25a91b502..45d192dc04 100644 --- a/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf +++ b/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf @@ -21,7 +21,6 @@ MACRLCs = ( { num_cc = 1; tr_n_preference = "nfapi"; - local_n_if_name = "eno1"; remote_n_address = "127.0.0.1"; //Proxy IP local_n_address = "127.0.0.1"; local_n_portc = 50600; diff --git a/ci-scripts/conf_files/untested/episci/episci_nr-ue.nfapi.conf b/ci-scripts/conf_files/untested/episci/episci_nr-ue.nfapi.conf index 58bcca6e3c..fcdce84334 100644 --- a/ci-scripts/conf_files/untested/episci/episci_nr-ue.nfapi.conf +++ b/ci-scripts/conf_files/untested/episci/episci_nr-ue.nfapi.conf @@ -21,7 +21,6 @@ MACRLCs = ( { num_cc = 1; tr_n_preference = "nfapi"; - local_n_if_name = "ens3"; remote_n_address = "127.0.0.1"; //Proxy IP local_n_address = "127.0.0.1"; local_n_portc = 50600; diff --git a/ci-scripts/conf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf b/ci-scripts/conf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf index a41553650f..25b04e8455 100644 --- a/ci-scripts/conf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf +++ b/ci-scripts/conf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf @@ -204,7 +204,6 @@ eNBs = MACRLCs = ( { num_cc = 1; - local_s_if_name = "lo"; remote_s_address = "127.0.0.1"; local_s_address = "127.0.0.1"; local_s_portc = 50001; diff --git a/ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf b/ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf index 71cbcd8390..642d516631 100644 --- a/ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf +++ b/ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf @@ -198,7 +198,6 @@ gNBs = MACRLCs = ( { num_cc = 1; - local_s_if_name = "lo:"; remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.2"; // vnf addr local_s_portc = 50601; // vnf p5 port diff --git a/ci-scripts/conf_files/untested/episci/episci_ue.nfapi.conf b/ci-scripts/conf_files/untested/episci/episci_ue.nfapi.conf index 8f7c8ee68a..53d8edebff 100644 --- a/ci-scripts/conf_files/untested/episci/episci_ue.nfapi.conf +++ b/ci-scripts/conf_files/untested/episci/episci_ue.nfapi.conf @@ -13,7 +13,6 @@ L1s = ( { num_cc = 1; tr_n_preference = "nfapi"; - local_n_if_name = "ens3"; remote_n_address = "127.0.0.1"; //Proxy IP local_n_address = "127.0.0.1"; local_n_portc = 50000; diff --git a/ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf b/ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf index 8d3bc810d2..0dbf3310c9 100644 --- a/ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf +++ b/ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf @@ -182,7 +182,6 @@ gNBs = MACRLCs = ( { num_cc = 1; - local_s_if_name = "lo:"; remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.2"; // vnf addr local_s_portc = 50601; // vnf p5 port diff --git a/ci-scripts/conf_files/untested/episci/proxy_nr-ue.nfapi.conf b/ci-scripts/conf_files/untested/episci/proxy_nr-ue.nfapi.conf index d3309e1f03..8d6cca014f 100644 --- a/ci-scripts/conf_files/untested/episci/proxy_nr-ue.nfapi.conf +++ b/ci-scripts/conf_files/untested/episci/proxy_nr-ue.nfapi.conf @@ -21,7 +21,6 @@ MACRLCs = ( { num_cc = 1; tr_n_preference = "nfapi"; - local_n_if_name = "lo:"; remote_n_address = "127.0.0.1"; //Proxy IP local_n_address = "127.0.0.1"; local_n_portc = 50600; diff --git a/ci-scripts/conf_files/untested/episci/proxy_rcc.band7.tm1.nfapi.conf b/ci-scripts/conf_files/untested/episci/proxy_rcc.band7.tm1.nfapi.conf index 0adda79827..dd8db0adf7 100644 --- a/ci-scripts/conf_files/untested/episci/proxy_rcc.band7.tm1.nfapi.conf +++ b/ci-scripts/conf_files/untested/episci/proxy_rcc.band7.tm1.nfapi.conf @@ -204,7 +204,6 @@ eNBs = MACRLCs = ( { num_cc = 1; - local_s_if_name = "lo"; remote_s_address = "127.0.0.1"; local_s_address = "127.0.0.1"; local_s_portc = 50001; diff --git a/ci-scripts/conf_files/untested/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf b/ci-scripts/conf_files/untested/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf index dd67629e0d..9014e1e704 100644 --- a/ci-scripts/conf_files/untested/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf +++ b/ci-scripts/conf_files/untested/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf @@ -221,7 +221,6 @@ gNBs = MACRLCs = ( { num_cc = 1; - local_s_if_name = "lo:"; remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.2"; // vnf addr local_s_portc = 50601; // vnf p5 port diff --git a/ci-scripts/conf_files/untested/episci/proxy_ue.nfapi.conf b/ci-scripts/conf_files/untested/episci/proxy_ue.nfapi.conf index 51c30fb42d..691a681a88 100644 --- a/ci-scripts/conf_files/untested/episci/proxy_ue.nfapi.conf +++ b/ci-scripts/conf_files/untested/episci/proxy_ue.nfapi.conf @@ -13,7 +13,6 @@ L1s = ( { num_cc = 1; tr_n_preference = "nfapi"; - local_n_if_name = "lo"; remote_n_address = "127.0.0.1"; local_n_address = "127.0.0.1"; local_n_portc = 50000; diff --git a/ci-scripts/conf_files/untested/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/untested/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf index fb9ef27e8a..7429c9bd93 100644 --- a/ci-scripts/conf_files/untested/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf +++ b/ci-scripts/conf_files/untested/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf @@ -179,7 +179,6 @@ gNBs = MACRLCs = ( { num_cc = 1; - local_s_if_name = "lo:"; remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.2"; // vnf addr local_s_portc = 50601; // vnf p5 port diff --git a/ci-scripts/conf_files/untested/rcc.band7.tm1.nfapi.conf b/ci-scripts/conf_files/untested/rcc.band7.tm1.nfapi.conf index f9782ead8b..e892ed99d0 100644 --- a/ci-scripts/conf_files/untested/rcc.band7.tm1.nfapi.conf +++ b/ci-scripts/conf_files/untested/rcc.band7.tm1.nfapi.conf @@ -204,7 +204,6 @@ eNBs = MACRLCs = ( { num_cc = 1; - local_s_if_name = "ens3"; remote_s_address = "CI_UE_IP_ADDR"; local_s_address = "CI_ENB_IP_ADDR"; local_s_portc = 50001; diff --git a/ci-scripts/yaml_files/5g_l2sim_tdd/README.md b/ci-scripts/yaml_files/5g_l2sim_tdd/README.md index 9062044b2c..7fdb1bb8be 100644 --- a/ci-scripts/yaml_files/5g_l2sim_tdd/README.md +++ b/ci-scripts/yaml_files/5g_l2sim_tdd/README.md @@ -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 ``` -In this section, you need to set the proper values 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: ```libconfig @@ -64,7 +64,6 @@ MACRLCs = ( { num_cc = 1; tr_n_preference = "nfapi"; - local_n_if_name = "eno1"; remote_n_address = "127.0.0.1"; //Proxy IP local_n_address = "127.0.0.1"; ... diff --git a/doc/F1-design.md b/doc/F1-design.md index a4e6882ab9..22781650f1 100644 --- a/doc/F1-design.md +++ b/doc/F1-design.md @@ -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 F1AP communication. -Note: all `local_*_if_name` parameters are ignored. - -Note 2: at the DU, you can bind to different interfaces for F1-C and F1-U with +Note: at the DU, you can bind to different interfaces for F1-C and F1-U with the options `MACRLCs.[0].local_n_address` and `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. diff --git a/doc/L2NFAPI_NOS1.md b/doc/L2NFAPI_NOS1.md index 46ea9aabbe..d9536b97a2 100644 --- a/doc/L2NFAPI_NOS1.md +++ b/doc/L2NFAPI_NOS1.md @@ -131,7 +131,6 @@ First verify the nFAPI interface setup on the physical ethernet interface of mac MACRLCs = ( { num_cc = 1; - local_s_if_name = "ens3"; // <-- HERE remote_s_address = "192.168.122.169"; // <-- HERE local_s_address = "192.168.122.31"; // <-- HERE local_s_portc = 50001; @@ -199,7 +198,6 @@ L1s = ( { num_cc = 1; tr_n_preference = "nfapi"; - local_n_if_name = "ens3"; // <- HERE remote_n_address = "192.168.122.31"; // <- HERE local_n_address = "192.168.122.169"; // <- HERE local_n_portc = 50000; diff --git a/doc/L2NFAPI_S1.md b/doc/L2NFAPI_S1.md index 3278072dd9..ea56006a91 100644 --- a/doc/L2NFAPI_S1.md +++ b/doc/L2NFAPI_S1.md @@ -136,7 +136,6 @@ First verify the nFAPI interface setup on the physical ethernet interface of mac MACRLCs = ( { num_cc = 1; - local_s_if_name = "ens3"; // <-- HERE remote_s_address = "192.168.122.169"; // <-- HERE local_s_address = "192.168.122.31"; // <-- HERE local_s_portc = 50001; @@ -204,7 +203,6 @@ L1s = ( { num_cc = 1; tr_n_preference = "nfapi"; - local_n_if_name = "ens3"; // <- HERE remote_n_address = "192.168.122.31"; // <- HERE local_n_address = "192.168.122.169"; // <- HERE local_n_portc = 50000; diff --git a/openair2/ENB_APP/L1_paramdef.h b/openair2/ENB_APP/L1_paramdef.h index f6d83c33ee..27196bb8ae 100644 --- a/openair2/ENB_APP/L1_paramdef.h +++ b/openair2/ENB_APP/L1_paramdef.h @@ -38,7 +38,6 @@ /* L1 configuration parameters names */ #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_REMOTE_N_ADDRESS "remote_n_address" #define CONFIG_STRING_L1_LOCAL_N_PORTC "local_n_portc" @@ -70,7 +69,6 @@ #define L1PARAMS_DESC { \ {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_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_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}, \ @@ -98,29 +96,28 @@ #define L1_CC_IDX 0 #define L1_TRANSPORT_N_PREFERENCE_IDX 1 -#define L1_LOCAL_N_IF_NAME_IDX 2 -#define L1_LOCAL_N_ADDRESS_IDX 3 -#define L1_REMOTE_N_ADDRESS_IDX 4 -#define L1_LOCAL_N_PORTC_IDX 5 -#define L1_REMOTE_N_PORTC_IDX 6 -#define L1_LOCAL_N_PORTD_IDX 7 -#define L1_REMOTE_N_PORTD_IDX 8 -#define L1_PRACH_DTX_THRESHOLD_IDX 9 -#define L1_PUCCH1_DTX_THRESHOLD_IDX 10 -#define L1_PUCCH1AB_DTX_THRESHOLD_IDX 11 -#define L1_PRACH_DTX_EMTC0_THRESHOLD_IDX 12 -#define L1_PUCCH1_DTX_EMTC0_THRESHOLD_IDX 13 -#define L1_PUCCH1AB_DTX_EMTC0_THRESHOLD_IDX 14 -#define L1_PRACH_DTX_EMTC1_THRESHOLD_IDX 15 -#define L1_PUCCH1_DTX_EMTC1_THRESHOLD_IDX 16 -#define L1_PUCCH1AB_DTX_EMTC1_THRESHOLD_IDX 17 -#define L1_PRACH_DTX_EMTC2_THRESHOLD_IDX 18 -#define L1_PUCCH1_DTX_EMTC2_THRESHOLD_IDX 19 -#define L1_PUCCH1AB_DTX_EMTC2_THRESHOLD_IDX 20 -#define L1_PRACH_DTX_EMTC3_THRESHOLD_IDX 21 -#define L1_PUCCH1_DTX_EMTC3_THRESHOLD_IDX 22 -#define L1_PUCCH1AB_DTX_EMTC3_THRESHOLD_IDX 23 -#define L1_PUSCH_SIGNAL_THRESHOLD_IDX 24 +#define L1_LOCAL_N_ADDRESS_IDX 2 +#define L1_REMOTE_N_ADDRESS_IDX 3 +#define L1_LOCAL_N_PORTC_IDX 4 +#define L1_REMOTE_N_PORTC_IDX 5 +#define L1_LOCAL_N_PORTD_IDX 6 +#define L1_REMOTE_N_PORTD_IDX 7 +#define L1_PRACH_DTX_THRESHOLD_IDX 8 +#define L1_PUCCH1_DTX_THRESHOLD_IDX 9 +#define L1_PUCCH1AB_DTX_THRESHOLD_IDX 10 +#define L1_PRACH_DTX_EMTC0_THRESHOLD_IDX 11 +#define L1_PUCCH1_DTX_EMTC0_THRESHOLD_IDX 12 +#define L1_PUCCH1AB_DTX_EMTC0_THRESHOLD_IDX 13 +#define L1_PRACH_DTX_EMTC1_THRESHOLD_IDX 14 +#define L1_PUCCH1_DTX_EMTC1_THRESHOLD_IDX 15 +#define L1_PUCCH1AB_DTX_EMTC1_THRESHOLD_IDX 16 +#define L1_PRACH_DTX_EMTC2_THRESHOLD_IDX 17 +#define L1_PUCCH1_DTX_EMTC2_THRESHOLD_IDX 18 +#define L1_PUCCH1AB_DTX_EMTC2_THRESHOLD_IDX 19 +#define L1_PRACH_DTX_EMTC3_THRESHOLD_IDX 20 +#define L1_PUCCH1_DTX_EMTC3_THRESHOLD_IDX 21 +#define L1_PUCCH1AB_DTX_EMTC3_THRESHOLD_IDX 22 +#define L1_PUSCH_SIGNAL_THRESHOLD_IDX 23 /*----------------------------------------------------------------------------------------------------------------------------------------------------*/ #endif diff --git a/openair2/ENB_APP/MACRLC_paramdef.h b/openair2/ENB_APP/MACRLC_paramdef.h index 3bd215c8df..4bfc5139c2 100644 --- a/openair2/ENB_APP/MACRLC_paramdef.h +++ b/openair2/ENB_APP/MACRLC_paramdef.h @@ -39,7 +39,6 @@ /* MACRLC configuration parameters names */ #define CONFIG_STRING_MACRLC_CC "num_cc" #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_REMOTE_N_ADDRESS "remote_n_address" #define CONFIG_STRING_MACRLC_LOCAL_N_PORTC "local_n_portc" @@ -47,7 +46,6 @@ #define CONFIG_STRING_MACRLC_LOCAL_N_PORTD "local_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_LOCAL_S_IF_NAME "local_s_if_name" #define CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS "local_s_address" #define CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS "remote_s_address" #define CONFIG_STRING_MACRLC_LOCAL_S_PORTC "local_s_portc" @@ -71,7 +69,6 @@ #define MACRLCPARAMS_DESC { \ {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_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_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}, \ @@ -79,7 +76,6 @@ {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_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_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}, \ @@ -100,30 +96,28 @@ #define MACRLC_CC_IDX 0 #define MACRLC_TRANSPORT_N_PREFERENCE_IDX 1 -#define MACRLC_LOCAL_N_IF_NAME_IDX 2 -#define MACRLC_LOCAL_N_ADDRESS_IDX 3 -#define MACRLC_REMOTE_N_ADDRESS_IDX 4 -#define MACRLC_LOCAL_N_PORTC_IDX 5 -#define MACRLC_REMOTE_N_PORTC_IDX 6 -#define MACRLC_LOCAL_N_PORTD_IDX 7 -#define MACRLC_REMOTE_N_PORTD_IDX 8 -#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 9 -#define MACRLC_LOCAL_S_IF_NAME_IDX 10 -#define MACRLC_LOCAL_S_ADDRESS_IDX 11 -#define MACRLC_REMOTE_S_ADDRESS_IDX 12 -#define MACRLC_LOCAL_S_PORTC_IDX 13 -#define MACRLC_REMOTE_S_PORTC_IDX 14 -#define MACRLC_LOCAL_S_PORTD_IDX 15 -#define MACRLC_REMOTE_S_PORTD_IDX 16 -#define MACRLC_SCHED_MODE_IDX 17 -#define MACRLC_PUSCH10xSNR_IDX 18 -#define MACRLC_PUCCH10xSNR_IDX 19 -#define MACRLC_DEFAULT_SCHED_DL_ALGO_IDX 20 -#define MACRLC_UE_MULTIPLE_MAX_IDX 21 -#define MACRLC_USE_MCS_OFFSET_IDX 22 -#define MACRLC_BLER_TARGET_LOWER_IDX 23 -#define MACRLC_BLER_TARGET_UPPER_IDX 24 -#define MACRLC_MAX_UL_RB_INDEX_IDX 25 +#define MACRLC_LOCAL_N_ADDRESS_IDX 2 +#define MACRLC_REMOTE_N_ADDRESS_IDX 3 +#define MACRLC_LOCAL_N_PORTC_IDX 4 +#define MACRLC_REMOTE_N_PORTC_IDX 5 +#define MACRLC_LOCAL_N_PORTD_IDX 6 +#define MACRLC_REMOTE_N_PORTD_IDX 7 +#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 8 +#define MACRLC_LOCAL_S_ADDRESS_IDX 9 +#define MACRLC_REMOTE_S_ADDRESS_IDX 10 +#define MACRLC_LOCAL_S_PORTC_IDX 11 +#define MACRLC_REMOTE_S_PORTC_IDX 12 +#define MACRLC_LOCAL_S_PORTD_IDX 13 +#define MACRLC_REMOTE_S_PORTD_IDX 14 +#define MACRLC_SCHED_MODE_IDX 15 +#define MACRLC_PUSCH10xSNR_IDX 16 +#define MACRLC_PUCCH10xSNR_IDX 17 +#define MACRLC_DEFAULT_SCHED_DL_ALGO_IDX 18 +#define MACRLC_UE_MULTIPLE_MAX_IDX 19 +#define MACRLC_USE_MCS_OFFSET_IDX 20 +#define MACRLC_BLER_TARGET_LOWER_IDX 21 +#define MACRLC_BLER_TARGET_UPPER_IDX 22 +#define MACRLC_MAX_UL_RB_INDEX_IDX 23 /*---------------------------------------------------------------------------------------------------------------------------------------------------------*/ #endif diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c index 1e4d9037a4..522024774e 100644 --- a/openair2/ENB_APP/enb_config.c +++ b/openair2/ENB_APP/enb_config.c @@ -101,7 +101,6 @@ void RCconfig_L1(void) { 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) { - 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.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); @@ -206,7 +205,6 @@ void RCconfig_macrlc(void) 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) { - 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.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); diff --git a/openair2/ENB_APP/enb_paramdef.h b/openair2/ENB_APP/enb_paramdef.h index 8e2ff45e21..70bf704ea5 100644 --- a/openair2/ENB_APP/enb_paramdef.h +++ b/openair2/ENB_APP/enb_paramdef.h @@ -262,7 +262,6 @@ typedef enum { #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_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_REMOTE_S_ADDRESS "remote_s_address" #define ENB_CONFIG_STRING_LOCAL_S_PORTC "local_s_portc" @@ -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_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_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_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}, \ @@ -321,24 +319,23 @@ typedef enum { #define ENB_MOBILE_COUNTRY_CODE_IDX_OLD 4 #define ENB_MOBILE_NETWORK_CODE_IDX_OLD 5 #define ENB_TRANSPORT_S_PREFERENCE_IDX 6 -#define ENB_LOCAL_S_IF_NAME_IDX 7 -#define ENB_LOCAL_S_ADDRESS_IDX 8 -#define ENB_REMOTE_S_ADDRESS_IDX 9 -#define ENB_LOCAL_S_PORTC_IDX 10 -#define ENB_REMOTE_S_PORTC_IDX 11 -#define ENB_LOCAL_S_PORTD_IDX 12 -#define ENB_REMOTE_S_PORTD_IDX 13 -#define ENB_NRCELLID_IDX 14 -#define ENB_RRC_INACTIVITY_THRES_IDX 15 -#define ENB_ENABLE_MEASUREMENT_REPORTS 16 -#define ENB_ENABLE_X2 17 -#define ENB_ENABLE_ENB_M2 18 -#define ENB_ENABLE_MCE_M2 19 -#define ENB_S1SETUP_RSP_TIMER_IDX 20 -#define ENB_S1SETUP_REQ_TIMER_IDX 21 -#define ENB_S1SETUP_REQ_COUNT_IDX 22 -#define ENB_SCTP_REQ_TIMER_IDX 23 -#define ENB_SCTP_REQ_COUNT_IDX 24 +#define ENB_LOCAL_S_ADDRESS_IDX 7 +#define ENB_REMOTE_S_ADDRESS_IDX 8 +#define ENB_LOCAL_S_PORTC_IDX 9 +#define ENB_REMOTE_S_PORTC_IDX 10 +#define ENB_LOCAL_S_PORTD_IDX 11 +#define ENB_REMOTE_S_PORTD_IDX 12 +#define ENB_NRCELLID_IDX 13 +#define ENB_RRC_INACTIVITY_THRES_IDX 14 +#define ENB_ENABLE_MEASUREMENT_REPORTS 15 +#define ENB_ENABLE_X2 16 +#define ENB_ENABLE_ENB_M2 17 +#define ENB_ENABLE_MCE_M2 18 +#define ENB_S1SETUP_RSP_TIMER_IDX 19 +#define ENB_S1SETUP_REQ_TIMER_IDX 20 +#define ENB_S1SETUP_REQ_COUNT_IDX 21 +#define ENB_SCTP_REQ_TIMER_IDX 22 +#define ENB_SCTP_REQ_COUNT_IDX 23 #define TRACKING_AREA_CODE_OKRANGE {0x0001,0xFFFD} // clang-format off @@ -1192,7 +1189,6 @@ typedef struct srb1_params_s { /* MACRLC configuration parameters names */ #define CONFIG_STRING_MACRLC_CC "num_cc" #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_REMOTE_N_ADDRESS "remote_n_address" #define CONFIG_STRING_MACRLC_LOCAL_N_PORTC "local_n_portc" @@ -1200,7 +1196,6 @@ typedef struct srb1_params_s { #define CONFIG_STRING_MACRLC_LOCAL_N_PORTD "local_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_LOCAL_S_IF_NAME "local_s_if_name" #define CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS "local_s_address" #define CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS "remote_s_address" #define CONFIG_STRING_MACRLC_LOCAL_S_PORTC "local_s_portc" @@ -1211,22 +1206,20 @@ typedef struct srb1_params_s { #define MACRLC_CC_IDX 0 #define MACRLC_TRANSPORT_N_PREFERENCE_IDX 1 -#define MACRLC_LOCAL_N_IF_NAME_IDX 2 -#define MACRLC_LOCAL_N_ADDRESS_IDX 3 -#define MACRLC_REMOTE_N_ADDRESS_IDX 4 -#define MACRLC_LOCAL_N_PORTC_IDX 5 -#define MACRLC_REMOTE_N_PORTC_IDX 6 -#define MACRLC_LOCAL_N_PORTD_IDX 7 -#define MACRLC_REMOTE_N_PORTD_IDX 8 -#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 9 -#define MACRLC_LOCAL_S_IF_NAME_IDX 10 -#define MACRLC_LOCAL_S_ADDRESS_IDX 11 -#define MACRLC_REMOTE_S_ADDRESS_IDX 12 -#define MACRLC_LOCAL_S_PORTC_IDX 13 -#define MACRLC_REMOTE_S_PORTC_IDX 14 -#define MACRLC_LOCAL_S_PORTD_IDX 15 -#define MACRLC_REMOTE_S_PORTD_IDX 16 -#define MACRLC_SCHED_MODE_IDX 17 +#define MACRLC_LOCAL_N_ADDRESS_IDX 2 +#define MACRLC_REMOTE_N_ADDRESS_IDX 3 +#define MACRLC_LOCAL_N_PORTC_IDX 4 +#define MACRLC_REMOTE_N_PORTC_IDX 5 +#define MACRLC_LOCAL_N_PORTD_IDX 6 +#define MACRLC_REMOTE_N_PORTD_IDX 7 +#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 8 +#define MACRLC_LOCAL_S_ADDRESS_IDX 9 +#define MACRLC_REMOTE_S_ADDRESS_IDX 10 +#define MACRLC_LOCAL_S_PORTC_IDX 11 +#define MACRLC_REMOTE_S_PORTC_IDX 12 +#define MACRLC_LOCAL_S_PORTD_IDX 13 +#define MACRLC_REMOTE_S_PORTD_IDX 14 +#define MACRLC_SCHED_MODE_IDX 15 /*---------------------------------------------------------------------------------------------------------------------------------------------------------*/ /* thread configuration parameters section name */ diff --git a/openair2/GNB_APP/L1_nr_paramdef.h b/openair2/GNB_APP/L1_nr_paramdef.h index b503825c8e..1c3d7e98ec 100644 --- a/openair2/GNB_APP/L1_nr_paramdef.h +++ b/openair2/GNB_APP/L1_nr_paramdef.h @@ -38,7 +38,6 @@ /* L1 configuration parameters names */ #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_REMOTE_N_ADDRESS "remote_n_address" #define CONFIG_STRING_L1_LOCAL_N_PORTC "local_n_portc" @@ -68,7 +67,6 @@ #define L1PARAMS_DESC { \ {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_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_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}, \ @@ -90,24 +88,23 @@ // clang-format on #define L1_CC_IDX 0 #define L1_TRANSPORT_N_PREFERENCE_IDX 1 -#define L1_LOCAL_N_IF_NAME_IDX 2 -#define L1_LOCAL_N_ADDRESS_IDX 3 -#define L1_REMOTE_N_ADDRESS_IDX 4 -#define L1_LOCAL_N_PORTC_IDX 5 -#define L1_REMOTE_N_PORTC_IDX 6 -#define L1_LOCAL_N_PORTD_IDX 7 -#define L1_REMOTE_N_PORTD_IDX 8 -#define L1_THREAD_POOL_SIZE 9 -#define L1_OFDM_OFFSET_DIVISOR 10 -#define L1_PUCCH0_DTX_THRESHOLD 11 -#define L1_PRACH_DTX_THRESHOLD 12 -#define L1_PUSCH_DTX_THRESHOLD 13 -#define L1_SRS_DTX_THRESHOLD 14 -#define L1_MAX_LDPC_ITERATIONS 15 -#define L1_RX_THREAD_CORE 16 -#define L1_TX_THREAD_CORE 17 -#define L1_TX_AMP_BACKOFF_dB 18 -#define L1_PHASE_COMP 19 +#define L1_LOCAL_N_ADDRESS_IDX 2 +#define L1_REMOTE_N_ADDRESS_IDX 3 +#define L1_LOCAL_N_PORTC_IDX 4 +#define L1_REMOTE_N_PORTC_IDX 5 +#define L1_LOCAL_N_PORTD_IDX 6 +#define L1_REMOTE_N_PORTD_IDX 7 +#define L1_THREAD_POOL_SIZE 8 +#define L1_OFDM_OFFSET_DIVISOR 9 +#define L1_PUCCH0_DTX_THRESHOLD 10 +#define L1_PRACH_DTX_THRESHOLD 11 +#define L1_PUSCH_DTX_THRESHOLD 12 +#define L1_SRS_DTX_THRESHOLD 13 +#define L1_MAX_LDPC_ITERATIONS 14 +#define L1_RX_THREAD_CORE 15 +#define L1_TX_THREAD_CORE 16 +#define L1_TX_AMP_BACKOFF_dB 17 +#define L1_PHASE_COMP 18 /*----------------------------------------------------------------------------------------------------------------------------------------------------*/ #endif diff --git a/openair2/GNB_APP/MACRLC_nr_paramdef.h b/openair2/GNB_APP/MACRLC_nr_paramdef.h index cff2280532..e235de858f 100644 --- a/openair2/GNB_APP/MACRLC_nr_paramdef.h +++ b/openair2/GNB_APP/MACRLC_nr_paramdef.h @@ -39,7 +39,6 @@ /* MACRLC configuration parameters names */ #define CONFIG_STRING_MACRLC_CC "num_cc" #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_F1U "local_n_address_f1u" #define CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS "remote_n_address" @@ -48,7 +47,6 @@ #define CONFIG_STRING_MACRLC_LOCAL_N_PORTD "local_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_LOCAL_S_IF_NAME "local_s_if_name" #define CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS "local_s_address" #define CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS "remote_s_address" #define CONFIG_STRING_MACRLC_LOCAL_S_PORTC "local_s_portc" @@ -94,7 +92,6 @@ #define MACRLCPARAMS_DESC { \ {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_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_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}, \ @@ -102,7 +99,6 @@ {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_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_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}, \ @@ -132,39 +128,37 @@ #define MACRLC_CC_IDX 0 #define MACRLC_TRANSPORT_N_PREFERENCE_IDX 1 -#define MACRLC_LOCAL_N_IF_NAME_IDX 2 -#define MACRLC_LOCAL_N_ADDRESS_IDX 3 -#define MACRLC_REMOTE_N_ADDRESS_IDX 4 -#define MACRLC_LOCAL_N_PORTC_IDX 5 -#define MACRLC_REMOTE_N_PORTC_IDX 6 -#define MACRLC_LOCAL_N_PORTD_IDX 7 -#define MACRLC_REMOTE_N_PORTD_IDX 8 -#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 9 -#define MACRLC_LOCAL_S_IF_NAME_IDX 10 -#define MACRLC_LOCAL_S_ADDRESS_IDX 11 -#define MACRLC_REMOTE_S_ADDRESS_IDX 12 -#define MACRLC_LOCAL_S_PORTC_IDX 13 -#define MACRLC_REMOTE_S_PORTC_IDX 14 -#define MACRLC_LOCAL_S_PORTD_IDX 15 -#define MACRLC_REMOTE_S_PORTD_IDX 16 -#define MACRLC_ULSCH_MAX_FRAME_INACTIVITY 17 -#define MACRLC_PUSCHTARGETSNRX10_IDX 18 -#define MACRLC_PUCCHTARGETSNRX10_IDX 19 -#define MACRLC_UL_PRBBLACK_SNR_THRESHOLD_IDX 20 -#define MACRLC_PUCCHFAILURETHRES_IDX 21 -#define MACRLC_PUSCHFAILURETHRES_IDX 22 -#define MACRLC_DL_BLER_TARGET_UPPER_IDX 23 -#define MACRLC_DL_BLER_TARGET_LOWER_IDX 24 -#define MACRLC_DL_MAX_MCS_IDX 25 -#define MACRLC_UL_BLER_TARGET_UPPER_IDX 26 -#define MACRLC_UL_BLER_TARGET_LOWER_IDX 27 -#define MACRLC_UL_MAX_MCS_IDX 28 -#define MACRLC_DL_HARQ_ROUND_MAX_IDX 29 -#define MACRLC_UL_HARQ_ROUND_MAX_IDX 30 -#define MACRLC_MIN_GRANT_PRB_IDX 31 -#define MACRLC_MIN_GRANT_MCS_IDX 32 -#define MACRLC_IDENTITY_PM_IDX 33 -#define MACRLC_LOCAL_N_ADDRESS_F1U_IDX 34 +#define MACRLC_LOCAL_N_ADDRESS_IDX 2 +#define MACRLC_REMOTE_N_ADDRESS_IDX 3 +#define MACRLC_LOCAL_N_PORTC_IDX 4 +#define MACRLC_REMOTE_N_PORTC_IDX 5 +#define MACRLC_LOCAL_N_PORTD_IDX 6 +#define MACRLC_REMOTE_N_PORTD_IDX 7 +#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 8 +#define MACRLC_LOCAL_S_ADDRESS_IDX 9 +#define MACRLC_REMOTE_S_ADDRESS_IDX 10 +#define MACRLC_LOCAL_S_PORTC_IDX 11 +#define MACRLC_REMOTE_S_PORTC_IDX 12 +#define MACRLC_LOCAL_S_PORTD_IDX 13 +#define MACRLC_REMOTE_S_PORTD_IDX 14 +#define MACRLC_ULSCH_MAX_FRAME_INACTIVITY 15 +#define MACRLC_PUSCHTARGETSNRX10_IDX 16 +#define MACRLC_PUCCHTARGETSNRX10_IDX 17 +#define MACRLC_UL_PRBBLACK_SNR_THRESHOLD_IDX 18 +#define MACRLC_PUCCHFAILURETHRES_IDX 19 +#define MACRLC_PUSCHFAILURETHRES_IDX 20 +#define MACRLC_DL_BLER_TARGET_UPPER_IDX 21 +#define MACRLC_DL_BLER_TARGET_LOWER_IDX 22 +#define MACRLC_DL_MAX_MCS_IDX 23 +#define MACRLC_UL_BLER_TARGET_UPPER_IDX 24 +#define MACRLC_UL_BLER_TARGET_LOWER_IDX 25 +#define MACRLC_UL_MAX_MCS_IDX 26 +#define MACRLC_DL_HARQ_ROUND_MAX_IDX 27 +#define MACRLC_UL_HARQ_ROUND_MAX_IDX 28 +#define MACRLC_MIN_GRANT_PRB_IDX 29 +#define MACRLC_MIN_GRANT_MCS_IDX 30 +#define MACRLC_IDENTITY_PM_IDX 31 +#define MACRLC_LOCAL_N_ADDRESS_F1U_IDX 32 #define MACRLCPARAMS_CHECK { \ { .s5 = { NULL } }, \ @@ -194,8 +188,6 @@ { .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} } }, /* UL max HARQ rounds */ \ { .s5 = { NULL } }, \ diff --git a/openair2/GNB_APP/gnb_config.c b/openair2/GNB_APP/gnb_config.c index 73c21c323f..704591d08e 100644 --- a/openair2/GNB_APP/gnb_config.c +++ b/openair2/GNB_APP/gnb_config.c @@ -892,7 +892,6 @@ void RCconfig_NR_L1(void) 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 } 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.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); @@ -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 || strcmp(*(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_N_PREFERENCE_IDX].strptr), "cudu") == 0) { 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; RC.nrmac[j]->eth_params_n.my_addr = strdup(*f1caddr); 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) 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) { - 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.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); @@ -1581,7 +1578,6 @@ void RCconfig_NRRRC(gNB_RRC_INST *rrc) 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)); 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.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.my_portc = *(GNBParamList.paramarray[i][GNB_LOCAL_S_PORTC_IDX].uptr); @@ -1598,7 +1594,6 @@ void RCconfig_NRRRC(gNB_RRC_INST *rrc) 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) { - 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.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); diff --git a/openair2/GNB_APP/gnb_paramdef.h b/openair2/GNB_APP/gnb_paramdef.h index d729dd3d7d..7e536c4c84 100644 --- a/openair2/GNB_APP/gnb_paramdef.h +++ b/openair2/GNB_APP/gnb_paramdef.h @@ -107,7 +107,6 @@ typedef enum { #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_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_REMOTE_S_ADDRESS "remote_s_address" #define GNB_CONFIG_STRING_LOCAL_S_PORTC "local_s_portc" @@ -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_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_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_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}, \ @@ -184,29 +182,28 @@ typedef enum { #define GNB_MOBILE_COUNTRY_CODE_IDX_OLD 4 #define GNB_MOBILE_NETWORK_CODE_IDX_OLD 5 #define GNB_TRANSPORT_S_PREFERENCE_IDX 6 -#define GNB_LOCAL_S_IF_NAME_IDX 7 -#define GNB_LOCAL_S_ADDRESS_IDX 8 -#define GNB_REMOTE_S_ADDRESS_IDX 9 -#define GNB_LOCAL_S_PORTC_IDX 10 -#define GNB_REMOTE_S_PORTC_IDX 11 -#define GNB_LOCAL_S_PORTD_IDX 12 -#define GNB_REMOTE_S_PORTD_IDX 13 -#define GNB_PDSCH_ANTENNAPORTS_N1_IDX 14 -#define GNB_PDSCH_ANTENNAPORTS_N2_IDX 15 -#define GNB_PDSCH_ANTENNAPORTS_XP_IDX 16 -#define GNB_PUSCH_ANTENNAPORTS_IDX 17 -#define GNB_SIB1_TDA_IDX 18 -#define GNB_DO_CSIRS_IDX 19 -#define GNB_DO_SRS_IDX 20 -#define GNB_NRCELLID_IDX 21 -#define GNB_MINRXTXTIME_IDX 22 -#define GNB_ULPRBBLACKLIST_IDX 23 -#define GNB_UMONDEFAULTDRB_IDX 24 -#define GNB_FORCE256QAMOFF_IDX 25 -#define GNB_ENABLE_SDAP_IDX 26 -#define GNB_DRBS 27 -#define GNB_GNB_DU_ID_IDX 28 -#define GNB_GNB_CU_UP_ID_IDX 29 +#define GNB_LOCAL_S_ADDRESS_IDX 7 +#define GNB_REMOTE_S_ADDRESS_IDX 8 +#define GNB_LOCAL_S_PORTC_IDX 9 +#define GNB_REMOTE_S_PORTC_IDX 10 +#define GNB_LOCAL_S_PORTD_IDX 11 +#define GNB_REMOTE_S_PORTD_IDX 12 +#define GNB_PDSCH_ANTENNAPORTS_N1_IDX 13 +#define GNB_PDSCH_ANTENNAPORTS_N2_IDX 14 +#define GNB_PDSCH_ANTENNAPORTS_XP_IDX 15 +#define GNB_PUSCH_ANTENNAPORTS_IDX 16 +#define GNB_SIB1_TDA_IDX 17 +#define GNB_DO_CSIRS_IDX 18 +#define GNB_DO_SRS_IDX 19 +#define GNB_NRCELLID_IDX 20 +#define GNB_MINRXTXTIME_IDX 21 +#define GNB_ULPRBBLACKLIST_IDX 22 +#define GNB_UMONDEFAULTDRB_IDX 23 +#define GNB_FORCE256QAMOFF_IDX 24 +#define GNB_ENABLE_SDAP_IDX 25 +#define GNB_DRBS 26 +#define GNB_GNB_DU_ID_IDX 27 +#define GNB_GNB_CU_UP_ID_IDX 28 #define TRACKING_AREA_CODE_OKRANGE {0x0001,0xFFFD} #define GNBPARAMS_CHECK { \ @@ -406,7 +403,6 @@ typedef enum { /* MACRLC configuration parameters names */ #define CONFIG_STRING_MACRLC_CC "num_cc" #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_REMOTE_N_ADDRESS "remote_n_address" #define CONFIG_STRING_MACRLC_LOCAL_N_PORTC "local_n_portc" @@ -414,7 +410,6 @@ typedef enum { #define CONFIG_STRING_MACRLC_LOCAL_N_PORTD "local_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_LOCAL_S_IF_NAME "local_s_if_name" #define CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS "local_s_address" #define CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS "remote_s_address" #define CONFIG_STRING_MACRLC_LOCAL_S_PORTC "local_s_portc" @@ -425,22 +420,20 @@ typedef enum { #define MACRLC_CC_IDX 0 #define MACRLC_TRANSPORT_N_PREFERENCE_IDX 1 -#define MACRLC_LOCAL_N_IF_NAME_IDX 2 -#define MACRLC_LOCAL_N_ADDRESS_IDX 3 -#define MACRLC_REMOTE_N_ADDRESS_IDX 4 -#define MACRLC_LOCAL_N_PORTC_IDX 5 -#define MACRLC_REMOTE_N_PORTC_IDX 6 -#define MACRLC_LOCAL_N_PORTD_IDX 7 -#define MACRLC_REMOTE_N_PORTD_IDX 8 -#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 9 -#define MACRLC_LOCAL_S_IF_NAME_IDX 10 -#define MACRLC_LOCAL_S_ADDRESS_IDX 11 -#define MACRLC_REMOTE_S_ADDRESS_IDX 12 -#define MACRLC_LOCAL_S_PORTC_IDX 13 -#define MACRLC_REMOTE_S_PORTC_IDX 14 -#define MACRLC_LOCAL_S_PORTD_IDX 15 -#define MACRLC_REMOTE_S_PORTD_IDX 16 -#define MACRLC_SCHED_MODE_IDX 17 +#define MACRLC_LOCAL_N_ADDRESS_IDX 2 +#define MACRLC_REMOTE_N_ADDRESS_IDX 3 +#define MACRLC_LOCAL_N_PORTC_IDX 4 +#define MACRLC_REMOTE_N_PORTC_IDX 5 +#define MACRLC_LOCAL_N_PORTD_IDX 6 +#define MACRLC_REMOTE_N_PORTD_IDX 7 +#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 8 +#define MACRLC_LOCAL_S_ADDRESS_IDX 9 +#define MACRLC_REMOTE_S_ADDRESS_IDX 10 +#define MACRLC_LOCAL_S_PORTC_IDX 11 +#define MACRLC_REMOTE_S_PORTC_IDX 12 +#define MACRLC_LOCAL_S_PORTD_IDX 13 +#define MACRLC_REMOTE_S_PORTD_IDX 14 +#define MACRLC_SCHED_MODE_IDX 15 /* thread configuration parameters section name */ diff --git a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c index 92b8bd49aa..d9cdc74eb9 100644 --- a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c +++ b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c @@ -1302,8 +1302,6 @@ void RCconfig_nr_ue_macrlc(void) { if (MACRLC_ParamList.numelt > 0) { for (j = 0; j < MACRLC_ParamList.numelt; j++) { 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( *(MACRLC_ParamList.paramarray[j][MACRLC_LOCAL_N_ADDRESS_IDX].strptr)); stub_eth_params.remote_addr = strdup( diff --git a/openair2/PHY_INTERFACE/phy_stub_UE.c b/openair2/PHY_INTERFACE/phy_stub_UE.c index 9b87f06ba8..af82d6093d 100644 --- a/openair2/PHY_INTERFACE/phy_stub_UE.c +++ b/openair2/PHY_INTERFACE/phy_stub_UE.c @@ -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 // 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) { - stub_eth_params.local_if_name = strdup( - *(L1_ParamList.paramarray[j][L1_LOCAL_N_IF_NAME_IDX].strptr)); stub_eth_params.my_addr = strdup( *(L1_ParamList.paramarray[j][L1_LOCAL_N_ADDRESS_IDX].strptr)); stub_eth_params.remote_addr = strdup( diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf index a492cee192..86d6a1d25a 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf @@ -19,7 +19,6 @@ eNBs = ( tr_s_preference = "f1" - local_s_if_name = "lo"; remote_s_address = "192.168.12.4"; local_s_address = "192.168.12.45"; local_s_portc = 501; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/du.lte.band7.10MHz.if4p5.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/du.lte.band7.10MHz.if4p5.conf index 17202fde04..f66bc1b29e 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/du.lte.band7.10MHz.if4p5.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/du.lte.band7.10MHz.if4p5.conf @@ -63,7 +63,6 @@ MACRLCs = ( num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; - local_n_if_name = "lo"; remote_n_address = "127.0.0.4"; local_n_address = "127.0.0.3"; local_n_portc = 500; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf index a52841158c..b83075840c 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf @@ -13,7 +13,6 @@ log_config = { # { # num_cc = 1; # tr_n_preference = "nfapi"; -# local_n_if_name = "eno1"; # remote_n_address = "192.168.1.28"; # local_n_address = "192.168.1.74"; # local_n_portc = 50000; @@ -28,10 +27,8 @@ L1s = ( { num_cc = 1; tr_n_preference = "nfapi"; - #local_n_if_name = "enp0s31f6"; #remote_n_address = "10.0.0.2"; #local_n_address = "10.0.0.1"; - local_n_if_name = "lo"; remote_n_address = "127.0.0.2"; local_n_address = "127.0.0.1"; local_n_portc = 50000; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf index 818cd3a0be..5aa6a207f4 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf @@ -14,7 +14,6 @@ L1s = ( { num_cc = 1; tr_n_preference = "nfapi"; - local_n_if_name = "lo"; remote_n_address = "127.0.0.2"; // vnf addr local_n_address = "127.0.0.1"; // pnf addr local_n_portc = 50000; // pnf p5 port [!] diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf index 4c0931858a..0b871b436b 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf @@ -173,7 +173,6 @@ eNBs = MACRLCs = ( { num_cc = 1; - local_s_if_name = "eno1"; remote_s_address = "10.0.0.2"; #local_s_address = "192.168.1.78"; local_s_address = "10.0.0.1"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf index 8d6bf3b4d0..2a4f5c143f 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf @@ -211,7 +211,6 @@ eNBs = MACRLCs = ( { num_cc = 1; - local_s_if_name = "lo:"; remote_s_address = "127.0.0.1"; local_s_address = "127.0.0.2"; local_s_portc = 50001; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf index a4dcb8e13b..c6565e55c7 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf @@ -205,7 +205,6 @@ gNBs = MACRLCs = ( { num_cc = 1; - local_s_if_name = "lo:"; remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.2"; // vnf addr local_s_portc = 50001; // vnf p5 port diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf index 85e7546196..1a3ace731c 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf @@ -21,7 +21,6 @@ gNBs = tr_s_preference = "f1"; - local_s_if_name = "lo"; local_s_address = "127.0.0.4"; remote_s_address = "127.0.0.3"; local_s_portc = 501; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf index f3c95f1bc7..b8447ca40f 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf @@ -168,7 +168,6 @@ MACRLCs = ( num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; - local_n_if_name = "lo"; local_n_address = "127.0.0.3"; remote_n_address = "127.0.0.4"; local_n_portc = 500; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.aerial.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.aerial.conf index 188a37272a..50563fe482 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.aerial.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.aerial.conf @@ -211,7 +211,6 @@ gNBs = MACRLCs = ( { num_cc = 1; - local_s_if_name = "lo:"; remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.2"; // vnf addr local_s_portc = 50001; // vnf p5 port diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/pnf.sa.band78.rfsim.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/pnf.sa.band78.rfsim.conf index 1e729f7d02..6c3626ac81 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/pnf.sa.band78.rfsim.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/pnf.sa.band78.rfsim.conf @@ -3,7 +3,6 @@ L1s = ( { num_cc = 1; tr_n_preference = "nfapi"; - local_n_if_name = "lo"; remote_n_address = "127.0.0.2"; // vnf addr local_n_address = "127.0.0.1"; // pnf addr local_n_portc = 50000; // pnf p5 port [!] diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/vnf.sa.band78.106prb.rfsim.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/vnf.sa.band78.106prb.rfsim.conf index 247b3502d5..c048760001 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/vnf.sa.band78.106prb.rfsim.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/vnf.sa.band78.106prb.rfsim.conf @@ -198,7 +198,6 @@ gNBs = MACRLCs = ( { num_cc = 1; - local_s_if_name = "lo:"; remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.2"; // vnf addr local_s_portc = 50001; // vnf p5 port