From a193518579fd4a300f3dc45014e88c72979254c4 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 20 Mar 2024 16:44:14 +0100 Subject: [PATCH 01/20] Revert "F1AP SCTP: don't bind local address" This reverts commit 284116522b7d90d9dfb08d7b72397b3c8fde207e. The problem is that (1) we don't really support multi-homing, but (2) on some system, if the other IP addresses that the operating system considers part of the multi-homed connection are HEARTBEAT'ed (e.g., docker), they answer with SCTP ABORT, which breaks the entire connection. In other words, force single-homing by binding. For F1-U uses, another option will be introduced that allows to bind to a separate interface for F1-U (separate from F1-C), if necessary. Closes #727 --- openair2/F1AP/f1ap_du_task.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openair2/F1AP/f1ap_du_task.c b/openair2/F1AP/f1ap_du_task.c index c2f690107c..f8416d3550 100644 --- a/openair2/F1AP/f1ap_du_task.c +++ b/openair2/F1AP/f1ap_du_task.c @@ -64,6 +64,8 @@ void du_task_send_sctp_association_req(instance_t instance, f1ap_net_config_t *n sctp_new_association_req_p->out_streams = 2; //du_inst->sctp_out_streams; // remote memcpy(&sctp_new_association_req_p->remote_address, &nc->CU_f1_ip_address, sizeof(nc->CU_f1_ip_address)); + // local + memcpy(&sctp_new_association_req_p->local_address, &nc->DU_f1_ip_address, sizeof(nc->DU_f1_ip_address)); // du_f1ap_register_to_sctp itti_send_msg_to_task(TASK_SCTP, instance, message_p); } From e65cb0cf42f66f88fee68d329306296a8199befb Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Thu, 21 Mar 2024 08:04:32 +0100 Subject: [PATCH 02/20] Introduce additional option to bind on separate IFs for F1-C/U in DU After the last commit, it is not possible to bind on separate interfaces for F1-C and F1-U. In other words, it is for instance not possible to have the F1-C on one subnet on one physical interface, and F1-U on another subnet on another physical interface. This commit introduces a second option MACRLCs.[0].local_n_address_f1u to allow to bind F1-U on an alternative address; if it is not specified, the interface of F1-C is reused. The above only works for the DU; no corresponding option exists for the CU. For the CU, use separate CU-CP and CU-UP. Use it in the CI. --- .../5g_rfsimulator_e1/docker-compose.yaml | 9 ++++--- doc/F1-design.md | 26 +++++++++++++------ openair2/COMMON/f1ap_messages_types.h | 3 ++- openair2/F1AP/f1ap_du_task.c | 4 +-- openair2/F1AP/f1ap_du_ue_context_management.c | 2 +- openair2/GNB_APP/MACRLC_nr_paramdef.h | 4 +++ openair2/GNB_APP/gnb_config.c | 5 +++- openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c | 24 ++++++++--------- openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h | 2 ++ 9 files changed, 50 insertions(+), 29 deletions(-) diff --git a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml index 3e73e60a27..a6fa3bd715 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml @@ -187,8 +187,9 @@ services: container_name: rfsim5g-oai-du environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time - --MACRLCs.[0].local_n_address 192.168.73.3 + --MACRLCs.[0].local_n_address 192.168.72.3 --MACRLCs.[0].remote_n_address 192.168.72.2 + --MACRLCs.[0].local_n_address_f1u 192.168.73.3 ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-cucp @@ -217,8 +218,9 @@ services: --gNBs.[0].gNB_DU_ID 0xe01 --gNBs.[0].nr_cellid 87654321 --gNBs.[0].servingCellConfigCommon.[0].physCellId 1 - --MACRLCs.[0].local_n_address 192.168.74.3 --MACRLCs.[0].remote_n_address 192.168.72.2 + --MACRLCs.[0].local_n_address 192.168.72.4 + --MACRLCs.[0].local_n_address_f1u 192.168.74.3 ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-cucp @@ -247,8 +249,9 @@ services: --gNBs.[0].gNB_DU_ID 0xe02 --gNBs.[0].nr_cellid 11111111 --gNBs.[0].servingCellConfigCommon.[0].physCellId 2 - --MACRLCs.[0].local_n_address 192.168.76.3 --MACRLCs.[0].remote_n_address 192.168.72.2 + --MACRLCs.[0].local_n_address 192.168.72.5 + --MACRLCs.[0].local_n_address_f1u 192.168.76.3 ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-cucp diff --git a/doc/F1-design.md b/doc/F1-design.md index 115ad916d2..a4e6882ab9 100644 --- a/doc/F1-design.md +++ b/doc/F1-design.md @@ -124,11 +124,12 @@ gNB, are, in order: (`tr_s_preference`), it is a CU. 3. It is a (monolithic) gNB. -## Local network deployment of F1 +## F1 IP configuration for Local network deployment of F1 -For a local deployment, you should update the following fields. -We assume that the CU will bind on `192.168.70.129` towards the core, -`127.0.0.3` towards the DU, and the DU `127.0.0.4` towards the CU. +The following paragraphs explain the IP configuration for F1 in the OAI config +files on the example of a a local deployment. We assume that the CU will bind +on `192.168.70.129` towards the core, `127.0.0.3` towards the DU, and the DU +`127.0.0.4` towards the CU. In the CU file: - Update the `gNBs.[0].amf_ip_address` and `gNBs.[0].NETWORK_INTERFACES` @@ -138,8 +139,8 @@ In the CU file: - `gNBs.[0].NETWORK_INTERFACES.GNB_IPV4_ADDRESS_FOR_NG_AMF 192.168.70.129` - `gNBs.[0].NETWORK_INTERFACES.GNB_IPV4_ADDRESS_FOR_NGU 192.168.70.132` - Set `gNBs.[0].tr_s_preference` (transport south-bound) to `f1` -- Update the `gNBs.[0].local_s_address` (CU-local south address) for the F1-C - south-bound interface: `127.0.0.3` +- Update the `gNBs.[0].local_s_address` (CU-local south address) for the + F1-C/SCTP and F1-U/GTP/UDP south-bound interfaces: `127.0.0.3` - Note: the `gNBs.[0].remote_s_address` (CU-remote/DU south address) is ignored, but we recommend to put `0.0.0.0` ("any") - Ports should match the ones in the DU config, but for simplicity and @@ -152,14 +153,23 @@ In the CU file: In the DU file: - Set `MACRLCs.[0].tr_n_preference` to `f1` - Update `MACRLCs.[0].local_n_address` (local north-bound address of the DU) to - `127.0.0.4`. This IP address is used to bind the GTP socket (F1-U user plane - traffic). + `127.0.0.4`. This IP address is used to bind the F1-C/SCTP and F1-U/GTP/UDP + socket. +- If you need to bind to different addresses for F1-C and F1-U, there is a + second option `MACRLCs.[0].local_n_address_f1u` which is used to bind + F1-U/GTP/UDP instead; F1-C/SCTP will still bind to the address in + `MACRLCs.[0].local_n_address`. - Update `MACRLCs.[].remote_n_address` (remote north-bound address of the CU) 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 +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. + ## Configuration of multiple DUs Upon F1 Setup Request of a new DU, the CU cross-checks that diff --git a/openair2/COMMON/f1ap_messages_types.h b/openair2/COMMON/f1ap_messages_types.h index c5ffe0f738..f99f4ce250 100644 --- a/openair2/COMMON/f1ap_messages_types.h +++ b/openair2/COMMON/f1ap_messages_types.h @@ -78,7 +78,8 @@ typedef net_ip_address_t f1ap_net_ip_address_t; typedef struct f1ap_net_config_t { f1ap_net_ip_address_t CU_f1_ip_address; - f1ap_net_ip_address_t DU_f1_ip_address; + f1ap_net_ip_address_t DU_f1c_ip_address; + char *DU_f1u_ip_address; uint16_t CUport; uint16_t DUport; } f1ap_net_config_t; diff --git a/openair2/F1AP/f1ap_du_task.c b/openair2/F1AP/f1ap_du_task.c index f8416d3550..1783e9d909 100644 --- a/openair2/F1AP/f1ap_du_task.c +++ b/openair2/F1AP/f1ap_du_task.c @@ -43,7 +43,7 @@ instance_t DUuniqInstance=0; static instance_t du_create_gtpu_instance_to_cu(const f1ap_net_config_t *nc) { openAddr_t tmp = {0}; - strncpy(tmp.originHost, nc->DU_f1_ip_address.ipv4_address, sizeof(tmp.originHost) - 1); + strncpy(tmp.originHost, nc->DU_f1u_ip_address, sizeof(tmp.originHost) - 1); strncpy(tmp.destinationHost, nc->CU_f1_ip_address.ipv4_address, sizeof(tmp.destinationHost) - 1); sprintf(tmp.originService, "%d", nc->DUport); sprintf(tmp.destinationService, "%d", nc->CUport); @@ -65,7 +65,7 @@ void du_task_send_sctp_association_req(instance_t instance, f1ap_net_config_t *n // remote memcpy(&sctp_new_association_req_p->remote_address, &nc->CU_f1_ip_address, sizeof(nc->CU_f1_ip_address)); // local - memcpy(&sctp_new_association_req_p->local_address, &nc->DU_f1_ip_address, sizeof(nc->DU_f1_ip_address)); + memcpy(&sctp_new_association_req_p->local_address, &nc->DU_f1c_ip_address, sizeof(nc->DU_f1c_ip_address)); // du_f1ap_register_to_sctp itti_send_msg_to_task(TASK_SCTP, instance, message_p); } diff --git a/openair2/F1AP/f1ap_du_ue_context_management.c b/openair2/F1AP/f1ap_du_ue_context_management.c index 3715c0ae5d..4d7be74a49 100644 --- a/openair2/F1AP/f1ap_du_ue_context_management.c +++ b/openair2/F1AP/f1ap_du_ue_context_management.c @@ -1189,7 +1189,7 @@ int DU_send_UE_CONTEXT_MODIFICATION_RESPONSE(sctp_assoc_t assoc_id, f1ap_ue_cont asn1cCalloc(dLUPTNLInformation_ToBeSetup_Item->dLUPTNLInformation.choice.gTPTunnel, gTPTunnel); /* transportLayerAddress */ struct sockaddr_in addr= {0}; - inet_pton(AF_INET, getCxt(0)->net_config.DU_f1_ip_address.ipv4_address, &addr.sin_addr.s_addr); + inet_pton(AF_INET, getCxt(0)->net_config.DU_f1u_ip_address, &addr.sin_addr.s_addr); TRANSPORT_LAYER_ADDRESS_IPv4_TO_BIT_STRING(addr.sin_addr.s_addr, &gTPTunnel->transportLayerAddress); /* gTP_TEID */ INT32_TO_OCTET_STRING(resp->drbs_to_be_modified[i].up_dl_tnl[j].teid, &gTPTunnel->gTP_TEID); diff --git a/openair2/GNB_APP/MACRLC_nr_paramdef.h b/openair2/GNB_APP/MACRLC_nr_paramdef.h index f33cbf5327..cff2280532 100644 --- a/openair2/GNB_APP/MACRLC_nr_paramdef.h +++ b/openair2/GNB_APP/MACRLC_nr_paramdef.h @@ -41,6 +41,7 @@ #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" #define CONFIG_STRING_MACRLC_LOCAL_N_PORTC "local_n_portc" #define CONFIG_STRING_MACRLC_REMOTE_N_PORTC "remote_n_portc" @@ -125,6 +126,7 @@ {CONFIG_STRING_MACRLC_MIN_GRANT_PRB, HLP_MACRLC_MIN_GRANT_PRB, 0, .u8ptr=NULL, .defintval=5, TYPE_UINT8, 0}, \ {CONFIG_STRING_MACRLC_MIN_GRANT_MCS, HLP_MACRLC_MIN_GRANT_MCS, 0, .u8ptr=NULL, .defintval=9, TYPE_UINT8, 0}, \ {CONFIG_STRING_MACRLC_IDENTITY_PM, HLP_MACRLC_IDENTITY_PM, PARAMFLAG_BOOL, .u8ptr=NULL, .defintval=0, TYPE_UINT8, 0}, \ + {CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS_F1U, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ } // clang-format off @@ -162,6 +164,7 @@ #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 MACRLCPARAMS_CHECK { \ { .s5 = { NULL } }, \ @@ -198,6 +201,7 @@ { .s5 = { NULL } }, \ { .s5 = { NULL } }, \ { .s2 = { NULL } }, \ + { .s5 = { NULL } }, \ } /*---------------------------------------------------------------------------------------------------------------------------------------------------------*/ diff --git a/openair2/GNB_APP/gnb_config.c b/openair2/GNB_APP/gnb_config.c index b8a64558d3..73c21c323f 100644 --- a/openair2/GNB_APP/gnb_config.c +++ b/openair2/GNB_APP/gnb_config.c @@ -1279,7 +1279,10 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg) || 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)); - RC.nrmac[j]->eth_params_n.my_addr = strdup(*(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); + char **f1uaddr = MacRLC_ParamList.paramarray[j][MACRLC_LOCAL_N_ADDRESS_F1U_IDX].strptr; + RC.nrmac[j]->f1u_addr = f1uaddr != NULL ? strdup(*f1uaddr) : strdup(*f1caddr); RC.nrmac[j]->eth_params_n.remote_addr = strdup(*(MacRLC_ParamList.paramarray[j][MACRLC_REMOTE_N_ADDRESS_IDX].strptr)); RC.nrmac[j]->eth_params_n.my_portc = *(MacRLC_ParamList.paramarray[j][MACRLC_LOCAL_N_PORTC_IDX].iptr); RC.nrmac[j]->eth_params_n.remote_portc = *(MacRLC_ParamList.paramarray[j][MACRLC_REMOTE_N_PORTC_IDX].iptr); diff --git a/openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c b/openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c index fea829f61e..0ec4aabc24 100644 --- a/openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c +++ b/openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c @@ -29,7 +29,7 @@ #include "mac_rrc_ul.h" -static f1ap_net_config_t read_DU_IP_config(const eth_params_t* f1_params) +static f1ap_net_config_t read_DU_IP_config(const eth_params_t* f1_params, const char *f1u_ip_addr) { f1ap_net_config_t nc = {0}; @@ -37,19 +37,17 @@ static f1ap_net_config_t read_DU_IP_config(const eth_params_t* f1_params) nc.CU_f1_ip_address.ipv4 = 1; strcpy(nc.CU_f1_ip_address.ipv4_address, f1_params->remote_addr); nc.CUport = f1_params->remote_portd; - LOG_I(GNB_APP, - "FIAP: CU_ip4_address in DU %p, strlen %d\n", - nc.CU_f1_ip_address.ipv4_address, - (int)strlen(f1_params->remote_addr)); - nc.DU_f1_ip_address.ipv6 = 0; - nc.DU_f1_ip_address.ipv4 = 1; - strcpy(nc.DU_f1_ip_address.ipv4_address, f1_params->my_addr); + nc.DU_f1c_ip_address.ipv6 = 0; + nc.DU_f1c_ip_address.ipv4 = 1; + strcpy(nc.DU_f1c_ip_address.ipv4_address, f1_params->my_addr); + nc.DU_f1u_ip_address = strdup(f1u_ip_addr); nc.DUport = f1_params->my_portd; - LOG_I(GNB_APP, - "FIAP: DU_ip4_address in DU %p, strlen %ld\n", - nc.DU_f1_ip_address.ipv4_address, - strlen(f1_params->my_addr)); + LOG_I(F1AP, + "F1-C DU IPaddr %s, connect to F1-C CU %s, binding GTP to %s\n", + nc.DU_f1c_ip_address.ipv4_address, + nc.CU_f1_ip_address.ipv4_address, + nc.DU_f1u_ip_address); // sctp_in_streams/sctp_out_streams are given by SCTP layer return nc; @@ -95,7 +93,7 @@ static void f1_setup_request_f1ap(const f1ap_setup_req_t *req) } memcpy(f1ap_setup->rrc_ver, req->rrc_ver, sizeof(req->rrc_ver)); - F1AP_DU_REGISTER_REQ(msg).net_config = read_DU_IP_config(&RC.nrmac[0]->eth_params_n); + F1AP_DU_REGISTER_REQ(msg).net_config = read_DU_IP_config(&RC.nrmac[0]->eth_params_n, RC.nrmac[0]->f1u_addr); itti_send_msg_to_task(TASK_DU_F1, 0, msg); } diff --git a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h index e162ecbff5..398372e85b 100644 --- a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h +++ b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h @@ -723,6 +723,8 @@ typedef struct f1_config_t { typedef struct gNB_MAC_INST_s { /// Ethernet parameters for northbound midhaul interface eth_params_t eth_params_n; + /// address for F1U to bind, ports in eth_params_n + char *f1u_addr; /// Ethernet parameters for fronthaul interface eth_params_t eth_params_s; /// Module From 0d128f9cad5d9653130a7371666d8854dedd3995 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Thu, 21 Mar 2024 08:29:21 +0100 Subject: [PATCH 03/20] Rewrite sctp_handle_new_association_req() to handle hostnames and IPv6 Use getaddrinfo() to look up IP (v4/v6) addresses. The old interface of separately specifying IPv4 and IPv6 addresses is preserved, but both fields allow to specify types of addresses, and we will remove one field in the future. --- openair3/SCTP/sctp_eNB_task.c | 368 +++++++++++++--------------------- 1 file changed, 143 insertions(+), 225 deletions(-) diff --git a/openair3/SCTP/sctp_eNB_task.c b/openair3/SCTP/sctp_eNB_task.c index 6701521b8c..84110ddda6 100644 --- a/openair3/SCTP/sctp_eNB_task.c +++ b/openair3/SCTP/sctp_eNB_task.c @@ -354,65 +354,67 @@ sctp_handle_new_association_req_multi( ns, sctp_nb_cnx, assoc_id); } -//------------------------------------------------------------------------------ -static void -sctp_handle_new_association_req( - const instance_t instance, - const task_id_t requestor, - const sctp_new_association_req_t * const sctp_new_association_req_p) +static const char *print_ip(struct addrinfo *p, char *buf, size_t buf_len) { - int sd = 0; - sctp_assoc_t assoc_id = 0; + void *addr; + if (p->ai_family == AF_INET) { + struct sockaddr_in *ipv4 = (struct sockaddr_in *)p->ai_addr; + addr = &ipv4->sin_addr; + } else { + struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)p->ai_addr; + addr = &ipv6->sin6_addr; + } - struct sctp_event_subscribe events={0}; + // convert the IP to a string and print it: + return inet_ntop(p->ai_family, addr, buf, buf_len); +} - struct sctp_cnx_list_elm_s *sctp_cnx = NULL; - enum sctp_connection_type_e connection_type = SCTP_TYPE_CLIENT; +static void sctp_handle_new_association_req(const instance_t instance, + const task_id_t requestor, + const sctp_new_association_req_t *const req) +{ + enum sctp_connection_type_e connection_type = SCTP_TYPE_CLIENT; - struct ifreq ifr; - struct ifaddrs *ifaddr = NULL; - struct ifaddrs *ifa = NULL; - int family = 0; - int s = 0; - struct in_addr in; - struct in6_addr in6; - /* Prepare a new SCTP association as requested by upper layer and try to connect - * to remote host. - */ - DevAssert(sctp_new_association_req_p != NULL); + /* local address: IPv4 has priority, but can also handle IPv6 */ + const char *local = NULL; + if (req->local_address.ipv6) { + local = req->local_address.ipv6_address; + SCTP_WARN("please specify IPv6 addresses in the IPv4 field, IPv4 handles both\n"); + } + if (req->local_address.ipv4) + local = req->local_address.ipv4_address; - /* Create new socket with IPv6 affinity */ -//#warning "SCTP may Force IPv4 only, here" -#ifdef NO_VIRTUAL_MACHINE + /* Prepare a new SCTP association as requested by upper layer and try to connect + * to remote host. + */ + DevAssert(req != NULL); + struct addrinfo hints = {.ai_family = AF_UNSPEC, .ai_socktype = SOCK_STREAM, .ai_protocol = IPPROTO_SCTP}; + if (local == NULL) + hints.ai_flags = AI_PASSIVE; + struct addrinfo *serv; - // in init chunk appears a list of host addresses, IPv4 and IPv4 in an arbitrary (unsorted) order - // SCTP hearbeats starts with first ipv4 addresses then stop triyng with other ipv4 addresses - // if it encounters an IPv6 address in list, so we can force the building of IPv4 addresses only - // with AF_INET (the working IPv4 address can be the last in the list...) - if ((sd = socket(AF_INET6, SOCK_STREAM, IPPROTO_SCTP)) < 0) { -#else + int status = getaddrinfo(local, NULL, &hints, &serv); + AssertFatal(status == 0, "getaddrinfo() failed: %s\n", gai_strerror(status)); - if ((sd = socket(AF_INET, SOCK_STREAM, IPPROTO_SCTP)) < 0) { -#endif - SCTP_ERROR("Socket creation failed: %s\n", strerror(errno)); - return; + int sd; + struct addrinfo *p = NULL; + for (p = serv; p != NULL; p = p->ai_next) { + char buf[512]; + const char *ip = print_ip(p, buf, sizeof(buf)); + SCTP_DEBUG("Trying %s for client socket creation\n", ip); + + if ((sd = socket(serv->ai_family, serv->ai_socktype, serv->ai_protocol)) == -1) { + SCTP_WARN("Socket creation failed: %s\n", strerror(errno)); + continue; } - /* Add the socket to list of fd monitored by ITTI */ - itti_subscribe_event_fd(TASK_SCTP, sd); - - if (sctp_set_init_opt(sd, - sctp_new_association_req_p->in_streams, - sctp_new_association_req_p->out_streams, - SCTP_MAX_ATTEMPTS, SCTP_TIMEOUT) != 0) { - SCTP_ERROR("Setsockopt IPPROTO_SCTP_INITMSG failed: %s\n", - strerror(errno)); - itti_unsubscribe_event_fd(TASK_SCTP, sd); - close(sd); - return; - } + /* we assume we can set options, or something is likely broken; the + * connection won't operate properly */ + int ret = sctp_set_init_opt(sd, req->in_streams, req->out_streams, SCTP_MAX_ATTEMPTS, SCTP_TIMEOUT); + AssertFatal(ret == 0, "sctp_set_init_opt() failed\n"); /* Subscribe to all events */ + struct sctp_event_subscribe events = {0}; events.sctp_data_io_event = 1; events.sctp_association_event = 1; events.sctp_address_event = 1; @@ -421,199 +423,115 @@ sctp_handle_new_association_req( events.sctp_shutdown_event = 1; events.sctp_partial_delivery_event = 1; - if (setsockopt(sd, IPPROTO_SCTP, SCTP_EVENTS, &events, - 8) < 0) { - SCTP_ERROR("Setsockopt IPPROTO_SCTP_EVENTS failed: %s\n", - strerror(errno)); - close(sd); - return; + /* as above */ + ret = setsockopt(sd, serv->ai_protocol, SCTP_EVENTS, &events, 8); + AssertFatal(ret == 0, "setsockopt() IPPROTO_SCTP_EVENTS failed: %s\n", strerror(errno)); + + /* if that fails, we will try the next address */ + ret = sctp_bindx(sd, p->ai_addr, 1, SCTP_BINDX_ADD_ADDR); + if (ret != 0) { + SCTP_WARN("sctp_bindx() SCTP_BINDX_ADD_ADDR failed: errno %d %s\n", errno, strerror(errno)); + close(sd); + continue; } - // Bind to device ... or we could bind to address also - if (getifaddrs(&ifaddr) == -1) { - SCTP_ERROR("getifaddrs failed: %s\n", strerror(errno)); - close(sd); - } + SCTP_DEBUG("sctp_bindx() SCTP_BINDX_ADD_ADDR: socket bound to %s/%s\n", local, ip); + break; + } - /* Walk through linked list, maintaining head pointer so we - can free list later */ - for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) { - if (ifa->ifa_addr == NULL) - continue; + freeaddrinfo(serv); - family = ifa->ifa_addr->sa_family; + if (p == NULL) { + SCTP_ERROR("could not open socket, no SCTP connection established\n"); + return; + } - /* For an AF_INET* interface address, display the address */ - if (sctp_new_association_req_p->local_address.ipv4 && family == AF_INET) { - // compare address - s = inet_aton(sctp_new_association_req_p->local_address.ipv4_address, - &in); + /* SOCK_STREAM socket type requires an explicit connect to the remote host + * address and port. */ + /* remote address: IPv4 has priority, but can also handle IPv6 */ + const char *remote = NULL; + if (req->remote_address.ipv6) { + remote = req->remote_address.ipv6_address; + SCTP_WARN("please specify IPv6 addresses in the IPv4 field, IPv4 handles both\n"); + } + if (req->remote_address.ipv4) + remote = req->remote_address.ipv4_address; + sctp_assoc_t assoc_id = 0; + if (remote != NULL) { + struct addrinfo hints = {.ai_family = AF_UNSPEC, .ai_socktype = SOCK_STREAM, .ai_protocol = IPPROTO_SCTP}; + struct addrinfo *serv; - if (s > 0 ) { - if (((struct sockaddr_in*)ifa->ifa_addr)->sin_addr.s_addr == in.s_addr) { - struct sockaddr_in locaddr={0}; - locaddr.sin_family = AF_INET; - locaddr.sin_port = 0; - locaddr.sin_addr.s_addr = in.s_addr; + char port[12]; + snprintf(port, sizeof(port), "%d", req->port); + int status = getaddrinfo(remote, port, &hints, &serv); + AssertFatal(status == 0, "getaddrinfo() failed: %s\n", gai_strerror(status)); - if (sctp_bindx(sd, (struct sockaddr*)&locaddr, 1, SCTP_BINDX_ADD_ADDR) < 0) { - SCTP_ERROR("sctp_bindx SCTP_BINDX_ADD_ADDR failed: %s\n", - strerror(errno)); - } else { - SCTP_DEBUG("sctp_bindx SCTP_BINDX_ADD_ADDR socket bound to : %s\n", - inet_ntoa(locaddr.sin_addr)); - } - break; + struct addrinfo *p = NULL; + for (p = serv; p != NULL; p = p->ai_next) { + char buf[512]; + const char *ip = print_ip(p, buf, sizeof(buf)); + SCTP_DEBUG("Trying to connect to %s for remote end %s\n", ip, remote); - } - } - } else if (sctp_new_association_req_p->local_address.ipv6 && family == AF_INET6) { - // compare address - s = inet_pton(AF_INET6, - sctp_new_association_req_p->local_address.ipv6_address, - &in6); - - if (s == 1 ) { - if (memcmp(&((struct sockaddr_in6*)ifa->ifa_addr)->sin6_addr, - &in6, sizeof(in6)) == 0) { - memset(&ifr, 0, sizeof(ifr)); - snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", ifa->ifa_name); - - if (setsockopt(sd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof(ifr)) < 0) { - SCTP_ERROR("Setsockopt SOL_SOCKET failed: %s\n", - strerror(errno)); - } else { - SCTP_DEBUG("Setsockopt SOL_SOCKET socket bound to : %s\n", - ifa->ifa_name); - } - - break; - } - } - } - } - - freeifaddrs(ifaddr); - - /* Mark the socket as non-blocking */ - if (fcntl(sd, F_SETFL, O_NONBLOCK) < 0) { - SCTP_ERROR("fcntl F_SETFL O_NONBLOCK failed: %s\n", - strerror(errno)); - close(sd); - return; - } - - /* SOCK_STREAM socket type requires an explicit connect to the remote host - * address and port. - * Only use IPv4 for the first connection attempt - */ - if ((sctp_new_association_req_p->remote_address.ipv6 != 0) || - (sctp_new_association_req_p->remote_address.ipv4 != 0)) { - uint8_t address_index = 0; - uint8_t used_address = sctp_new_association_req_p->remote_address.ipv6 + - sctp_new_association_req_p->remote_address.ipv4; - struct sockaddr_in addr[used_address]; - - memset(addr, 0, used_address * sizeof(struct sockaddr_in)); - - if (sctp_new_association_req_p->remote_address.ipv6 == 1) { - if (inet_pton(AF_INET6, sctp_new_association_req_p->remote_address.ipv6_address, - &addr[address_index].sin_addr.s_addr) != 1) { - SCTP_ERROR("Failed to convert ipv6 address %*s to network type\n", - (int)strlen(sctp_new_association_req_p->remote_address.ipv6_address), - sctp_new_association_req_p->remote_address.ipv6_address); - close(sd); - return; - } - - SCTP_DEBUG("Converted ipv6 address %*s to network type\n", - (int)strlen(sctp_new_association_req_p->remote_address.ipv6_address), - sctp_new_association_req_p->remote_address.ipv6_address); - - addr[address_index].sin_family = AF_INET6; - addr[address_index].sin_port = htons(sctp_new_association_req_p->port); - address_index++; - } - - if (sctp_new_association_req_p->remote_address.ipv4 == 1) { - if (inet_pton(AF_INET, sctp_new_association_req_p->remote_address.ipv4_address, - &addr[address_index].sin_addr.s_addr) != 1) { - SCTP_ERROR("Failed to convert ipv4 address %*s to network type\n", - (int)strlen(sctp_new_association_req_p->remote_address.ipv4_address), - sctp_new_association_req_p->remote_address.ipv4_address); - close(sd); - return; - } - - SCTP_DEBUG("Converted ipv4 address %*s to network type\n", - (int)strlen(sctp_new_association_req_p->remote_address.ipv4_address), - sctp_new_association_req_p->remote_address.ipv4_address); - - addr[address_index].sin_family = AF_INET; - addr[address_index].sin_port = htons(sctp_new_association_req_p->port); - address_index++; - } - - /* Connect to remote host and port */ - if (sctp_connectx(sd, (struct sockaddr *)addr, 1, &assoc_id) < 0) { - /* sctp_connectx on non-blocking socket return EINPROGRESS */ - if (errno != EINPROGRESS) { - SCTP_ERROR("Connect failed: %s\n", strerror(errno)); - sctp_itti_send_association_resp( - requestor, instance, -1, sctp_new_association_req_p->ulp_cnx_id, - SCTP_STATE_UNREACHABLE, 0, 0); - /* Add the socket to list of fd monitored by ITTI */ - itti_unsubscribe_event_fd(TASK_SCTP, sd); - close(sd); - return; - } else { - SCTP_DEBUG("connectx assoc_id %d in progress..., used %d addresses\n", - assoc_id, used_address); - } + if (sctp_connectx(sd, p->ai_addr, 1, &assoc_id) < 0) { + /* sctp_connectx on non-blocking socket return EINPROGRESS */ + if (errno != EINPROGRESS) { + SCTP_ERROR("Connect failed: %s\n", strerror(errno)); + sctp_itti_send_association_resp(requestor, instance, -1, req->ulp_cnx_id, SCTP_STATE_UNREACHABLE, 0, 0); + close(sd); + return; } else { - SCTP_DEBUG("sctp_connectx SUCCESS, used %d addresses assoc_id %d\n", - used_address, - assoc_id); - } - } else { - /* No remote address provided -> only bind the socket for now. - * Connection will be accepted in the main event loop - */ - struct sockaddr_in6 addr6; - - connection_type = SCTP_TYPE_SERVER; - - /* For now bind to any interface */ - addr6.sin6_family = AF_INET6; - addr6.sin6_addr = in6addr_any; - addr6.sin6_port = htons(sctp_new_association_req_p->port); - addr6.sin6_flowinfo = 0; - - if (bind(sd, (struct sockaddr*)&addr6, sizeof(addr6)) < 0) { - SCTP_ERROR("Failed to bind the socket to address any (v4/v6): %s\n", - strerror(errno)); - close(sd); - return; + SCTP_DEBUG("sctp_connectx(): assoc_id %d in progress...\n", assoc_id); } + } else { + SCTP_DEBUG("sctp_connectx() SUCCESS: used assoc_id %d\n", assoc_id); + } + break; } - sctp_cnx = calloc(1, sizeof(*sctp_cnx)); + freeaddrinfo(serv); + } else { + /* I am not sure that this is relevant; we already did sctp_bindx() above */ + connection_type = SCTP_TYPE_SERVER; - sctp_cnx->connection_type = connection_type; + /* No remote address provided -> only bind the socket for now. + * Connection will be accepted in the main event loop + */ + /* + struct sockaddr_in6 addr6; - sctp_cnx->sd = sd; - sctp_cnx->task_id = requestor; - sctp_cnx->cnx_id = sctp_new_association_req_p->ulp_cnx_id; - sctp_cnx->ppid = sctp_new_association_req_p->ppid; - sctp_cnx->instance = instance; - sctp_cnx->assoc_id = assoc_id; - /* Insert new element at end of list */ - STAILQ_INSERT_TAIL(&sctp_cnx_list, sctp_cnx, entries); - sctp_nb_cnx++; + addr6.sin6_family = AF_INET6; + addr6.sin6_addr = in6addr_any; + addr6.sin6_port = htons(req->port); + addr6.sin6_flowinfo = 0; - SCTP_DEBUG("Inserted new descriptor for sd %d in list, nb elements %u, assoc_id %d\n", - sd, sctp_nb_cnx, assoc_id); + if (bind(sd, (struct sockaddr *)&addr6, sizeof(addr6)) < 0) { + SCTP_ERROR("Failed to bind the socket to address any (v4/v6): %s\n", strerror(errno)); + close(sd); + return; + } + */ + } + + struct sctp_cnx_list_elm_s *sctp_cnx = calloc(1, sizeof(*sctp_cnx)); + AssertFatal(sctp_cnx != NULL, "out of memory\n"); + sctp_cnx->connection_type = connection_type; + + sctp_cnx->sd = sd; + sctp_cnx->task_id = requestor; + sctp_cnx->cnx_id = req->ulp_cnx_id; + sctp_cnx->ppid = req->ppid; + sctp_cnx->instance = instance; + sctp_cnx->assoc_id = assoc_id; + + /* Insert new element at end of list */ + STAILQ_INSERT_TAIL(&sctp_cnx_list, sctp_cnx, entries); + sctp_nb_cnx++; + + /* Add the socket to list of fd monitored by ITTI */ + itti_subscribe_event_fd(TASK_SCTP, sd); + + SCTP_DEBUG("Inserted new descriptor for sd %d in list, nb elements %u, assoc_id %d\n", sd, sctp_nb_cnx, assoc_id); } //------------------------------------------------------------------------------ From dfa012162b0f4cb06ce315a9b5e5a4bf6221f62f Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Thu, 21 Mar 2024 13:32:28 +0100 Subject: [PATCH 04/20] Rewrite sctp_create_new_listener() to handle DNS, IPv6 Rewrite sctp_create_new_listener() to use getaddrinfo() to look up IPv4/IPv6 addresses via a common interface. This allows to use e.g. DNS, and enables the SCTP library to listen on IPv6 ports. To support the above, the corresponding message is changed to not take an IPv4 address on 4 bytes (and separate IPv6), but a single name that will be resolved via getaddrinfo() The previous init message used to allow multiple IPv4/IPv6 addresses; since this is not used anywhere, remove the corresponding functionality. Modify all uses of this ITTI message to copy te SCTP init bind addr into ITTI message. --- openair2/COMMON/sctp_messages_types.h | 9 +- openair2/E1AP/e1ap.c | 24 ++- openair2/F1AP/f1ap_cu_task.c | 27 ++-- openair2/M2AP/m2ap_MCE.c | 68 ++------ openair2/M2AP/m2ap_eNB.c | 25 +-- openair2/X2AP/x2ap_eNB.c | 25 +-- openair3/M3AP/m3ap_MCE.c | 25 +-- openair3/M3AP/m3ap_MME.c | 72 +++------ openair3/SCTP/sctp_eNB_task.c | 213 +++++++++----------------- 9 files changed, 148 insertions(+), 340 deletions(-) diff --git a/openair2/COMMON/sctp_messages_types.h b/openair2/COMMON/sctp_messages_types.h index 88790bdc1f..313cdfa899 100644 --- a/openair2/COMMON/sctp_messages_types.h +++ b/openair2/COMMON/sctp_messages_types.h @@ -128,14 +128,7 @@ typedef struct sctp_data_ind_s { } sctp_data_ind_t; typedef struct sctp_init_s { - /* Request usage of ipv4 */ - unsigned ipv4:1; - /* Request usage of ipv6 */ - unsigned ipv6:1; - uint8_t nb_ipv4_addr; - uint32_t ipv4_address[10]; - uint8_t nb_ipv6_addr; - char *ipv6_address[10]; + char *bind_address; uint16_t port; uint32_t ppid; } sctp_init_t; diff --git a/openair2/E1AP/e1ap.c b/openair2/E1AP/e1ap.c index 1c9ff19bff..ad1cd8f4ab 100644 --- a/openair2/E1AP/e1ap.c +++ b/openair2/E1AP/e1ap.c @@ -1873,21 +1873,15 @@ void cuup_init_n3(instance_t instance) void cucp_task_send_sctp_init_req(instance_t instance, char *my_addr) { - LOG_I(E1AP, "E1AP_CUCP_SCTP_REQ(create socket)\n"); - MessageDef *message_p = NULL; - message_p = itti_alloc_new_message (TASK_CUCP_E1, 0, SCTP_INIT_MSG); - message_p->ittiMsg.sctp_init.port = E1AP_PORT_NUMBER; - message_p->ittiMsg.sctp_init.ppid = E1AP_SCTP_PPID; - message_p->ittiMsg.sctp_init.ipv4 = 1; - message_p->ittiMsg.sctp_init.ipv6 = 0; - message_p->ittiMsg.sctp_init.nb_ipv4_addr = 1; - message_p->ittiMsg.sctp_init.ipv4_address[0] = inet_addr(my_addr); - /* - * SR WARNING: ipv6 multi-homing fails sometimes for localhost. - * * * * Disable it for now. - */ - message_p->ittiMsg.sctp_init.nb_ipv6_addr = 0; - message_p->ittiMsg.sctp_init.ipv6_address[0] = "0:0:0:0:0:0:0:1"; + size_t addr_len = strlen(my_addr) + 1; + LOG_I(E1AP, "E1AP_CUCP_SCTP_REQ(create socket) for %s len %ld\n", my_addr, addr_len); + MessageDef *message_p = itti_alloc_new_message_sized(TASK_CUCP_E1, 0, SCTP_INIT_MSG, sizeof(sctp_init_t) + addr_len); + sctp_init_t *init = &SCTP_INIT_MSG(message_p); + init->port = E1AP_PORT_NUMBER; + init->ppid = E1AP_SCTP_PPID; + char *addr_buf = (char *) (init + 1); // address after sctp_init ITTI message end, allocated above + init->bind_address = addr_buf; + memcpy(addr_buf, my_addr, addr_len); itti_send_msg_to_task(TASK_SCTP, instance, message_p); } diff --git a/openair2/F1AP/f1ap_cu_task.c b/openair2/F1AP/f1ap_cu_task.c index 8401b44eca..2731fa8e0b 100644 --- a/openair2/F1AP/f1ap_cu_task.c +++ b/openair2/F1AP/f1ap_cu_task.c @@ -96,25 +96,20 @@ static void cu_task_handle_sctp_data_ind(instance_t instance, sctp_data_ind_t *s AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result); } -static void cu_task_send_sctp_init_req(instance_t instance, char *my_addr) { +static void cu_task_send_sctp_init_req(instance_t instance, char *my_addr) +{ // 1. get the itti msg, and retrive the nb_id from the message // 2. use RC.rrc[nb_id] to fill the sctp_init_t with the ip, port // 3. creat an itti message to init - LOG_I(F1AP, "F1AP_CU_SCTP_REQ(create socket)\n"); - MessageDef *message_p = NULL; - message_p = itti_alloc_new_message (TASK_CU_F1, 0, SCTP_INIT_MSG); - message_p->ittiMsg.sctp_init.port = F1AP_PORT_NUMBER; - message_p->ittiMsg.sctp_init.ppid = F1AP_SCTP_PPID; - message_p->ittiMsg.sctp_init.ipv4 = 1; - message_p->ittiMsg.sctp_init.ipv6 = 0; - message_p->ittiMsg.sctp_init.nb_ipv4_addr = 1; - message_p->ittiMsg.sctp_init.ipv4_address[0] = inet_addr(my_addr); - /* - * SR WARNING: ipv6 multi-homing fails sometimes for localhost. - * * * * Disable it for now. - */ - message_p->ittiMsg.sctp_init.nb_ipv6_addr = 0; - message_p->ittiMsg.sctp_init.ipv6_address[0] = "0:0:0:0:0:0:0:1"; + size_t addr_len = strlen(my_addr) + 1; + LOG_I(F1AP, "F1AP_CU_SCTP_REQ(create socket) for %s len %ld\n", my_addr, addr_len); + MessageDef *message_p = itti_alloc_new_message_sized(TASK_CU_F1, 0, SCTP_INIT_MSG, sizeof(sctp_init_t) + addr_len); + sctp_init_t *init = &SCTP_INIT_MSG(message_p); + init->port = F1AP_PORT_NUMBER; + init->ppid = F1AP_SCTP_PPID; + char *addr_buf = (char *) (init + 1); // address after ITTI message end, allocated above + init->bind_address = addr_buf; + memcpy(addr_buf, my_addr, addr_len); itti_send_msg_to_task(TASK_SCTP, instance, message_p); } diff --git a/openair2/M2AP/m2ap_MCE.c b/openair2/M2AP/m2ap_MCE.c index 4a69e0c6d3..f3d2fb2e7a 100644 --- a/openair2/M2AP/m2ap_MCE.c +++ b/openair2/M2AP/m2ap_MCE.c @@ -227,29 +227,16 @@ int m2ap_MCE_init_sctp (m2ap_MCE_instance_t *instance_p, net_ip_address_t *local_ip_addr, uint32_t mce_port_for_M2C) { // Create and alloc new message - MessageDef *message; - sctp_init_t *sctp_init = NULL; DevAssert(instance_p != NULL); DevAssert(local_ip_addr != NULL); - message = itti_alloc_new_message (TASK_M2AP_MCE, 0, SCTP_INIT_MSG_MULTI_REQ); - sctp_init = &message->ittiMsg.sctp_init_multi; + size_t addr_len = strlen(local_ip_addr->ipv4_address) + 1; + MessageDef *message = itti_alloc_new_message_sized(TASK_M2AP_MCE, 0, SCTP_INIT_MSG_MULTI_REQ, sizeof(sctp_init_t) + addr_len); + sctp_init_t *sctp_init = &message->ittiMsg.sctp_init_multi; sctp_init->port = mce_port_for_M2C; sctp_init->ppid = M2AP_SCTP_PPID; - sctp_init->ipv4 = 1; - sctp_init->ipv6 = 0; - sctp_init->nb_ipv4_addr = 1; -#if 0 - memcpy(&sctp_init->ipv4_address, - local_ip_addr, - sizeof(*local_ip_addr)); -#endif - sctp_init->ipv4_address[0] = inet_addr(local_ip_addr->ipv4_address); - /* - * SR WARNING: ipv6 multi-homing fails sometimes for localhost. - * * * * Disable it for now. - */ - sctp_init->nb_ipv6_addr = 0; - sctp_init->ipv6_address[0] = "0:0:0:0:0:0:0:1"; + char *addr_buf = (char *) (sctp_init + 1); + sctp_init->bind_address = addr_buf; + memcpy(addr_buf, local_ip_addr->ipv4_address, addr_len); return itti_send_msg_to_task (TASK_SCTP, instance_p->instance, message); } @@ -502,41 +489,16 @@ void MCE_task_send_sctp_init_req(instance_t enb_id, m2ap_mce_sctp_req_t * m2ap_m // 2. use RC.rrc[enb_id] to fill the sctp_init_t with the ip, port // 3. creat an itti message to init - LOG_I(M2AP, "M2AP_SCTP_REQ(create socket)\n"); - MessageDef *message_p = NULL; - - message_p = itti_alloc_new_message (TASK_M2AP_MCE, 0, SCTP_INIT_MSG); - - // if( m2ap_mce_sctp_req == NULL ){ - // message_p->ittiMsg.sctp_init.port = M2AP_PORT_NUMBER; - // message_p->ittiMsg.sctp_init.ppid = M2AP_SCTP_PPID; - // message_p->ittiMsg.sctp_init.ipv4 = 1; - // message_p->ittiMsg.sctp_init.ipv6 = 0; - // message_p->ittiMsg.sctp_init.nb_ipv4_addr = 1; - // //message_p->ittiMsg.sctp_init.ipv4_address[0] = inet_addr(RC.rrc[enb_id]->eth_params_s.my_addr); - // message_p->ittiMsg.sctp_init.ipv4_address[0] = inet_addr("127.0.0.7"); - // /* - // * SR WARNING: ipv6 multi-homing fails sometimes for localhost. - // * * * * Disable it for now. - // */ - // message_p->ittiMsg.sctp_init.nb_ipv6_addr = 0; - // message_p->ittiMsg.sctp_init.ipv6_address[0] = "0:0:0:0:0:0:0:1"; - // }else{ - message_p->ittiMsg.sctp_init.port = m2ap_mce_sctp_req->mce_port_for_M2C; - message_p->ittiMsg.sctp_init.ppid = M2AP_SCTP_PPID; - message_p->ittiMsg.sctp_init.ipv4 = 1; - message_p->ittiMsg.sctp_init.ipv6 = 0; - message_p->ittiMsg.sctp_init.nb_ipv4_addr = 1; - //message_p->ittiMsg.sctp_init.ipv4_address[0] = inet_addr(RC.rrc[enb_id]->eth_params_s.my_addr); - message_p->ittiMsg.sctp_init.ipv4_address[0] = inet_addr(m2ap_mce_sctp_req->mce_m2_ip_address.ipv4_address); - /* - * SR WARNING: ipv6 multi-homing fails sometimes for localhost. - * * * * Disable it for now. - */ - message_p->ittiMsg.sctp_init.nb_ipv6_addr = 0; - message_p->ittiMsg.sctp_init.ipv6_address[0] = "0:0:0:0:0:0:0:1"; - // } + size_t addr_len = strlen(m2ap_mce_sctp_req->mce_m2_ip_address.ipv4_address) + 1; + LOG_I(M2AP, "M2AP_SCTP_REQ(create socket) for %s len %ld\n", m2ap_mce_sctp_req->mce_m2_ip_address.ipv4_address, addr_len); + MessageDef *message_p = itti_alloc_new_message_sized (TASK_M2AP_MCE, 0, SCTP_INIT_MSG, sizeof(sctp_init_t) + addr_len); + sctp_init_t *init = &SCTP_INIT_MSG(message_p); + init->port = m2ap_mce_sctp_req->mce_port_for_M2C; + init->ppid = M2AP_SCTP_PPID; + char *addr_buf = (char *) (init + 1); // address after ITTI message end, allocated above + init->bind_address = addr_buf; + memcpy(addr_buf, m2ap_mce_sctp_req->mce_m2_ip_address.ipv4_address, addr_len); itti_send_msg_to_task(TASK_SCTP, enb_id, message_p); } diff --git a/openair2/M2AP/m2ap_eNB.c b/openair2/M2AP/m2ap_eNB.c index 4f17dbbb5a..c492778603 100644 --- a/openair2/M2AP/m2ap_eNB.c +++ b/openair2/M2AP/m2ap_eNB.c @@ -229,29 +229,16 @@ int m2ap_eNB_init_sctp (m2ap_eNB_instance_t *instance_p, net_ip_address_t *local_ip_addr, uint32_t enb_port_for_M2C) { // Create and alloc new message - MessageDef *message; - sctp_init_t *sctp_init = NULL; DevAssert(instance_p != NULL); DevAssert(local_ip_addr != NULL); - message = itti_alloc_new_message (TASK_M2AP_ENB, 0, SCTP_INIT_MSG_MULTI_REQ); - sctp_init = &message->ittiMsg.sctp_init_multi; + size_t addr_len = strlen(local_ip_addr->ipv4_address) + 1; + MessageDef *message = itti_alloc_new_message_sized(TASK_M2AP_ENB, 0, SCTP_INIT_MSG_MULTI_REQ, sizeof(sctp_init_t) + addr_len); + sctp_init_t *sctp_init = &message->ittiMsg.sctp_init_multi; sctp_init->port = enb_port_for_M2C; sctp_init->ppid = M2AP_SCTP_PPID; - sctp_init->ipv4 = 1; - sctp_init->ipv6 = 0; - sctp_init->nb_ipv4_addr = 1; -#if 0 - memcpy(&sctp_init->ipv4_address, - local_ip_addr, - sizeof(*local_ip_addr)); -#endif - sctp_init->ipv4_address[0] = inet_addr(local_ip_addr->ipv4_address); - /* - * SR WARNING: ipv6 multi-homing fails sometimes for localhost. - * * * * Disable it for now. - */ - sctp_init->nb_ipv6_addr = 0; - sctp_init->ipv6_address[0] = "0:0:0:0:0:0:0:1"; + char *addr_buf = (char *) (sctp_init + 1); + sctp_init->bind_address = addr_buf; + memcpy(addr_buf, local_ip_addr->ipv4_address, addr_len); return itti_send_msg_to_task (TASK_SCTP, instance_p->instance, message); } diff --git a/openair2/X2AP/x2ap_eNB.c b/openair2/X2AP/x2ap_eNB.c index 42cd577727..d0d2b03304 100644 --- a/openair2/X2AP/x2ap_eNB.c +++ b/openair2/X2AP/x2ap_eNB.c @@ -217,29 +217,16 @@ int x2ap_eNB_init_sctp (x2ap_eNB_instance_t *instance_p, net_ip_address_t *local_ip_addr, uint32_t enb_port_for_X2C) { // Create and alloc new message - MessageDef *message; - sctp_init_t *sctp_init = NULL; DevAssert(instance_p != NULL); DevAssert(local_ip_addr != NULL); - message = itti_alloc_new_message (TASK_X2AP, 0, SCTP_INIT_MSG_MULTI_REQ); - sctp_init = &message->ittiMsg.sctp_init_multi; + size_t addr_len = strlen(local_ip_addr->ipv4_address) + 1; + MessageDef *message = itti_alloc_new_message_sized(TASK_X2AP, 0, SCTP_INIT_MSG_MULTI_REQ, sizeof(sctp_init_t) + addr_len); + sctp_init_t *sctp_init = &message->ittiMsg.sctp_init_multi; sctp_init->port = enb_port_for_X2C; sctp_init->ppid = X2AP_SCTP_PPID; - sctp_init->ipv4 = 1; - sctp_init->ipv6 = 0; - sctp_init->nb_ipv4_addr = 1; -#if 0 - memcpy(&sctp_init->ipv4_address, - local_ip_addr, - sizeof(*local_ip_addr)); -#endif - sctp_init->ipv4_address[0] = inet_addr(local_ip_addr->ipv4_address); - /* - * SR WARNING: ipv6 multi-homing fails sometimes for localhost. - * * * * Disable it for now. - */ - sctp_init->nb_ipv6_addr = 0; - sctp_init->ipv6_address[0] = "0:0:0:0:0:0:0:1"; + char *addr_buf = (char *) (sctp_init + 1); + sctp_init->bind_address = addr_buf; + memcpy(addr_buf, local_ip_addr->ipv4_address, addr_len); return itti_send_msg_to_task (TASK_SCTP, instance_p->instance, message); } diff --git a/openair3/M3AP/m3ap_MCE.c b/openair3/M3AP/m3ap_MCE.c index 58f8c969a2..141ee09b4e 100644 --- a/openair3/M3AP/m3ap_MCE.c +++ b/openair3/M3AP/m3ap_MCE.c @@ -225,29 +225,16 @@ int m3ap_MCE_init_sctp (m3ap_MCE_instance_t *instance_p, net_ip_address_t *local_ip_addr, uint32_t mce_port_for_M3C) { // Create and alloc new message - MessageDef *message; - sctp_init_t *sctp_init = NULL; DevAssert(instance_p != NULL); DevAssert(local_ip_addr != NULL); - message = itti_alloc_new_message (TASK_M3AP_MCE, 0, SCTP_INIT_MSG_MULTI_REQ); - sctp_init = &message->ittiMsg.sctp_init_multi; + size_t addr_len = strlen(local_ip_addr->ipv4_address) + 1; + MessageDef *message = itti_alloc_new_message_sized(TASK_M3AP_MCE, 0, SCTP_INIT_MSG_MULTI_REQ, sizeof(sctp_init_t) + addr_len); + sctp_init_t *sctp_init = &message->ittiMsg.sctp_init_multi; sctp_init->port = mce_port_for_M3C; sctp_init->ppid = M3AP_SCTP_PPID; - sctp_init->ipv4 = 1; - sctp_init->ipv6 = 0; - sctp_init->nb_ipv4_addr = 1; -#if 0 - memcpy(&sctp_init->ipv4_address, - local_ip_addr, - sizeof(*local_ip_addr)); -#endif - sctp_init->ipv4_address[0] = inet_addr(local_ip_addr->ipv4_address); - /* - * SR WARNING: ipv6 multi-homing fails sometimes for localhost. - * * * * Disable it for now. - */ - sctp_init->nb_ipv6_addr = 0; - sctp_init->ipv6_address[0] = "0:0:0:0:0:0:0:1"; + char *addr_buf = (char *) (sctp_init + 1); + sctp_init->bind_address = addr_buf; + memcpy(addr_buf, local_ip_addr->ipv4_address, addr_len); return itti_send_msg_to_task (TASK_SCTP, instance_p->instance, message); } diff --git a/openair3/M3AP/m3ap_MME.c b/openair3/M3AP/m3ap_MME.c index 523737184e..892a210ffd 100644 --- a/openair3/M3AP/m3ap_MME.c +++ b/openair3/M3AP/m3ap_MME.c @@ -227,29 +227,16 @@ int m3ap_MME_init_sctp (m3ap_MME_instance_t *instance_p, net_ip_address_t *local_ip_addr, uint32_t mme_port_for_M3C) { // Create and alloc new message - MessageDef *message; - sctp_init_t *sctp_init = NULL; DevAssert(instance_p != NULL); DevAssert(local_ip_addr != NULL); - message = itti_alloc_new_message (TASK_M3AP_MME, 0, SCTP_INIT_MSG_MULTI_REQ); - sctp_init = &message->ittiMsg.sctp_init_multi; + size_t addr_len = strlen(local_ip_addr->ipv4_address) + 1; + MessageDef *message = itti_alloc_new_message_sized(TASK_M3AP_MME, 0, SCTP_INIT_MSG_MULTI_REQ, sizeof(sctp_init_t) + addr_len); + sctp_init_t *sctp_init = &message->ittiMsg.sctp_init_multi; sctp_init->port = mme_port_for_M3C; sctp_init->ppid = M3AP_SCTP_PPID; - sctp_init->ipv4 = 1; - sctp_init->ipv6 = 0; - sctp_init->nb_ipv4_addr = 1; -#if 0 - memcpy(&sctp_init->ipv4_address, - local_ip_addr, - sizeof(*local_ip_addr)); -#endif - sctp_init->ipv4_address[0] = inet_addr(local_ip_addr->ipv4_address); - /* - * SR WARNING: ipv6 multi-homing fails sometimes for localhost. - * * * * Disable it for now. - */ - sctp_init->nb_ipv6_addr = 0; - sctp_init->ipv6_address[0] = "0:0:0:0:0:0:0:1"; + char *addr_buf = (char *) (sctp_init + 1); + sctp_init->bind_address = addr_buf; + memcpy(addr_buf, local_ip_addr->ipv4_address, addr_len); return itti_send_msg_to_task (TASK_SCTP, instance_p->instance, message); } @@ -502,37 +489,22 @@ void MME_task_send_sctp_init_req(instance_t enb_id, m3ap_mme_sctp_req_t * m3ap_m // 2. use RC.rrc[enb_id] to fill the sctp_init_t with the ip, port // 3. creat an itti message to init - MessageDef *message_p = NULL; - - message_p = itti_alloc_new_message (TASK_M3AP_MME, 0, SCTP_INIT_MSG); -if(m3ap_mme_sctp_req==NULL) { - LOG_I(M3AP, "M3AP_SCTP_REQ(create socket)\n"); - message_p->ittiMsg.sctp_init.port = M3AP_PORT_NUMBER; - message_p->ittiMsg.sctp_init.ppid = M3AP_SCTP_PPID; - message_p->ittiMsg.sctp_init.ipv4 = 1; - message_p->ittiMsg.sctp_init.ipv6 = 0; - message_p->ittiMsg.sctp_init.nb_ipv4_addr = 1; - //message_p->ittiMsg.sctp_init.ipv4_address[0] = inet_addr(RC.rrc[enb_id]->eth_params_s.my_addr); - message_p->ittiMsg.sctp_init.ipv4_address[0] = inet_addr("127.0.0.8"); - -}else{ - - LOG_I(M3AP, "M3AP_SCTP_REQ(create socket) %s\n",m3ap_mme_sctp_req->mme_m3_ip_address.ipv4_address); - message_p->ittiMsg.sctp_init.port = m3ap_mme_sctp_req->mme_port_for_M3C; - message_p->ittiMsg.sctp_init.ppid = M3AP_SCTP_PPID; - message_p->ittiMsg.sctp_init.ipv4 = 1; - message_p->ittiMsg.sctp_init.ipv6 = 0; - message_p->ittiMsg.sctp_init.nb_ipv4_addr = 1; - //message_p->ittiMsg.sctp_init.ipv4_address[0] = inet_addr(RC.rrc[enb_id]->eth_params_s.my_addr); - message_p->ittiMsg.sctp_init.ipv4_address[0] = inet_addr(m3ap_mme_sctp_req->mme_m3_ip_address.ipv4_address); - } - - /* - * SR WARNING: ipv6 multi-homing fails sometimes for localhost. - * * * * Disable it for now. - */ - message_p->ittiMsg.sctp_init.nb_ipv6_addr = 0; - message_p->ittiMsg.sctp_init.ipv6_address[0] = "0:0:0:0:0:0:0:1"; + size_t addr_len = m3ap_mme_sctp_req != NULL ? strlen(m3ap_mme_sctp_req->mme_m3_ip_address.ipv4_address) + 1 : strlen("127.0.0.8") + 1; // the previous code might hardcode, support this + MessageDef *message_p = itti_alloc_new_message_sized(TASK_M3AP_MME, 0, SCTP_INIT_MSG, sizeof(sctp_init_t) + addr_len); + sctp_init_t *init = &SCTP_INIT_MSG(message_p); + char *addr_buf = (char *) (init + 1); // address after ITTI message end, allocated above + init->bind_address = addr_buf; + if (m3ap_mme_sctp_req == NULL) { + LOG_I(M3AP, "M3AP_SCTP_REQ(create socket)\n"); + init->port = M3AP_PORT_NUMBER; + init->ppid = M3AP_SCTP_PPID; + memcpy(addr_buf, "127.0.0.8", addr_len); + } else { + LOG_I(M3AP, "M3AP_SCTP_REQ(create socket) for %s %ld\n", m3ap_mme_sctp_req->mme_m3_ip_address.ipv4_address, addr_len); + init->port = m3ap_mme_sctp_req->mme_port_for_M3C; + init->ppid = M3AP_SCTP_PPID; + memcpy(addr_buf, m3ap_mme_sctp_req->mme_m3_ip_address.ipv4_address, addr_len); + } itti_send_msg_to_task(TASK_SCTP, enb_id, message_p); } diff --git a/openair3/SCTP/sctp_eNB_task.c b/openair3/SCTP/sctp_eNB_task.c index 84110ddda6..ffd4bba3f5 100644 --- a/openair3/SCTP/sctp_eNB_task.c +++ b/openair3/SCTP/sctp_eNB_task.c @@ -598,85 +598,44 @@ static int sctp_close_association(sctp_close_association_t *close_association_p) return 0; } -//------------------------------------------------------------------------------ -static int sctp_create_new_listener( - const instance_t instance, - const task_id_t requestor, - sctp_init_t *init_p, - int server_type) +static int sctp_create_new_listener(const instance_t instance, const task_id_t requestor, sctp_init_t *init_p, int server_type) { - struct sctp_event_subscribe event={0}; - struct sockaddr *addr = NULL; - struct sctp_cnx_list_elm_s *sctp_cnx = NULL; - uint16_t i = 0, j = 0; - int sd = 0; - int used_addresses = 0; + DevAssert(init_p != NULL); + DevAssert(init_p->bind_address != NULL); + int in_streams = 1; + int out_streams = 1; - DevAssert(init_p != NULL); + /* local address: IPv4 has priority, but can also handle IPv6 */ + const char *local = init_p->bind_address; - if (init_p->ipv4 == 0 && init_p->ipv6 == 0) { - SCTP_ERROR("Illegal IP configuration upper layer should request at" - "least ipv4 and/or ipv6 config\n"); - return -1; + struct addrinfo hints = {.ai_family = AF_UNSPEC, .ai_socktype = SOCK_STREAM, .ai_protocol = IPPROTO_SCTP}; + struct addrinfo *serv; + + char port[12]; + snprintf(port, sizeof(port), "%d", init_p->port); + int status = getaddrinfo(local, port, &hints, &serv); + AssertFatal(status == 0, "getaddrinfo() failed: %s\n", gai_strerror(status)); + + int sd; + struct addrinfo *p = NULL; + for (p = serv; p != NULL; p = p->ai_next) { + char buf[512]; + const char *ip = print_ip(p, buf, sizeof(buf)); + SCTP_DEBUG("Trying %s for server socket creation\n", ip); + + /* SOCK_SEQPACKET to be able to reuse(?) socket through SCTP_INIT_MSG_MULTI_REQ */ + int socktype = server_type ? SOCK_SEQPACKET : SOCK_STREAM; + if ((sd = socket(serv->ai_family, socktype, serv->ai_protocol)) == -1) { + SCTP_WARN("Socket creation failed: %s\n", strerror(errno)); + continue; } - if ((used_addresses = init_p->nb_ipv4_addr + init_p->nb_ipv6_addr) == 0) { - SCTP_WARN("No address provided...\n"); - return -1; - } - - addr = calloc(used_addresses, sizeof(struct sockaddr)); - - SCTP_DEBUG("Creating new listen socket on port %u with\n", init_p->port); - - if (init_p->ipv4 == 1) { - struct sockaddr_in *ip4_addr; - - SCTP_DEBUG("ipv4 addresses:\n"); - - for (i = 0; i < init_p->nb_ipv4_addr; i++) { - SCTP_DEBUG("\t- "IPV4_ADDR"\n", IPV4_ADDR_FORMAT(init_p->ipv4_address[i])); - ip4_addr = (struct sockaddr_in *)&addr[i]; - ip4_addr->sin_family = AF_INET; - ip4_addr->sin_port = htons(init_p->port); - ip4_addr->sin_addr.s_addr = init_p->ipv4_address[i]; - } - } - - if (init_p->ipv6 == 1) { - struct sockaddr_in6 *ip6_addr; - - SCTP_DEBUG("ipv6 addresses:\n"); - - for (j = 0; j < init_p->nb_ipv6_addr; j++) { - SCTP_DEBUG("\t- %s\n", init_p->ipv6_address[j]); - ip6_addr = (struct sockaddr_in6 *)&addr[i + j]; - ip6_addr->sin6_family = AF_INET6; - ip6_addr->sin6_port = htons(init_p->port); - - if (inet_pton(AF_INET6, init_p->ipv6_address[j], - ip6_addr->sin6_addr.s6_addr) <= 0) { - SCTP_WARN("Provided ipv6 address %s is not valid\n", - init_p->ipv6_address[j]); - } - } - } - - if (server_type) { - if ((sd = socket(AF_INET, SOCK_SEQPACKET, IPPROTO_SCTP)) < 0) { - SCTP_ERROR("socket: %s:%d\n", strerror(errno), errno); - free(addr); - return -1; - } - } - else { - if ((sd = socket(AF_INET6, SOCK_STREAM, IPPROTO_SCTP)) < 0) { - SCTP_ERROR("socket: %s:%d\n", strerror(errno), errno); - free(addr); - return -1; - } - } + /* we assume we can set options, or something is likely broken; the + * connection won't operate properly */ + int ret = sctp_set_init_opt(sd, in_streams, out_streams, 0, 0); + AssertFatal(ret == 0, "sctp_set_init_opt() failed\n"); + struct sctp_event_subscribe event = {0}; event.sctp_data_io_event = 1; event.sctp_association_event = 1; event.sctp_address_event = 1; @@ -685,83 +644,55 @@ static int sctp_create_new_listener( event.sctp_shutdown_event = 1; event.sctp_partial_delivery_event = 1; - if (setsockopt(sd, IPPROTO_SCTP, SCTP_EVENTS, &event, - 8) < 0) { - SCTP_ERROR("setsockopt: %s:%d\n", strerror(errno), errno); - if (sd != -1) { - close(sd); - sd = -1; - } - free(addr); - return -1; - } + /* as above */ + ret = setsockopt(sd, serv->ai_protocol, SCTP_EVENTS, &event, 8); + AssertFatal(ret == 0, "setsockopt() IPPROTO_SCTP_EVENTS failed: %s\n", strerror(errno)); - sctp_cnx = calloc(1, sizeof(*sctp_cnx)); - - if (server_type) { - sctp_cnx->connection_type = SCTP_TYPE_MULTI_SERVER; - } - else { - sctp_cnx->connection_type = SCTP_TYPE_SERVER; - } - - sctp_cnx->sd = sd; - sctp_cnx->local_port = init_p->port; - sctp_cnx->in_streams = 32; - sctp_cnx->out_streams = 32; - sctp_cnx->ppid = init_p->ppid; - sctp_cnx->task_id = requestor; - sctp_cnx->instance = instance; - - /* Some pre-bind socket configuration */ - if (sctp_set_init_opt(sd, - sctp_cnx->in_streams, - sctp_cnx->out_streams, - 0, - 0) < 0) { - goto err; - } - - if (sctp_bindx(sd, addr, used_addresses, SCTP_BINDX_ADD_ADDR) != 0) { - SCTP_ERROR("sctp_bindx: %s:%d\n", strerror(errno), errno); - free(sctp_cnx); - sctp_cnx = NULL; - return -1; + /* if that fails, we will try the next address */ + ret = sctp_bindx(sd, p->ai_addr, 1, SCTP_BINDX_ADD_ADDR); + if (ret != 0) { + SCTP_WARN("sctp_bindx() SCTP_BINDX_ADD_ADDR failed: errno %d %s\n", errno, strerror(errno)); + close(sd); + continue; } if (listen(sd, 5) < 0) { - SCTP_ERROR("listen: %s:%d\n", strerror(errno), errno); - free(sctp_cnx); - sctp_cnx = NULL; - return -1; - } - SCTP_DEBUG("Created listen socket: %d\n", sd); - /* Insert new element at end of list */ - STAILQ_INSERT_TAIL(&sctp_cnx_list, sctp_cnx, entries); - sctp_nb_cnx++; - - /* Add the socket to list of fd monitored by ITTI */ - itti_subscribe_event_fd(TASK_SCTP, sd); - - return sd; -err: - - if (sd != -1) { - close(sd); - sd = -1; + SCTP_WARN("listen() failed: %s:%d\n", strerror(errno), errno); + close(sd); + return -1; } - if (sctp_cnx != NULL) { - free(sctp_cnx); - sctp_cnx = NULL; - } + SCTP_DEBUG("Created listen socket %d on %s:%s local %s\n", sd, ip, port, local); - if (addr != NULL) { - free(addr); - addr = NULL; - } + break; + } + freeaddrinfo(serv); + + if (p == NULL) { + SCTP_ERROR("could not open server socket, no SCTP listener active\n"); return -1; + } + + struct sctp_cnx_list_elm_s *sctp_cnx = calloc(1, sizeof(*sctp_cnx)); + AssertFatal(sctp_cnx != NULL, "out of memory\n"); + + sctp_cnx->connection_type = server_type ? SCTP_TYPE_MULTI_SERVER : SCTP_TYPE_SERVER; + sctp_cnx->sd = sd; + sctp_cnx->local_port = init_p->port; + sctp_cnx->in_streams = in_streams; + sctp_cnx->out_streams = out_streams; + sctp_cnx->ppid = init_p->ppid; + sctp_cnx->task_id = requestor; + sctp_cnx->instance = instance; + /* Insert new element at end of list */ + STAILQ_INSERT_TAIL(&sctp_cnx_list, sctp_cnx, entries); + sctp_nb_cnx++; + + /* Add the socket to list of fd monitored by ITTI */ + itti_subscribe_event_fd(TASK_SCTP, sd); + + return sd; } //------------------------------------------------------------------------------ From 4b2a59b02782d4ff7a60226221e263ab4cd53e57 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 22 Mar 2024 12:47:53 +0100 Subject: [PATCH 05/20] Remove AMF Network Interface sections's interface names: not used --- .../conf_files/gnb-cu.sa.band78.106prb.conf | 2 -- ci-scripts/conf_files/gnb-cu.sa.f1.conf | 2 -- 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 | 2 -- .../conf_files/gnb-cuup.sa.f1.quectel.conf | 2 -- .../gnb-vnf.sa.band78.273prb.aerial.conf | 2 -- .../gnb.band66.106prb.rfsim.phytest-dora.conf | 2 -- .../gnb.band78.106prb.rfsim.phytest-dora.conf | 2 -- ...b.band78.106prb.usrpn300.phytest-dora.conf | 2 -- ...b.band78.162prb.usrpn300.phytest-dora.conf | 2 -- ...b.band78.273prb.usrpn300.phytest-dora.conf | 2 -- .../gnb.nsa.band78.106prb.usrpb200.conf | 2 -- .../gnb.nsa.band78.106prb.usrpn310.2x2.conf | 2 -- .../gnb.sa.band261.u3.32prb.rfsim.conf | 2 -- .../gnb.sa.band66.106prb.rfsim.conf | 2 -- .../gnb.sa.band66.u0.25prb.rfsim.conf | 2 -- .../gnb.sa.band78.106prb.l2sim.conf | 2 -- .../gnb.sa.band78.106prb.n310.7ds2u.conf | 2 -- .../gnb.sa.band78.106prb.rfsim.2x2.conf | 2 -- .../gnb.sa.band78.106prb.rfsim.conf | 2 -- .../gnb.sa.band78.106prb.usrp310.2x2.conf | 2 -- ...gnb.sa.band78.106prb.usrpb200.sc-fdma.conf | 2 -- ...b.sa.band78.106prb.usrpn310.ddsuu-2x2.conf | 2 -- .../gnb.sa.band78.162prb.usrpn310.2x2.conf | 2 -- .../conf_files/gnb.sa.band78.24prb.rfsim.conf | 2 -- .../gnb.sa.band78.51prb.aw2s.ddsuu.conf | 2 -- .../gnb.sa.band78.51prb.usrpb200.conf | 2 -- .../conf_files/untested/benetel-5g.conf | 2 -- .../episci_rcc.band78.tm1.106PRB.nfapi.conf | 2 -- .../gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf | 2 -- .../proxy_rcc.band78.tm1.106PRB.nfapi.conf | 2 -- .../gNB_SA_n78_106PRB.2x2_usrpn310.conf | 2 -- .../gNB_SA_n78_133PRB.2x2_usrpn310.conf | 2 -- .../gnb.band78.sa.fr1.106PRB.usrpn310.conf | 3 --- .../gnb.band78.tm1.fr1.106PRB.usrpb210.conf | 2 -- .../gnb.band78.tm1.fr1.106PRB.usrpn310.conf | 2 -- .../gnb.sa.band66.fr1.106PRB.usrpn300.conf | 2 -- .../gnb.sa.band78.fr1.51PRB.usrpb210.conf | 2 -- ...oxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf | 2 -- doc/Aerial_FAPI_Split_Tutorial.md | 5 ++--- doc/ORAN_FHI7.2_Tutorial.md | 4 ++-- doc/TESTING_GNB_W_COTS_UE.md | 2 -- doc/testing_gnb_w_cots_ue_resources/gnb.conf | 2 -- executables/nr-softmodem.c | 9 --------- openair2/E1AP/e1ap_setup.c | 2 +- openair2/GNB_APP/gnb_paramdef.h | 19 +++++-------------- .../GENERIC-LTE-EPC/CONF/benetel-5g.conf | 2 -- .../CONF/gnb.band257.tm1.32PRB.usrpn300.conf | 2 -- .../CONF/gnb.band257.tm1.32PRB.usrpx300.conf | 2 -- .../CONF/gnb.band257.tm1.66PRB.usrpn300.conf | 2 -- .../CONF/gnb.band261.tm1.32PRB.usrpn300.conf | 2 -- .../CONF/gnb.band66.tm1.106PRB.usrpn300.conf | 2 -- .../CONF/gnb.band66.tm1.106PRB.usrpx300.conf | 2 -- .../CONF/gnb.band66.tm1.24PRB.usrpx300.conf | 2 -- .../CONF/gnb.band66.tm1.25PRB.usrpn300.conf | 2 -- .../CONF/gnb.band66.tm1.25PRB.usrpx300.conf | 2 -- .../gnb.band78.106PRB.30kHz,usrpb2x0.conf | 2 -- .../CONF/gnb.band78.106PRB.slave.conf | 2 -- .../CONF/gnb.band78.slave.conf | 2 -- .../gnb.band78.tm1.106PRB.PTRS.usrpx300.conf | 2 -- .../CONF/gnb.band78.tm1.106PRB.usrpb210.conf | 2 -- .../CONF/gnb.band78.tm1.106PRB.usrpn300.conf | 2 -- .../CONF/gnb.band78.tm1.106PRB.usrpx300.conf | 2 -- .../CONF/gnb.band78.tm1.217PRB.usrpn300.conf | 2 -- .../CONF/gnb.band78.tm1.217PRB.usrpx300.conf | 2 -- .../CONF/gnb.band78.tm1.24PRB.usrpb210.conf | 2 -- .../CONF/gnb.band78.tm1.24PRB.usrpn300.conf | 2 -- .../CONF/gnb.band78.tm1.24PRB.usrpx300.conf | 2 -- .../CONF/gnb.band78.tm1.273PRB.usrpn300.conf | 2 -- .../CONF/rcc.band78.tm1.106PRB.nfapi.conf | 2 -- .../GENERIC-LTE-EPC/CONF/testing_gnb.conf | 2 -- .../CONF/testing_gnb_24PRB.conf | 2 -- .../CONF/testing_gnb_n310.conf | 2 -- .../CONF/testing_gnb_nsa_n310.conf | 2 -- .../PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf | 2 -- .../GENERIC-NR-5GC/CONF/gNB_SA_40_2x2.conf | 2 -- .../CONF/gnb-vnf.sa.band78.273prb.aerial.conf | 2 -- ...gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf | 2 -- ...gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf | 2 -- ...b.band78.tm1.106PRB.usrpn300.gtp-itti.conf | 2 -- .../CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf | 2 -- .../gnb.sa.band257.u3.32prb.usrpx410.conf | 2 -- .../gnb.sa.band41.fr1.106PRB.usrpb210.conf | 2 -- .../gnb.sa.band41.fr1.52PRB.usrpb210.conf | 2 -- .../gnb.sa.band66.fr1.106PRB.usrpn300.conf | 2 -- .../gnb.sa.band66.fr1.106PRB.usrpx300.conf | 2 -- .../gnb.sa.band66.fr1.24PRB.usrpx300.conf | 2 -- .../gnb.sa.band66.fr1.25PRB.usrpx300.conf | 2 -- .../gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf | 2 -- ...gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf | 2 -- .../gnb.sa.band77.fr1.273PRB.usrpx300.conf | 2 -- ...sa.band78.273prb.fhi72.4x2-benetel650.conf | 2 -- ...gnb.sa.band78.273prb.fhi72.4x4-liteon.conf | 2 -- ...gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf | 2 -- ....sa.band78.fr1.106PRB.usrpb210.4layer.conf | 2 -- .../gnb.sa.band78.fr1.106PRB.usrpb210.conf | 2 -- ...b.sa.band78.fr1.106PRB.usrpb210.sabox.conf | 2 -- ...gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf | 2 -- ...gnb.sa.band78.fr1.217PRB.2x2.usrpn300.conf | 2 -- .../gnb.sa.band78.fr1.24PRB.usrpb210.conf | 2 -- .../gnb0.prs.band261.fr2.64PRB.usrpx310.conf | 2 -- .../gnb0.prs.band78.fr1.106PRB.usrpx310.conf | 2 -- .../gnb1.prs.band261.fr2.64PRB.usrpx310.conf | 2 -- .../gnb1.prs.band78.fr1.106PRB.usrpx310.conf | 2 -- .../CONF/vnf.sa.band78.106prb.rfsim.conf | 2 -- 106 files changed, 10 insertions(+), 230 deletions(-) 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 7f975cbcd4..f9b4723a9d 100644 --- a/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf +++ b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf @@ -50,9 +50,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.150"; - GNB_INTERFACE_NAME_FOR_NGU = "eth0"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.71.150"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb-cu.sa.f1.conf b/ci-scripts/conf_files/gnb-cu.sa.f1.conf index c419979a96..26a33d8d7e 100644 --- a/ci-scripts/conf_files/gnb-cu.sa.f1.conf +++ b/ci-scripts/conf_files/gnb-cu.sa.f1.conf @@ -50,9 +50,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.68.194"; - GNB_INTERFACE_NAME_FOR_NGU = "eth0"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.68.194"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb-cucp.sa.f1.conf b/ci-scripts/conf_files/gnb-cucp.sa.f1.conf index 94200b8189..2947ab3018 100644 --- a/ci-scripts/conf_files/gnb-cucp.sa.f1.conf +++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.conf @@ -61,7 +61,6 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.140/24"; }; } 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 8b9e865e0d..e2176e2921 100644 --- a/ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf +++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf @@ -61,7 +61,6 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.68.194"; }; } diff --git a/ci-scripts/conf_files/gnb-cuup.sa.f1.conf b/ci-scripts/conf_files/gnb-cuup.sa.f1.conf index 07e3701749..1f060fc184 100644 --- a/ci-scripts/conf_files/gnb-cuup.sa.f1.conf +++ b/ci-scripts/conf_files/gnb-cuup.sa.f1.conf @@ -48,9 +48,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.161/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.71.161/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; 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 7a2fc7db21..cba77ff4f5 100644 --- a/ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf +++ b/ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf @@ -48,9 +48,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.68.196"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.68.196"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; 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 f1615c0247..ea1ca8306a 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 @@ -200,9 +200,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eno1"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.21.16.131"; - GNB_INTERFACE_NAME_FOR_NGU = "eno"; GNB_IPV4_ADDRESS_FOR_NGU = "172.21.16.131"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf b/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf index 5bf2525092..ca1d488691 100644 --- a/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf +++ b/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf @@ -160,9 +160,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf b/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf index ab6c6b2467..cd1d4bbad9 100644 --- a/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf +++ b/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf @@ -173,9 +173,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf b/ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf index 453b03910b..b9cb726ba7 100644 --- a/ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf +++ b/ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf @@ -173,9 +173,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf b/ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf index aefbe78887..1adbd0fcb4 100644 --- a/ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf +++ b/ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf @@ -171,9 +171,7 @@ gNBs = ); NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf b/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf index 6331462d1b..558b9cca14 100644 --- a/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf +++ b/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf @@ -173,9 +173,7 @@ gNBs = ); NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf index 39bf6858f1..2d34ea8a32 100644 --- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf +++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf @@ -181,9 +181,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.68.194"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.68.194"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "192.168.68.194"; diff --git a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf index b08faabb19..a273c58611 100644 --- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf +++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf @@ -186,9 +186,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "CI_GNB_IP_ADDR"; - GNB_INTERFACE_NAME_FOR_NGU = "eth0"; GNB_IPV4_ADDRESS_FOR_NGU = "CI_GNB_IP_ADDR"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "CI_GNB_IP_ADDR"; diff --git a/ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf index 387bd959ad..09216a405a 100644 --- a/ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf @@ -171,9 +171,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.140/24"; - GNB_INTERFACE_NAME_FOR_NGU = "eth0"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.71.140/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf index c81c9fb0f6..cde9269c6e 100644 --- a/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf @@ -170,9 +170,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.140"; - GNB_INTERFACE_NAME_FOR_NGU = "eth0"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.71.140"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf index 940bd210da..050687a2e8 100644 --- a/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf @@ -170,9 +170,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eno1"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.140/26"; - GNB_INTERFACE_NAME_FOR_NGU = "eno1"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.71.140/26"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; 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 a3a830f8f9..0f579fd8a8 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.l2sim.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.l2sim.conf @@ -168,9 +168,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eno1"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.21.16.128"; - GNB_INTERFACE_NAME_FOR_NGU = "eno1"; GNB_IPV4_ADDRESS_FOR_NGU = "172.21.16.128"; GNB_PORT_FOR_NGU = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf index 75d19c2c43..c3b75f1250 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf @@ -180,9 +180,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eno33np0"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.21.16.124/22"; - GNB_INTERFACE_NAME_FOR_NGU = "eno33np0"; GNB_IPV4_ADDRESS_FOR_NGU = "172.21.16.124/22"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf index c6899c04c9..14337f3141 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf @@ -171,9 +171,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.140/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.71.140/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf index a11f6d5634..ce1b59c97d 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf @@ -174,9 +174,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.140"; - GNB_INTERFACE_NAME_FOR_NGU = "eth0"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.71.140"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf index e7452878e0..b48362f5c5 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf @@ -173,9 +173,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "em1"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "CI_GNB_IP_ADDR"; - GNB_INTERFACE_NAME_FOR_NGU = "em1"; GNB_IPV4_ADDRESS_FOR_NGU = "CI_GNB_IP_ADDR"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf index 3f4a851f2d..e43b91395f 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf @@ -166,9 +166,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.68.194"; - GNB_INTERFACE_NAME_FOR_NGU = "eth0"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.68.194"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf index 9e148178bb..e198c6c2bc 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf @@ -186,9 +186,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "em1"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "CI_GNB_IP_ADDR"; - GNB_INTERFACE_NAME_FOR_NGU = "em1"; GNB_IPV4_ADDRESS_FOR_NGU = "CI_GNB_IP_ADDR"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf b/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf index 9e6dba6169..e0d720af9e 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf @@ -187,9 +187,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "em1"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "CI_GNB_IP_ADDR"; - GNB_INTERFACE_NAME_FOR_NGU = "em1"; GNB_IPV4_ADDRESS_FOR_NGU = "CI_GNB_IP_ADDR"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf index 4b891d1789..02df8b24e4 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf @@ -169,9 +169,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.140/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.71.140/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf index f9ddfd8460..28da37a02f 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf @@ -176,9 +176,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eno33np0"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.21.16.124/20"; - GNB_INTERFACE_NAME_FOR_NGU = "eno33np0"; GNB_IPV4_ADDRESS_FOR_NGU = "172.21.16.124/20"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf index a2e314b3b3..6ac5083b81 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf @@ -166,9 +166,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.68.194"; - GNB_INTERFACE_NAME_FOR_NGU = "eth0"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.68.194"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/untested/benetel-5g.conf b/ci-scripts/conf_files/untested/benetel-5g.conf index cae4ec0b25..0d7c70981d 100644 --- a/ci-scripts/conf_files/untested/benetel-5g.conf +++ b/ci-scripts/conf_files/untested/benetel-5g.conf @@ -189,9 +189,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "CI_GNB_IP_ADDR"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "CI_GNB_IP_ADDR"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "127.0.0.2/24"; 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 491201426b..71cbcd8390 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 @@ -185,9 +185,7 @@ gNBs = { # All of these have to be IP addr of gNB # if in CORE container, make it 172.16.0.X # if not launched in CORE, can set to lo (127.0.0.2) - GNB_INTERFACE_NAME_FOR_S1_MME = "ctrl0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "172.16.0.2"; - GNB_INTERFACE_NAME_FOR_S1U = "ctrl0"; GNB_IPV4_ADDRESS_FOR_S1U = "172.16.0.2"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "172.16.0.2"; 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 38b1cbfa40..8d3bc810d2 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 @@ -171,9 +171,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "ctrl0"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.16.0.1"; - GNB_INTERFACE_NAME_FOR_NGU = "ctrl0"; GNB_IPV4_ADDRESS_FOR_NGU = "172.16.0.1"; GNB_PORT_FOR_NGU = 2152; # Spec 2152 }; 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 41be848ef5..dd67629e0d 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 @@ -208,9 +208,7 @@ gNBs = { # All of these have to be IP addr of gNB # if in CORE container, make it 172.16.0.X # if not launched in CORE, can set to lo (127.0.0.2) - GNB_INTERFACE_NAME_FOR_S1_MME = "lo:"; GNB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.2"; - GNB_INTERFACE_NAME_FOR_S1U = "lo:"; GNB_IPV4_ADDRESS_FOR_S1U = "127.0.0.2"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "127.0.0.2"; diff --git a/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf b/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf index 445ff458c7..7b187c5f3d 100644 --- a/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf +++ b/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf @@ -186,9 +186,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "em1"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.21.16.127/24"; - GNB_INTERFACE_NAME_FOR_NGU = "em1"; GNB_IPV4_ADDRESS_FOR_NGU = "172.21.16.127/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf b/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf index ed1294585b..62cfd0ce45 100644 --- a/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf +++ b/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf @@ -183,9 +183,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "em1"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.21.16.127/24"; - GNB_INTERFACE_NAME_FOR_NGU = "em1"; GNB_IPV4_ADDRESS_FOR_NGU = "172.21.16.127/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf index 05b362d2af..49d22ecbc3 100644 --- a/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf +++ b/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf @@ -190,10 +190,7 @@ gNBs = NETWORK_INTERFACES : { - - GNB_INTERFACE_NAME_FOR_NG_AMF = "em1"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "CI_GNB_IP_ADDR"; - GNB_INTERFACE_NAME_FOR_NGU = "em1"; GNB_IPV4_ADDRESS_FOR_NGU = "CI_GNB_IP_ADDR"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf index 5ed97c58d5..c0c5696d6b 100644 --- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf @@ -180,9 +180,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "CI_GNB_IP_ADDR"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "CI_GNB_IP_ADDR"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "CI_GNB_IP_ADDR"; diff --git a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf index 361cee72e6..8fac94befc 100644 --- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf +++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf @@ -186,9 +186,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "CI_GNB_IP_ADDR"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "CI_GNB_IP_ADDR"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "CI_GNB_IP_ADDR"; diff --git a/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf b/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf index e736a8830f..1e261ca472 100644 --- a/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf +++ b/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf @@ -170,9 +170,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf b/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf index 319edd2eab..eab8bb3e2b 100644 --- a/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf @@ -168,9 +168,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.21.16.137/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "172.21.16.137/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; 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 669558f69c..fb9ef27e8a 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 @@ -168,9 +168,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "lo:"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "127.0.0.2"; - GNB_INTERFACE_NAME_FOR_NGU = "lo:"; GNB_IPV4_ADDRESS_FOR_NGU = "127.0.0.2"; GNB_PORT_FOR_NGU = 2152; # Spec 2152 }; diff --git a/doc/Aerial_FAPI_Split_Tutorial.md b/doc/Aerial_FAPI_Split_Tutorial.md index 063c733fb7..d04c723ca2 100644 --- a/doc/Aerial_FAPI_Split_Tutorial.md +++ b/doc/Aerial_FAPI_Split_Tutorial.md @@ -228,11 +228,10 @@ Edit the sample OAI gNB configuration file and check following parameters: * `gNBs` section * The PLMN section shall match the one defined in the AMF * `amf_ip_address` shall be the correct AMF IP address in your system - * `GNB_INTERFACE_NAME_FOR_NG_AMF` and `GNB_IPV4_ADDRESS_FOR_NG_AMF` shall match your DU N2 interface name and IP address - * `GNB_INTERFACE_NAME_FOR_NGU` and `GNB_IPV4_ADDRESS_FOR_NGU` shall match your DU N3 interface name and IP address + * `GNB_IPV4_ADDRESS_FOR_NG_AMF` shall match your DU N2 interface IP address + * `GNB_IPV4_ADDRESS_FOR_NGU` shall match your DU N3 interface IP address The default amf_ip_address:ipv4 value is 192.168.70.132, when installing the CN5G following [this tutorial](https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/develop/doc/NR_SA_Tutorial_OAI_CN5G.md) -Both 'GNB_INTERFACE_NAME_FOR_NG_AMF' and 'GNB_INTERFACE_NAME_FOR_NGU' need to be set to the network interface name used by the gNB host to connect to the CN5G. Both 'GNB_IPV4_ADDRESS_FOR_NG_AMF' and 'GNB_IPV4_ADDRESS_FOR_NGU' need to be set to the IP address of the NIC referenced previously. diff --git a/doc/ORAN_FHI7.2_Tutorial.md b/doc/ORAN_FHI7.2_Tutorial.md index 1498b07844..42791e6f6f 100644 --- a/doc/ORAN_FHI7.2_Tutorial.md +++ b/doc/ORAN_FHI7.2_Tutorial.md @@ -618,8 +618,8 @@ Edit the sample OAI gNB configuration file and check following parameters: * `gNBs` section * The PLMN section shall match the one defined in the AMF * `amf_ip_address` shall be the correct AMF IP address in your system - * `GNB_INTERFACE_NAME_FOR_NG_AMF` and `GNB_IPV4_ADDRESS_FOR_NG_AMF` shall match your DU N2 interface name and IP address - * `GNB_INTERFACE_NAME_FOR_NGU` and `GNB_IPV4_ADDRESS_FOR_NGU` shall match your DU N3 interface name and IP address + * `GNB_IPV4_ADDRESS_FOR_NG_AMF` shall match your gNB N2 interface IP address + * `GNB_IPV4_ADDRESS_FOR_NGU` shall match your gNB N3 interface IP address * `prach_ConfigurationIndex` * `prach_msg1_FrequencyStart` * Adjust the frequency, bandwidth and SSB position diff --git a/doc/TESTING_GNB_W_COTS_UE.md b/doc/TESTING_GNB_W_COTS_UE.md index a152d54075..a475bd76f5 100644 --- a/doc/TESTING_GNB_W_COTS_UE.md +++ b/doc/TESTING_GNB_W_COTS_UE.md @@ -159,9 +159,7 @@ whether the clock is internal or external is defined in the configuration files NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "**YOUR_GNB_IP_ADDR**"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "**YOUR_GNB_IP_ADDR**"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "**YOUR_GNB_IP_ADDR**"; diff --git a/doc/testing_gnb_w_cots_ue_resources/gnb.conf b/doc/testing_gnb_w_cots_ue_resources/gnb.conf index 206e1b4f02..8ff179ecc2 100755 --- a/doc/testing_gnb_w_cots_ue_resources/gnb.conf +++ b/doc/testing_gnb_w_cots_ue_resources/gnb.conf @@ -185,9 +185,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.18.198/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.18.198/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "192.168.18.198/24"; diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c index 1a93df1657..38628efffe 100644 --- a/executables/nr-softmodem.c +++ b/executables/nr-softmodem.c @@ -365,15 +365,6 @@ static int create_gNB_tasks(ngran_node_t node_type, configmodule_interface_t *cf sprintf(aprefix,"%s.[%i].%s",GNB_CONFIG_STRING_GNB_LIST,0,GNB_CONFIG_STRING_NETWORK_INTERFACES_CONFIG); config_get(cfg, NETParams, sizeofArray(NETParams), aprefix); - for(int i = GNB_INTERFACE_NAME_FOR_NG_AMF_IDX; i <= GNB_IPV4_ADDRESS_FOR_NG_AMF_IDX; i++) { - if( NETParams[i].strptr == NULL) { - LOG_E(NGAP, "No AMF configuration in the file.\n"); - exit(1); - } else { - LOG_D(NGAP, "Configuration in the file: %s.\n",*NETParams[i].strptr); - } - } - if (gnb_nb > 0) { if (itti_create_task (TASK_NGAP, ngap_gNB_task, NULL) < 0) { LOG_E(NGAP, "Create task for NGAP failed\n"); diff --git a/openair2/E1AP/e1ap_setup.c b/openair2/E1AP/e1ap_setup.c index 31dbf6e407..4ec94bc9b5 100644 --- a/openair2/E1AP/e1ap_setup.c +++ b/openair2/E1AP/e1ap_setup.c @@ -50,7 +50,7 @@ static void get_NGU_S1U_addr(char **addr, uint16_t *port) sprintf(gtpupath, "%s.[%i].%s", GNB_CONFIG_STRING_GNB_LIST, 0, GNB_CONFIG_STRING_NETWORK_INTERFACES_CONFIG); config_get(config_get_if(), NETParams, sizeofArray(NETParams), gtpupath); char *address; - if (NETParams[1].strptr != NULL) { + if (NETParams[GNB_IPV4_ADDRESS_FOR_NG_AMF_IDX].strptr != NULL) { LOG_I(GTPU, "SA mode \n"); AssertFatal(gnb_ipv4_address_for_NGU != NULL, "NG-U IPv4 address is NULL: could not read IPv4 address\n"); address = strdup(gnb_ipv4_address_for_NGU); diff --git a/openair2/GNB_APP/gnb_paramdef.h b/openair2/GNB_APP/gnb_paramdef.h index e07a89d305..d729dd3d7d 100644 --- a/openair2/GNB_APP/gnb_paramdef.h +++ b/openair2/GNB_APP/gnb_paramdef.h @@ -338,24 +338,18 @@ typedef enum { /* S1 interface configuration parameters section name */ #define GNB_CONFIG_STRING_NETWORK_INTERFACES_CONFIG "NETWORK_INTERFACES" -#define GNB_INTERFACE_NAME_FOR_NG_AMF_IDX 0 -#define GNB_IPV4_ADDRESS_FOR_NG_AMF_IDX 1 -#define GNB_INTERFACE_NAME_FOR_NGU_IDX 2 -#define GNB_IPV4_ADDR_FOR_NGU_IDX 3 -#define GNB_PORT_FOR_NGU_IDX 4 -#define GNB_IPV4_ADDR_FOR_X2C_IDX 5 -#define GNB_PORT_FOR_X2C_IDX 6 +#define GNB_IPV4_ADDRESS_FOR_NG_AMF_IDX 0 +#define GNB_IPV4_ADDR_FOR_NGU_IDX 1 +#define GNB_PORT_FOR_NGU_IDX 2 +#define GNB_IPV4_ADDR_FOR_X2C_IDX 3 +#define GNB_PORT_FOR_X2C_IDX 4 /* S1 interface configuration parameters names */ -#define GNB_CONFIG_STRING_GNB_INTERFACE_NAME_FOR_S1_MME "GNB_INTERFACE_NAME_FOR_S1_MME" #define GNB_CONFIG_STRING_GNB_IPV4_ADDRESS_FOR_S1_MME "GNB_IPV4_ADDRESS_FOR_S1_MME" -#define GNB_CONFIG_STRING_GNB_INTERFACE_NAME_FOR_S1U "GNB_INTERFACE_NAME_FOR_S1U" #define GNB_CONFIG_STRING_GNB_IPV4_ADDRESS_FOR_S1U "GNB_IPV4_ADDRESS_FOR_S1U" #define GNB_CONFIG_STRING_GNB_PORT_FOR_S1U "GNB_PORT_FOR_S1U" -#define GNB_CONFIG_STRING_GNB_INTERFACE_NAME_FOR_NG_AMF "GNB_INTERFACE_NAME_FOR_NG_AMF" #define GNB_CONFIG_STRING_GNB_IPV4_ADDRESS_FOR_NG_AMF "GNB_IPV4_ADDRESS_FOR_NG_AMF" -#define GNB_CONFIG_STRING_GNB_INTERFACE_NAME_FOR_NGU "GNB_INTERFACE_NAME_FOR_NGU" #define GNB_CONFIG_STRING_GNB_IPV4_ADDR_FOR_NGU "GNB_IPV4_ADDRESS_FOR_NGU" #define GNB_CONFIG_STRING_GNB_PORT_FOR_NGU "GNB_PORT_FOR_NGU" @@ -368,14 +362,11 @@ typedef enum { /* optname helpstr paramflags XXXptr defXXXval type numelt */ /*--------------------------------------------------------------------------------------------------------------------------------------------------*/ #define GNBNETPARAMS_DESC { \ - {GNB_CONFIG_STRING_GNB_INTERFACE_NAME_FOR_NG_AMF, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ {GNB_CONFIG_STRING_GNB_IPV4_ADDRESS_FOR_NG_AMF, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ - {GNB_CONFIG_STRING_GNB_INTERFACE_NAME_FOR_NGU, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ {GNB_CONFIG_STRING_GNB_IPV4_ADDR_FOR_NGU, NULL, 0, .strptr=&gnb_ipv4_address_for_NGU, .defstrval="127.0.0.1",TYPE_STRING, 0}, \ {GNB_CONFIG_STRING_GNB_PORT_FOR_NGU, NULL, 0, .uptr=&gnb_port_for_NGU, .defintval=2152L, TYPE_UINT, 0}, \ {GNB_CONFIG_STRING_ENB_IPV4_ADDR_FOR_X2C, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ {GNB_CONFIG_STRING_ENB_PORT_FOR_X2C, NULL, 0, .uptr=NULL, .defintval=0L, TYPE_UINT, 0}, \ - {GNB_CONFIG_STRING_GNB_INTERFACE_NAME_FOR_S1U, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ {GNB_CONFIG_STRING_GNB_IPV4_ADDRESS_FOR_S1U, NULL, 0, .strptr=&gnb_ipv4_address_for_S1U, .defstrval="127.0.0.1",TYPE_STRING, 0}, \ {GNB_CONFIG_STRING_GNB_PORT_FOR_S1U, NULL, 0, .uptr=&gnb_port_for_S1U, .defintval=2152L, TYPE_UINT, 0} \ } diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf index cbad6fe187..96821e64ba 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf @@ -191,9 +191,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.18.187/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.18.187/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "127.0.0.2/24"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf index c09f10ea0b..7aed3516c6 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf @@ -185,9 +185,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.18.198/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.18.198/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "192.168.18.198/24"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf index 44a17612a9..0feccb8dc0 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf @@ -172,9 +172,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf index 716e222d60..29cf43f0ae 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf @@ -171,9 +171,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf index 78bc1220e8..03b8a6a4ba 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf @@ -185,9 +185,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.18.198/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.18.198/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "192.168.18.198/24"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpn300.conf index ab78dfb950..4639de5a26 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpn300.conf @@ -173,9 +173,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpx300.conf index 8dd080e1c8..79b25f821a 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpx300.conf @@ -160,9 +160,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.24PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.24PRB.usrpx300.conf index b640e2de55..004fa25d36 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.24PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.24PRB.usrpx300.conf @@ -160,9 +160,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpn300.conf index f852550bbe..21d1ddcf0c 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpn300.conf @@ -158,9 +158,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpx300.conf index 3337f67ac8..8defc961a1 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpx300.conf @@ -158,9 +158,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf index 5c636af06c..cb2459f70c 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf @@ -185,9 +185,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf index 6666d75de5..a628b28e10 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf @@ -185,9 +185,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "enp0s31f6"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.75/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.75/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf index 781384a789..9579aa4d68 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf @@ -184,9 +184,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "enp0s31f6"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.75/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.75/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.PTRS.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.PTRS.usrpx300.conf index 807c7cd28b..4d6a1e0b95 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.PTRS.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.PTRS.usrpx300.conf @@ -220,9 +220,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpb210.conf index a818071029..5e7199c65c 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpb210.conf @@ -171,9 +171,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf index 41403e00b1..373f040efb 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf @@ -170,9 +170,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf index 8193e55979..cfebc22824 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf @@ -170,9 +170,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf index eaad417c9b..c39587926b 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf @@ -184,9 +184,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.188/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.188/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf index 80d369beff..db5269a486 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf @@ -172,9 +172,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpb210.conf index f4791448fa..0eb7093caf 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpb210.conf @@ -171,9 +171,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpn300.conf index 34a6f35f11..b1f237b110 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpn300.conf @@ -171,9 +171,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpx300.conf index c9180420fc..dd22e298a0 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpx300.conf @@ -171,9 +171,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf index 6aaba26991..2e9184e3b4 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf @@ -172,9 +172,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; 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 1dcef89736..a4dcb8e13b 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 @@ -194,9 +194,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf index bbc12027d2..6f814ce857 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf @@ -184,9 +184,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.18.198/24"; - GNB_INTERFACE_NAME_FOR_NGU = "eth0"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.18.198/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "192.168.18.198/24"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf index 6604568be1..ee1af659df 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf @@ -185,9 +185,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.18.198/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.18.198/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "192.168.18.198/24"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf index 9ec28b93e7..dea6f800d7 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf @@ -184,9 +184,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.18.196/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.18.196/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "192.168.18.196/24"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf index ed3a3ce385..31020f7e01 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf @@ -187,9 +187,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.18.198/24"; - GNB_INTERFACE_NAME_FOR_NGU = "eth0"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.18.198/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "192.168.18.198/24"; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf index 493680900c..85e7546196 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf @@ -49,9 +49,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.18.207"; - GNB_INTERFACE_NAME_FOR_NGU = "eth0"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.18.207"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gNB_SA_40_2x2.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gNB_SA_40_2x2.conf index 926d8f64d7..434445a2a9 100755 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gNB_SA_40_2x2.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gNB_SA_40_2x2.conf @@ -218,9 +218,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "em1"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.18.196/24"; - GNB_INTERFACE_NAME_FOR_NGU = "em1"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.18.196/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; 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 149aaedb4c..188a37272a 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 @@ -200,9 +200,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf index eebea7448d..1a1f372e99 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf @@ -202,9 +202,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf index 2f1218eb2b..0742b5686c 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf @@ -206,9 +206,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf index 66051ef9bc..6c74da2181 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf @@ -174,9 +174,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eno1"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.199.222/24"; - GNB_INTERFACE_NAME_FOR_NGU = "enx000ec6c0a3ac"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.10.100/24"; GNB_PORT_FOR_NGU = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "192.168.20.20/24"; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf index bf3aa8185c..f537a5b9f2 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf @@ -167,9 +167,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.u3.32prb.usrpx410.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.u3.32prb.usrpx410.conf index f8ae069f61..e23bedf75f 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.u3.32prb.usrpx410.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.u3.32prb.usrpx410.conf @@ -174,9 +174,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf index 4598a8cf90..305dea63d8 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf @@ -168,9 +168,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "internet"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24"; - GNB_INTERFACE_NAME_FOR_NGU = "internet"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.52PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.52PRB.usrpb210.conf index f1f88890fe..da1d3c8a2e 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.52PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.52PRB.usrpb210.conf @@ -174,9 +174,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf index 21d9a1233f..58b1509cda 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf @@ -169,9 +169,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpx300.conf index 6a460e039a..81ebc76128 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpx300.conf @@ -184,9 +184,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eno1"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.129/26"; - GNB_INTERFACE_NAME_FOR_NGU = "eno1"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.71.129/26"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf index 8b82cfb39c..d2e4b5c160 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf @@ -185,9 +185,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eno1"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.129/26"; - GNB_INTERFACE_NAME_FOR_NGU = "eno1"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.71.129/26"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf index 2a0fec9ce8..ed77a1cf67 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf @@ -185,9 +185,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eno1"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.129/26"; - GNB_INTERFACE_NAME_FOR_NGU = "eno1"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.71.129/26"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf index 51b58b7bf7..0060065d65 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf @@ -180,9 +180,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eno8303"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.21.16.108/22"; - GNB_INTERFACE_NAME_FOR_NGU = "eno8303"; GNB_IPV4_ADDRESS_FOR_NGU = "172.21.16.108/22"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf index 42168839c9..4f0e5d93fb 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf @@ -172,9 +172,7 @@ gNBs = ( NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 } diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.usrpx300.conf index 9619ddbcdb..8ce20405b5 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.usrpx300.conf @@ -172,9 +172,7 @@ gNBs = ( NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.80.129/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.80.129/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 } diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel650.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel650.conf index 30bd438e4b..1ffdd10727 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel650.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel650.conf @@ -179,9 +179,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eno8303"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.21.16.108/22"; - GNB_INTERFACE_NAME_FOR_NGU = "eno8303"; GNB_IPV4_ADDRESS_FOR_NGU = "172.21.16.108/22"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf index 44295c0551..ede124400d 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf @@ -179,9 +179,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eno8303"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.21.16.108/22"; - GNB_INTERFACE_NAME_FOR_NGU = "eno8303"; GNB_IPV4_ADDRESS_FOR_NGU = "172.21.16.108/22"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf index b883acbd7e..050630e575 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf @@ -170,9 +170,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.4layer.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.4layer.conf index 6958213f05..0957e59846 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.4layer.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.4layer.conf @@ -170,9 +170,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf index 4f2843c131..382ce159ee 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf @@ -169,9 +169,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf index b40df581d4..21eb24035b 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf @@ -181,9 +181,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.5.200/24"; - GNB_INTERFACE_NAME_FOR_NGU = "eth0"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.5.200/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "192.168.5.200/24"; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf index 6df7390468..29f501295c 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf @@ -172,9 +172,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.2x2.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.2x2.usrpn300.conf index fcd7bff5ce..f512c178a4 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.2x2.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.2x2.usrpn300.conf @@ -171,9 +171,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf index 87db51d66c..29a8946272 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf @@ -169,9 +169,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf index 4303f56270..9f16fae654 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf @@ -185,9 +185,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.18.198/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.18.198/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "192.168.18.198/24"; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band78.fr1.106PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band78.fr1.106PRB.usrpx310.conf index 5489822423..986a12db35 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band78.fr1.106PRB.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band78.fr1.106PRB.usrpx310.conf @@ -206,9 +206,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "em1"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "CI_GNB_IP_ADDR"; - GNB_INTERFACE_NAME_FOR_NGU = "em1"; GNB_IPV4_ADDRESS_FOR_NGU = "CI_GNB_IP_ADDR"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band261.fr2.64PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band261.fr2.64PRB.usrpx310.conf index e76367686b..dfd2c70ded 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band261.fr2.64PRB.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band261.fr2.64PRB.usrpx310.conf @@ -185,9 +185,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.18.198/24"; - GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.18.198/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "192.168.18.198/24"; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band78.fr1.106PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band78.fr1.106PRB.usrpx310.conf index 9d09ed3936..82f660642a 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band78.fr1.106PRB.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band78.fr1.106PRB.usrpx310.conf @@ -205,9 +205,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "em1"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "CI_GNB_IP_ADDR"; - GNB_INTERFACE_NAME_FOR_NGU = "em1"; GNB_IPV4_ADDRESS_FOR_NGU = "CI_GNB_IP_ADDR"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; 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 3d3698b1dc..247b3502d5 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 @@ -187,9 +187,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24"; - GNB_INTERFACE_NAME_FOR_NGU = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 }; From fd66d17214ef447742253f52d948d65639994943 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 22 Mar 2024 13:48:44 +0100 Subject: [PATCH 06/20] Remove MMEs Network Inferface section's interface names: not used --- ...band40.25prb.tm1.if4p5.fair-scheduler.conf | 2 -- .../enb-rcc.band7.25prb.tm1.if4p5.conf | 2 -- .../conf_files/enb.band38.25prb.rfsim.conf | 2 -- .../enb.band38.lte_2x2.100prb.usrpn310.conf | 2 -- ...nb.band38.lte_2x2_tm2.100prb.usrpn310.conf | 2 -- .../enb.band38.nsa_2x2.100prb.usrpn310.conf | 2 -- ....100prb.usrpb200.tm1-defaultscheduler.conf | 2 -- .../conf_files/enb.band40.25prb.usrpb200.conf | 2 -- .../conf_files/enb.band7.100prb.rfsim.conf | 2 -- .../enb.band7.100prb.usrpb200.tm1.conf | 2 -- .../conf_files/enb.band7.25prb.l2sim.conf | 2 -- .../conf_files/enb.band7.25prb.rfsim.conf | 2 -- .../enb.band7.25prb.rfsim.nos1.conf | 2 -- .../conf_files/enb.band7.25prb.usrpb200.conf | 2 -- .../enb.band7.25prb.usrpb200.tm1-norrc.conf | 2 -- .../enb.band7.25prb.usrpb200.tm1.conf | 2 -- .../conf_files/enb.band7.50prb.rfsim.conf | 2 -- .../enb.band7.50prb.usrpb200.tm1.conf | 2 -- .../enb.band7.tm1.25prb.rfsim.mbms.conf | 2 -- .../enb.band7.tm1.50prb.usrpb210.conf | 2 -- .../enb.nsa.band7.25prb.usrpb200.conf | 2 -- .../conf_files/untested/benetel-4g.conf | 2 -- .../enb.band13.tm1.25PRB.usrpb210.conf | 2 -- .../untested/enb.band13.tm1.50PRB.emtc.conf | 2 -- .../enb.band17.tm1.25PRB.usrpb210.conf | 2 -- .../enb.band17.tm1.mbms.25PRB.usrpb210.conf | 2 -- ...d40.tm1.100PRB.FairScheduler.usrpb210.conf | 2 -- ...nd40.tm1.25PRB.FairScheduler.usrpb210.conf | 2 -- ...nd40.tm1.50PRB.FairScheduler.usrpb210.conf | 2 -- ...nd40.tm2.25PRB.FairScheduler.usrpb210.conf | 2 -- .../enb.band7.tm1.100PRB.usrpb210.conf | 2 -- .../enb.band7.tm1.25PRB.slave.usrpb210.conf | 2 -- .../enb.band7.tm1.25PRB.usrpb210.conf | 2 -- .../enb.band7.tm1.fr1.25PRB.usrpb210.conf | 2 -- .../enb.band7.tm2.25PRB.usrpb210.conf | 2 -- .../enb.slave.band13.tm1.25PRB.usrpb210.conf | 2 -- .../episci/episci_rcc.band7.tm1.nfapi.conf | 2 -- .../episci/proxy_rcc.band7.tm1.nfapi.conf | 2 -- .../untested/lte-tdd-basic-sim.conf | 2 -- .../rcc.band38.tm1.50PRB.multi.rru.conf | 2 -- ...cc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf | 2 -- .../rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf | 2 -- .../untested/rcc.band7.tm1.nfapi.conf | 2 -- doc/L2NFAPI_NOS1.md | 2 -- doc/L2NFAPI_S1.md | 2 -- doc/TESTING_GNB_W_COTS_UE.md | 2 -- doc/testing_gnb_w_cots_ue_resources/enb.conf | 2 -- openair2/ENB_APP/enb_config.c | 1 - openair2/ENB_APP/enb_paramdef.h | 25 +++++++------------ openair2/ENB_APP/enb_paramdef_mce.h | 14 +++-------- openair2/MCE_APP/mce_config.c | 8 ------ .../CONF/enb.centos.calisson.conf | 2 -- .../CONF/enb.centos.memphis.conf | 2 -- .../CONF/enb.centos.nord.conf | 2 -- .../GENERIC-LTE-EPC/CONF/benetel-4g.conf | 2 -- .../PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf | 2 -- .../CONF/enb.band13.tm1.50PRB.emtc.conf | 2 -- .../CONF/enb.band38.tm1.100PRB.usrpx310.conf | 2 -- .../CONF/enb.band38.tm1.25PRB.iris030.conf | 2 -- .../CONF/enb.band38.tm1.usrpx310.conf | 2 -- .../CONF/enb.band42.tm1.25PRB.iris030.conf | 2 -- .../CONF/enb.band7.25prb.bladerf.conf | 2 -- .../CONF/enb.band7.master.conf | 2 -- .../CONF/enb.band7.tm1.100PRB.usrpx310.conf | 2 -- .../CONF/enb.band7.tm1.25PRB.iris030.conf | 2 -- .../enb.band7.tm1.25PRB.usrpb210.replay.conf | 2 -- .../enb.band7.tm1.50PRB.usrpb210-d2d.conf | 2 -- .../CONF/enb.band7.tm1.50PRB.usrpb210.conf | 2 -- ...band7.tm1.50PRB.usrpb210_ue_expansion.conf | 2 -- .../CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf | 2 -- .../CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf | 2 -- .../CONF/rcc.band7.tm1.50PRB.nfapi.conf | 4 --- .../CONF/rcc.band7.tm1.if4p5.50PRB.conf | 2 -- .../CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf | 2 -- .../CONF/rcc_b38_if5_ENDC.conf | 2 -- .../CONF/testing_eNB_band13.conf | 2 -- .../GENERIC-LTE-EPC/CONF/testing_enb.conf | 2 -- 77 files changed, 13 insertions(+), 183 deletions(-) diff --git a/ci-scripts/conf_files/enb-rcc.band40.25prb.tm1.if4p5.fair-scheduler.conf b/ci-scripts/conf_files/enb-rcc.band40.25prb.tm1.if4p5.fair-scheduler.conf index 6ced7573e0..3addb51ee0 100644 --- a/ci-scripts/conf_files/enb-rcc.band40.25prb.tm1.if4p5.fair-scheduler.conf +++ b/ci-scripts/conf_files/enb-rcc.band40.25prb.tm1.if4p5.fair-scheduler.conf @@ -156,9 +156,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.45"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.45"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.45"; diff --git a/ci-scripts/conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf b/ci-scripts/conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf index 11bc672958..521c61d1df 100644 --- a/ci-scripts/conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf +++ b/ci-scripts/conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf @@ -193,9 +193,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.46"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.46"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.46"; diff --git a/ci-scripts/conf_files/enb.band38.25prb.rfsim.conf b/ci-scripts/conf_files/enb.band38.25prb.rfsim.conf index e19cd4d68a..0869c5fde5 100644 --- a/ci-scripts/conf_files/enb.band38.25prb.rfsim.conf +++ b/ci-scripts/conf_files/enb.band38.25prb.rfsim.conf @@ -153,9 +153,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.61.20"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.61.20"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "192.168.61.20"; diff --git a/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf b/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf index 53c4027662..e2a4651718 100644 --- a/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf +++ b/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf @@ -190,9 +190,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eno1"; ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.16.128"; - ENB_INTERFACE_NAME_FOR_S1U = "eno1"; ENB_IPV4_ADDRESS_FOR_S1U = "172.21.16.128"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "172.21.16.128"; diff --git a/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf b/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf index e9cb3ee327..b81746efc9 100644 --- a/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf +++ b/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf @@ -190,9 +190,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eno1"; ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.16.128"; - ENB_INTERFACE_NAME_FOR_S1U = "eno1"; ENB_IPV4_ADDRESS_FOR_S1U = "172.21.16.128"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "172.21.16.128"; diff --git a/ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf b/ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf index bc2cc8f61b..5e7abfc462 100644 --- a/ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf +++ b/ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf @@ -190,9 +190,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eno1"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eno1"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; diff --git a/ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf b/ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf index 56ded888c8..b5264bd3a1 100644 --- a/ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf +++ b/ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf @@ -153,9 +153,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.45"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.45"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.45"; diff --git a/ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf b/ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf index 9b812aa755..af905bd7d4 100644 --- a/ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf +++ b/ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf @@ -153,9 +153,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.45"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.45"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.45"; diff --git a/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf b/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf index 3c0b994017..8c4910964d 100644 --- a/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf +++ b/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf @@ -194,9 +194,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.61.20"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.61.20"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "192.168.61.20"; diff --git a/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf b/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf index 30d2549a48..51fd6458ad 100644 --- a/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf +++ b/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf @@ -194,9 +194,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.46"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.46"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.46"; diff --git a/ci-scripts/conf_files/enb.band7.25prb.l2sim.conf b/ci-scripts/conf_files/enb.band7.25prb.l2sim.conf index f4ed527153..d5003915ba 100644 --- a/ci-scripts/conf_files/enb.band7.25prb.l2sim.conf +++ b/ci-scripts/conf_files/enb.band7.25prb.l2sim.conf @@ -191,9 +191,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.61.1"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.61.1"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "192.168.61.1"; diff --git a/ci-scripts/conf_files/enb.band7.25prb.rfsim.conf b/ci-scripts/conf_files/enb.band7.25prb.rfsim.conf index c5d8383860..3ffc66fb5b 100644 --- a/ci-scripts/conf_files/enb.band7.25prb.rfsim.conf +++ b/ci-scripts/conf_files/enb.band7.25prb.rfsim.conf @@ -194,9 +194,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.61.20"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.61.20"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "192.168.61.20"; diff --git a/ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf b/ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf index c5d8383860..3ffc66fb5b 100644 --- a/ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf +++ b/ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf @@ -194,9 +194,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.61.20"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.61.20"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "192.168.61.20"; diff --git a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.conf b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.conf index 7724fb9f1d..cacde64166 100644 --- a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.conf +++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.conf @@ -194,9 +194,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.61.30"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.61.30"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "192.168.61.30"; diff --git a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf index 348c5f7ccd..9ce2fbbea7 100644 --- a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf +++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf @@ -194,9 +194,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.46"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.46"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.46"; diff --git a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf index 3e5088baad..b0dff73ed7 100644 --- a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf +++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf @@ -194,9 +194,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.46"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.46"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.46"; diff --git a/ci-scripts/conf_files/enb.band7.50prb.rfsim.conf b/ci-scripts/conf_files/enb.band7.50prb.rfsim.conf index abfc3887cd..7e1119bb80 100644 --- a/ci-scripts/conf_files/enb.band7.50prb.rfsim.conf +++ b/ci-scripts/conf_files/enb.band7.50prb.rfsim.conf @@ -194,9 +194,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.61.20"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.61.20"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "192.168.61.20"; diff --git a/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf b/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf index 41c2e3a668..9ed681be05 100644 --- a/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf +++ b/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf @@ -194,9 +194,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "172.21.18.46"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "172.21.18.46"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "172.21.18.46"; diff --git a/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf b/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf index e0b5dc7257..911a1f9b9f 100644 --- a/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf +++ b/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf @@ -208,9 +208,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; diff --git a/ci-scripts/conf_files/enb.band7.tm1.50prb.usrpb210.conf b/ci-scripts/conf_files/enb.band7.tm1.50prb.usrpb210.conf index 5fd6142c9d..ee0c20d39d 100644 --- a/ci-scripts/conf_files/enb.band7.tm1.50prb.usrpb210.conf +++ b/ci-scripts/conf_files/enb.band7.tm1.50prb.usrpb210.conf @@ -198,9 +198,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; diff --git a/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf b/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf index fb4e2f58b5..d573088cfd 100644 --- a/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf +++ b/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf @@ -194,9 +194,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.68.130"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.68.130"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "192.168.68.130"; diff --git a/ci-scripts/conf_files/untested/benetel-4g.conf b/ci-scripts/conf_files/untested/benetel-4g.conf index 0aef179a7d..de642bc12e 100644 --- a/ci-scripts/conf_files/untested/benetel-4g.conf +++ b/ci-scripts/conf_files/untested/benetel-4g.conf @@ -194,9 +194,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.1"; diff --git a/ci-scripts/conf_files/untested/enb.band13.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band13.tm1.25PRB.usrpb210.conf index 6bd83038c7..9c8c9413ae 100644 --- a/ci-scripts/conf_files/untested/enb.band13.tm1.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band13.tm1.25PRB.usrpb210.conf @@ -190,9 +190,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/ci-scripts/conf_files/untested/enb.band13.tm1.50PRB.emtc.conf b/ci-scripts/conf_files/untested/enb.band13.tm1.50PRB.emtc.conf index ba10f14299..e69b257ce3 100644 --- a/ci-scripts/conf_files/untested/enb.band13.tm1.50PRB.emtc.conf +++ b/ci-scripts/conf_files/untested/enb.band13.tm1.50PRB.emtc.conf @@ -373,9 +373,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; diff --git a/ci-scripts/conf_files/untested/enb.band17.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band17.tm1.25PRB.usrpb210.conf index b85d2c2989..87ba577d08 100644 --- a/ci-scripts/conf_files/untested/enb.band17.tm1.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band17.tm1.25PRB.usrpb210.conf @@ -194,9 +194,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; diff --git a/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf index dffa4010b7..ed869e0be6 100644 --- a/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf @@ -219,9 +219,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; diff --git a/ci-scripts/conf_files/untested/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf index ae9aacf0ca..f991e22a90 100644 --- a/ci-scripts/conf_files/untested/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf @@ -153,9 +153,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; diff --git a/ci-scripts/conf_files/untested/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf index 736f0e161d..98692b30a1 100644 --- a/ci-scripts/conf_files/untested/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf @@ -153,9 +153,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; diff --git a/ci-scripts/conf_files/untested/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf index bc3179f98d..fe9ff9b5c7 100644 --- a/ci-scripts/conf_files/untested/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf @@ -153,9 +153,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; diff --git a/ci-scripts/conf_files/untested/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf index 99b2140ffa..6eef6c94ce 100644 --- a/ci-scripts/conf_files/untested/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf @@ -151,9 +151,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; diff --git a/ci-scripts/conf_files/untested/enb.band7.tm1.100PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band7.tm1.100PRB.usrpb210.conf index 27c52d7408..3b2a0a975d 100644 --- a/ci-scripts/conf_files/untested/enb.band7.tm1.100PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band7.tm1.100PRB.usrpb210.conf @@ -190,9 +190,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; diff --git a/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf index d78a559611..aa81417dcc 100644 --- a/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf @@ -199,9 +199,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; diff --git a/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.usrpb210.conf index 035c7e58a9..17414fe1ac 100644 --- a/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.usrpb210.conf @@ -194,9 +194,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; diff --git a/ci-scripts/conf_files/untested/enb.band7.tm1.fr1.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band7.tm1.fr1.25PRB.usrpb210.conf index 12e27c7864..d55fe2f6aa 100644 --- a/ci-scripts/conf_files/untested/enb.band7.tm1.fr1.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band7.tm1.fr1.25PRB.usrpb210.conf @@ -194,9 +194,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; diff --git a/ci-scripts/conf_files/untested/enb.band7.tm2.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band7.tm2.25PRB.usrpb210.conf index dcbe68ff03..e6188c77ab 100644 --- a/ci-scripts/conf_files/untested/enb.band7.tm2.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band7.tm2.25PRB.usrpb210.conf @@ -193,9 +193,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; diff --git a/ci-scripts/conf_files/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf index 2a82dee0b9..de4e9922a9 100644 --- a/ci-scripts/conf_files/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf @@ -195,9 +195,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 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 81951e5219..a41553650f 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 @@ -191,9 +191,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "ctrl0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "172.16.0.1"; - ENB_INTERFACE_NAME_FOR_S1U = "ctrl0"; ENB_IPV4_ADDRESS_FOR_S1U = "172.16.0.1"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "172.16.0.1"; 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 50ece56b23..0adda79827 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 @@ -191,9 +191,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "lo"; ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.1"; - ENB_INTERFACE_NAME_FOR_S1U = "lo"; ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.1"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.1"; diff --git a/ci-scripts/conf_files/untested/lte-tdd-basic-sim.conf b/ci-scripts/conf_files/untested/lte-tdd-basic-sim.conf index fa017ce63e..b982b0bb96 100644 --- a/ci-scripts/conf_files/untested/lte-tdd-basic-sim.conf +++ b/ci-scripts/conf_files/untested/lte-tdd-basic-sim.conf @@ -153,9 +153,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; diff --git a/ci-scripts/conf_files/untested/rcc.band38.tm1.50PRB.multi.rru.conf b/ci-scripts/conf_files/untested/rcc.band38.tm1.50PRB.multi.rru.conf index 6651f380e4..b3778ad27a 100644 --- a/ci-scripts/conf_files/untested/rcc.band38.tm1.50PRB.multi.rru.conf +++ b/ci-scripts/conf_files/untested/rcc.band38.tm1.50PRB.multi.rru.conf @@ -149,9 +149,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "enp129s0f0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "enp129s0f0"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; #"127.0.0.4/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152\ diff --git a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf index 1bcd26b931..5fa54b7f9d 100644 --- a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf +++ b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf @@ -186,9 +186,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "enp2s0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.10.15/24"; - ENB_INTERFACE_NAME_FOR_S1U = "enp2s0"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.10.15/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf index e398310a35..ad47de21f3 100644 --- a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf +++ b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf @@ -186,9 +186,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "lo"; ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.2/24"; - ENB_INTERFACE_NAME_FOR_S1U = "lo"; ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.5/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 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 6f7a5d2dfd..f9782ead8b 100644 --- a/ci-scripts/conf_files/untested/rcc.band7.tm1.nfapi.conf +++ b/ci-scripts/conf_files/untested/rcc.band7.tm1.nfapi.conf @@ -191,9 +191,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "ens3"; ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; - ENB_INTERFACE_NAME_FOR_S1U = "ens3"; ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; diff --git a/doc/L2NFAPI_NOS1.md b/doc/L2NFAPI_NOS1.md index b65aaef3ba..46ea9aabbe 100644 --- a/doc/L2NFAPI_NOS1.md +++ b/doc/L2NFAPI_NOS1.md @@ -175,9 +175,7 @@ Last, the S1 interface shall be properly set. NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "ens3"; // replace with the proper interface name ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; // replace with 192.168.122.31 - ENB_INTERFACE_NAME_FOR_S1U = "ens3"; // replace with the proper interface name ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; // replace with 192.168.122.31 ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; // replace with 192.168.122.31 diff --git a/doc/L2NFAPI_S1.md b/doc/L2NFAPI_S1.md index a8b287ddf3..3278072dd9 100644 --- a/doc/L2NFAPI_S1.md +++ b/doc/L2NFAPI_S1.md @@ -180,9 +180,7 @@ Last, the S1 interface shall be properly set. NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "ens3"; // replace with the proper interface name ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; // replace with 192.168.122.31 - ENB_INTERFACE_NAME_FOR_S1U = "ens3"; // replace with the proper interface name ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; // replace with 192.168.122.31 ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; // replace with 192.168.122.31 diff --git a/doc/TESTING_GNB_W_COTS_UE.md b/doc/TESTING_GNB_W_COTS_UE.md index a475bd76f5..7102a254ed 100644 --- a/doc/TESTING_GNB_W_COTS_UE.md +++ b/doc/TESTING_GNB_W_COTS_UE.md @@ -120,9 +120,7 @@ whether the clock is internal or external is defined in the configuration files ``` NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "**YOUR_ENB_IP_ADDR**"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "**YOUR_ENB_IP_ADDR**"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "**YOUR_ENB_IP_ADDR**"; diff --git a/doc/testing_gnb_w_cots_ue_resources/enb.conf b/doc/testing_gnb_w_cots_ue_resources/enb.conf index 027b6f2499..67d714175a 100755 --- a/doc/testing_gnb_w_cots_ue_resources/enb.conf +++ b/doc/testing_gnb_w_cots_ue_resources/enb.conf @@ -192,10 +192,8 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth1"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.18.199/24"; - ENB_INTERFACE_NAME_FOR_S1U = "eth1"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.18.199/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c index 0debcc3264..1e4d9037a4 100644 --- a/openair2/ENB_APP/enb_config.c +++ b/openair2/ENB_APP/enb_config.c @@ -1822,7 +1822,6 @@ int RCconfig_RRC(uint32_t i, eNB_RRC_INST *rrc) { int RCconfig_gtpu(void ) { int num_enbs = 0; - char *enb_interface_name_for_S1U = NULL; char *enb_ipv4_address_for_S1U = NULL; uint16_t enb_port_for_S1U = 0; char *address = NULL; diff --git a/openair2/ENB_APP/enb_paramdef.h b/openair2/ENB_APP/enb_paramdef.h index ed3be8c024..e2ceb61987 100644 --- a/openair2/ENB_APP/enb_paramdef.h +++ b/openair2/ENB_APP/enb_paramdef.h @@ -1121,22 +1121,18 @@ typedef struct srb1_params_s { /* S1 interface configuration parameters section name */ #define ENB_CONFIG_STRING_NETWORK_INTERFACES_CONFIG "NETWORK_INTERFACES" -#define ENB_INTERFACE_NAME_FOR_S1_MME_IDX 0 -#define ENB_IPV4_ADDRESS_FOR_S1_MME_IDX 1 -#define ENB_INTERFACE_NAME_FOR_S1U_IDX 2 -#define ENB_IPV4_ADDR_FOR_S1U_IDX 3 -#define ENB_PORT_FOR_S1U_IDX 4 -#define ENB_IPV4_ADDR_FOR_X2C_IDX 5 -#define ENB_PORT_FOR_X2C_IDX 6 -#define ENB_IPV4_ADDR_FOR_M2C_IDX 7 -#define ENB_PORT_FOR_M2C_IDX 8 -#define MCE_IPV4_ADDR_FOR_M2C_IDX 9 -#define MCE_PORT_FOR_M2C_IDX 10 +#define ENB_IPV4_ADDRESS_FOR_S1_MME_IDX 0 +#define ENB_IPV4_ADDR_FOR_S1U_IDX 1 +#define ENB_PORT_FOR_S1U_IDX 2 +#define ENB_IPV4_ADDR_FOR_X2C_IDX 3 +#define ENB_PORT_FOR_X2C_IDX 4 +#define ENB_IPV4_ADDR_FOR_M2C_IDX 5 +#define ENB_PORT_FOR_M2C_IDX 6 +#define MCE_IPV4_ADDR_FOR_M2C_IDX 7 +#define MCE_PORT_FOR_M2C_IDX 8 /* S1 interface configuration parameters names */ -#define ENB_CONFIG_STRING_ENB_INTERFACE_NAME_FOR_S1_MME "ENB_INTERFACE_NAME_FOR_S1_MME" #define ENB_CONFIG_STRING_ENB_IPV4_ADDRESS_FOR_S1_MME "ENB_IPV4_ADDRESS_FOR_S1_MME" -#define ENB_CONFIG_STRING_ENB_INTERFACE_NAME_FOR_S1U "ENB_INTERFACE_NAME_FOR_S1U" #define ENB_CONFIG_STRING_ENB_IPV4_ADDR_FOR_S1U "ENB_IPV4_ADDRESS_FOR_S1U" #define ENB_CONFIG_STRING_ENB_PORT_FOR_S1U "ENB_PORT_FOR_S1U" @@ -1157,9 +1153,7 @@ typedef struct srb1_params_s { /*--------------------------------------------------------------------------------------------------------------------------------------------------*/ // clang-format off #define NETPARAMS_DESC { \ - {ENB_CONFIG_STRING_ENB_INTERFACE_NAME_FOR_S1_MME, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_ENB_IPV4_ADDRESS_FOR_S1_MME, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ - {ENB_CONFIG_STRING_ENB_INTERFACE_NAME_FOR_S1U, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_ENB_IPV4_ADDR_FOR_S1U, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_ENB_PORT_FOR_S1U, NULL, 0, .u16ptr=NULL, .defuintval=GTPV1_U_PORT_NUMBER, TYPE_UINT16, 0}, \ {ENB_CONFIG_STRING_ENB_IPV4_ADDR_FOR_X2C, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ @@ -1177,7 +1171,6 @@ typedef struct srb1_params_s { /*--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ // clang-format off #define GTPUPARAMS_DESC { \ - {ENB_CONFIG_STRING_ENB_INTERFACE_NAME_FOR_S1U, NULL, 0, .strptr=&enb_interface_name_for_S1U, .defstrval="lo", TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_ENB_IPV4_ADDR_FOR_S1U, NULL, 0, .strptr=&enb_ipv4_address_for_S1U, .defstrval="127.0.0.1", TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_ENB_PORT_FOR_S1U, NULL, 0, .u16ptr=&enb_port_for_S1U, .defuintval=GTPV1_U_PORT_NUMBER, TYPE_UINT16, 0}, \ } diff --git a/openair2/ENB_APP/enb_paramdef_mce.h b/openair2/ENB_APP/enb_paramdef_mce.h index 16c230d5ee..5b61bc3d6e 100644 --- a/openair2/ENB_APP/enb_paramdef_mce.h +++ b/openair2/ENB_APP/enb_paramdef_mce.h @@ -67,30 +67,24 @@ #define MCE_CONFIG_STRING_NETWORK_INTERFACES_CONFIG "NETWORK_INTERFACES" -#define MCE2_INTERFACE_NAME_FOR_M2_ENB_IDX 0 -#define MCE2_IPV4_ADDR_FOR_M2C_IDX 1 -#define MCE2_PORT_FOR_M2C_IDX 2 -#define MCE2_INTERFACE_NAME_FOR_M3_MME_IDX 3 -#define MCE2_IPV4_ADDR_FOR_M3C_IDX 4 -#define MCE2_PORT_FOR_M3C_IDX 5 +#define MCE2_IPV4_ADDR_FOR_M2C_IDX 0 +#define MCE2_PORT_FOR_M2C_IDX 1 +#define MCE2_IPV4_ADDR_FOR_M3C_IDX 2 +#define MCE2_PORT_FOR_M3C_IDX 3 /* interface configuration parameters names */ /* M2 interface configuration parameters names */ -#define MCE_CONFIG_STRING_MCE_INTERFACE_NAME_FOR_M2_ENB "ENB_INTERFACE_NAME_FOR_M2_ENB" #define MCE_CONFIG_STRING_MCE_IPV4_ADDRESS_FOR_M2C "MCE_IPV4_ADDRESS_FOR_M2C" #define MCE_CONFIG_STRING_MCE_PORT_FOR_M2C "MCE_PORT_FOR_M2C" /* M3 interface configuration parameters names */ -#define MCE_CONFIG_STRING_MCE_INTERFACE_NAME_FOR_M3_MME "MCE_INTERFACE_NAME_FOR_M3_MME" #define MCE_CONFIG_STRING_MCE_IPV4_ADDRESS_FOR_M3C "MCE_IPV4_ADDRESS_FOR_M3C" #define MCE_CONFIG_STRING_MCE_PORT_FOR_M3C "MCE_PORT_FOR_M3C" #define MCE_NETPARAMS_DESC { \ -{MCE_CONFIG_STRING_MCE_INTERFACE_NAME_FOR_M2_ENB, NULL, 0, .strptr=&mce_interface_name_for_m2_enb, .defstrval="lo", TYPE_STRING, 0}, \ {MCE_CONFIG_STRING_MCE_IPV4_ADDRESS_FOR_M2C, NULL, 0, .strptr=&mce_ipv4_address_for_m2c, .defstrval=NULL, TYPE_STRING, 0}, \ {MCE_CONFIG_STRING_MCE_PORT_FOR_M2C, NULL, 0, .uptr=&mce_port_for_m2c, .defintval=36443L, TYPE_UINT, 0}, \ -{MCE_CONFIG_STRING_MCE_INTERFACE_NAME_FOR_M3_MME, NULL, 0, .strptr=&mce_interface_name_for_m3_mme, .defstrval=NULL, TYPE_STRING, 0}, \ {MCE_CONFIG_STRING_MCE_IPV4_ADDRESS_FOR_M3C, NULL, 0, .strptr=&mce_ipv4_address_for_m3c, .defstrval=NULL, TYPE_STRING, 0}, \ {MCE_CONFIG_STRING_MCE_PORT_FOR_M3C, NULL, 0, .uptr=&mce_port_for_m3c, .defintval=36444L, TYPE_UINT, 0}, \ } diff --git a/openair2/MCE_APP/mce_config.c b/openair2/MCE_APP/mce_config.c index 1afbf2d90a..7d52908b76 100644 --- a/openair2/MCE_APP/mce_config.c +++ b/openair2/MCE_APP/mce_config.c @@ -60,9 +60,6 @@ int RCconfig_MCE(void ) { //int num_enbs = 0; - //char *enb_interface_name_for_S1U = NULL; - char *mce_interface_name_for_m2_enb = NULL; - char *mce_interface_name_for_m3_mme = NULL; //char *enb_ipv4_address_for_S1U = NULL; char *mce_ipv4_address_for_m2c = NULL; char *mce_ipv4_address_for_m3c = NULL; @@ -93,11 +90,9 @@ int RCconfig_MCE(void ) { //LOG_W(MCE_APP,"cidr %s\n",cidr); //LOG_W(MCE_APP,"address %s\n",address); - //LOG_W(MCE_APP,"mce_interface_name_for_m2_enb %s\n",mce_interface_name_for_m2_enb); //LOG_W(MCE_APP,"mce_ipv4_address_for_m2c %s\n",mce_ipv4_address_for_m2c); //LOG_W(MCE_APP,"mce_ipv4_address_for_m2c %s\n",*(MCEParams[1/*MCE_IPV4_ADDRESS_FOR_M2C_IDX*/].strptr)); //LOG_W(MCE_APP,"mce_port_for_m2c %d\n",mce_port_for_m2c); - //LOG_W(MCE_APP,"mce_interface_name_for_m3_mme %s\n",mce_interface_name_for_m3_mme); //LOG_W(MCE_APP,"mce_ipv4_address_for_m3c %s\n",mce_ipv4_address_for_m3c); //LOG_W(MCE_APP,"mce_port_for_m3c %d\n",mce_port_for_m3c); @@ -124,9 +119,6 @@ int RCconfig_MCE(void ) { int RCconfig_M3(MessageDef *msg_p, uint32_t i) { int l; //int num_enbs = 0; - //char *enb_interface_name_for_S1U = NULL; - char *mce_interface_name_for_m2_enb = NULL; - char *mce_interface_name_for_m3_mme = NULL; //char *enb_ipv4_address_for_S1U = NULL; char *mce_ipv4_address_for_m2c = NULL; char *mce_ipv4_address_for_m3c = NULL; diff --git a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf index e1360c1f45..7ead77d2d4 100644 --- a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf +++ b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf @@ -48,10 +48,8 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.13.10/24"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.13.10/24"; ENB_IPV4_ADDRESS_FOR_X2C = "192.168.13.10/24"; diff --git a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf index 0e88f49021..7cd2cac355 100644 --- a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf +++ b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf @@ -60,10 +60,8 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.13.10/24"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.13.10/24"; ENB_IPV4_ADDRESS_FOR_X2C = "192.168.13.10/24"; diff --git a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf index bc41de1874..6e425ceb92 100644 --- a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf +++ b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf @@ -47,10 +47,8 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth1"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.13.10/24"; - ENB_INTERFACE_NAME_FOR_S1U = "eth1"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.13.10/24"; ENB_IPV4_ADDRESS_FOR_X2C = "192.168.13.10/24"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-4g.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-4g.conf index d52aa0ba0b..ba4dc9e604 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-4g.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-4g.conf @@ -194,9 +194,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.18.196"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.18.196"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.1"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf index 45f157e0f5..a492cee192 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf @@ -187,9 +187,7 @@ eNBs = ( ); NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "lo"; ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.1.30/24"; - ENB_INTERFACE_NAME_FOR_S1U = "lo"; ENB_IPV4_ADDRESS_FOR_S1U = "127.0.1.30/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "127.0.1.30/24"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf index cc8df8185a..60a46f47a4 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf @@ -373,9 +373,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "lo"; ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.2/24"; - ENB_INTERFACE_NAME_FOR_S1U = "lo"; ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.4/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.100PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.100PRB.usrpx310.conf index 4723fd3cba..5bf2eea967 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.100PRB.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.100PRB.usrpx310.conf @@ -153,10 +153,8 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.25PRB.iris030.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.25PRB.iris030.conf index b8ca6c1365..ed08c4c21a 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.25PRB.iris030.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.25PRB.iris030.conf @@ -189,9 +189,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eno1"; ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.10/8"; - ENB_INTERFACE_NAME_FOR_S1U = "enp5s0"; ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.10/8"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.usrpx310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.usrpx310.conf index 6669cef9a6..98d53dbb0c 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.usrpx310.conf @@ -153,10 +153,8 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band42.tm1.25PRB.iris030.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band42.tm1.25PRB.iris030.conf index 4e59f48ca5..330a7b756f 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band42.tm1.25PRB.iris030.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band42.tm1.25PRB.iris030.conf @@ -189,9 +189,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eno1"; ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.10/8"; - ENB_INTERFACE_NAME_FOR_S1U = "enp5s0"; ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.10/8"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.25prb.bladerf.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.25prb.bladerf.conf index 985f4eb378..683d56381c 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.25prb.bladerf.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.25prb.bladerf.conf @@ -192,10 +192,8 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth1"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.196/24"; - ENB_INTERFACE_NAME_FOR_S1U = "eth1"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.196/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf index 1770e77199..15a6d640c4 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf @@ -188,9 +188,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "enp0s31f6"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.188/23"; - ENB_INTERFACE_NAME_FOR_S1U = "enp0s31f6"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.188/23"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf index 8c0f57c65d..86307fdbd9 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf @@ -156,9 +156,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth6"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; - ENB_INTERFACE_NAME_FOR_S1U = "eth6"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.iris030.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.iris030.conf index 0a1c494f0a..2f7324c0ad 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.iris030.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.iris030.conf @@ -189,9 +189,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "lo"; ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.10/8"; - ENB_INTERFACE_NAME_FOR_S1U = "lo"; ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.10/8"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.usrpb210.replay.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.usrpb210.replay.conf index 8a91db7e02..223b8ccf31 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.usrpb210.replay.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.usrpb210.replay.conf @@ -190,9 +190,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "lo"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.13.10/24"; - ENB_INTERFACE_NAME_FOR_S1U = "lo"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.13.10/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf index aac2ec5f5e..6e5b1f2b52 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf @@ -190,9 +190,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "lo"; ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.2/24"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.4/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf index ebeeb25572..92c1db094a 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf @@ -190,9 +190,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eno1"; ENB_IPV4_ADDRESS_FOR_S1_MME = "10.64.45.62/23"; - ENB_INTERFACE_NAME_FOR_S1U = "eno1"; ENB_IPV4_ADDRESS_FOR_S1U = "10.64.45.62/23"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210_ue_expansion.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210_ue_expansion.conf index 222b203f71..78ba4caa51 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210_ue_expansion.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210_ue_expansion.conf @@ -157,9 +157,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.19/24"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.19/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf index 4554a32a18..985971c158 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf @@ -159,9 +159,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "lo"; ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.2/24"; - ENB_INTERFACE_NAME_FOR_S1U = "lo"; ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.5/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 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 c8bca91ccd..4c0931858a 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 @@ -159,9 +159,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "vboxnet0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.56.1/24"; - ENB_INTERFACE_NAME_FOR_S1U = "vboxnet0"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.56.1/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 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 1f72077ba3..8d6bf3b4d0 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 @@ -190,18 +190,14 @@ eNBs = NETWORK_INTERFACES : { - #ENB_INTERFACE_NAME_FOR_S1_MME = "lo"; #ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.2/24"; - #ENB_INTERFACE_NAME_FOR_S1U = "lo"; #ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.5/24"; #ENB_PORT_FOR_S1U = 2152; # Spec 2152 #ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.2/24"; #ENB_PORT_FOR_X2C = 36422; # Spec 36422 - ENB_INTERFACE_NAME_FOR_S1_MME = "enp0s31f6"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.188/24"; - ENB_INTERFACE_NAME_FOR_S1U = "enp0s31f6"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.188/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf index 401c42e503..3304f181db 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf @@ -159,9 +159,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.19/24"; - ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.5/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf index 22da6735a2..3b3d42a0da 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf @@ -160,9 +160,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "lo"; ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.2/24"; - ENB_INTERFACE_NAME_FOR_S1U = "lo"; ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.5/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc_b38_if5_ENDC.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc_b38_if5_ENDC.conf index 8bfa97e11b..a86688457c 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc_b38_if5_ENDC.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc_b38_if5_ENDC.conf @@ -156,9 +156,7 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "bond0"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.18.203/24"; - ENB_INTERFACE_NAME_FOR_S1U = "bond0"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.18.203/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "192.168.18.203/24"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_eNB_band13.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_eNB_band13.conf index d2ef01392b..ee48e17455 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_eNB_band13.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_eNB_band13.conf @@ -194,10 +194,8 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth1"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.18.199/24"; - ENB_INTERFACE_NAME_FOR_S1U = "eth1"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.18.199/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf index d493f29906..e4b965408d 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf @@ -195,10 +195,8 @@ eNBs = NETWORK_INTERFACES : { - ENB_INTERFACE_NAME_FOR_S1_MME = "eth1"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.18.199/24"; - ENB_INTERFACE_NAME_FOR_S1U = "eth1"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.18.199/24"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 From fced989d6073d4100281a81d7cdb6e6df2af17ac Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 22 Mar 2024 13:49:43 +0100 Subject: [PATCH 07/20] Remove F1 config for LTE: does not exist --- openair2/ENB_APP/enb_paramdef.h | 58 ------------------- .../CONF/enb.band7.master.conf | 28 --------- .../CONF/enb.band7.tm1.50PRB.usrpb210.conf | 28 --------- 3 files changed, 114 deletions(-) diff --git a/openair2/ENB_APP/enb_paramdef.h b/openair2/ENB_APP/enb_paramdef.h index e2ceb61987..8e2ff45e21 100644 --- a/openair2/ENB_APP/enb_paramdef.h +++ b/openair2/ENB_APP/enb_paramdef.h @@ -1183,64 +1183,6 @@ typedef struct srb1_params_s { #define CONFIG_STRING_L1_LIST "L1s" #define CONFIG_STRING_L1_CONFIG "l1_config" -/*----------------------------------------------------------------------------------------------------------------------------------------------------*/ -/*----------------------------------------------------------------------------------------------------------------------------------------------------*/ -/* CU/DU configuration section names*/ -#define CONFIG_STRING_DU_LIST "DU" -#define CONFIG_STRING_CU_LIST "CU" -#define DU_TYPE_LTE 0 -#define DU_TYPE_WIFI 1 -#define ENB_CONFIG_STRING_CU_INTERFACES_CONFIG "CU_INTERFACES" -#define ENB_CONFIG_STRING_CU_INTERFACE_NAME_FOR_F1U "CU_INTERFACE_NAME_FOR_F1U" -#define ENB_CONFIG_STRING_CU_IPV4_ADDRESS_FOR_F1U "CU_IPV4_ADDRESS_FOR_F1U" -#define ENB_CONFIG_STRING_CU_PORT_FOR_F1U "CU_PORT_FOR_F1U" -#define ENB_CONFIG_STRING_DU_TYPE "DU_TYPE" -#define ENB_CONFIG_STRING_F1_U_CU_TRANSPORT_TYPE "F1_U_CU_TRANSPORT_TYPE" -#define ENB_CONFIG_STRING_DU_INTERFACES_CONFIG "DU_INTERFACES" -#define ENB_CONFIG_STRING_DU_INTERFACE_NAME_FOR_F1U "DU_INTERFACE_NAME_FOR_F1U" -#define ENB_CONFIG_STRING_DU_IPV4_ADDRESS_FOR_F1U "DU_IPV4_ADDRESS_FOR_F1U" -#define ENB_CONFIG_STRING_DU_PORT_FOR_F1U "DU_PORT_FOR_F1U" -#define ENB_CONFIG_STRING_F1_U_DU_TRANSPORT_TYPE "F1_U_DU_TRANSPORT_TYPE" - -#define CONFIG_STRING_CU_BALANCING "CU_BALANCING" - -// clang-format off -#define CUPARAMS_DESC { \ - {ENB_CONFIG_STRING_CU_INTERFACE_NAME_FOR_F1U, NULL, 0, .strptr=NULL, .defstrval="eth0", TYPE_STRING, 0}, \ - {ENB_CONFIG_STRING_CU_IPV4_ADDRESS_FOR_F1U, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \ - {ENB_CONFIG_STRING_CU_PORT_FOR_F1U, NULL, 0, .uptr=NULL, .defintval=2210, TYPE_UINT, 0}, \ - {ENB_CONFIG_STRING_F1_U_CU_TRANSPORT_TYPE, NULL, 0, .strptr=NULL, .defstrval="TCP", TYPE_STRING, 0}, \ - {ENB_CONFIG_STRING_DU_TYPE, NULL, 0, .strptr=NULL, .defstrval="LTE", TYPE_STRING, 0}, \ -} -// clang-format on - -// clang-format off -#define DUPARAMS_DESC { \ - {ENB_CONFIG_STRING_DU_INTERFACE_NAME_FOR_F1U, NULL, 0, .strptr=NULL, .defstrval="eth0", TYPE_STRING, 0}, \ - {ENB_CONFIG_STRING_DU_IPV4_ADDRESS_FOR_F1U, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \ - {ENB_CONFIG_STRING_DU_PORT_FOR_F1U, NULL, 0, .uptr=NULL, .defintval=2210, TYPE_UINT, 0}, \ - {ENB_CONFIG_STRING_F1_U_DU_TRANSPORT_TYPE, NULL, 0, .strptr=NULL, .defstrval="TCP", TYPE_STRING, 0}, \ -} -// clang-format on - -// clang-format off -#define CU_BAL_DESC { \ - {CONFIG_STRING_CU_BALANCING, NULL, 0, .strptr=NULL, .defstrval="ALL", TYPE_STRING, 0}, \ -} -// clang-format on - -#define CU_INTERFACE_F1U 0 -#define CU_ADDRESS_F1U 1 -#define CU_PORT_F1U 2 -#define CU_TYPE_F1U 3 - -#define DU_INTERFACE_F1U 0 -#define DU_ADDRESS_F1U 1 -#define DU_PORT_F1U 2 -#define DU_TYPE_F1U 3 -#define DU_TECH 4 - -/*----------------------------------------------------------------------------------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------------------------------------------------------------------------------*/ /* MACRLC configuration section names */ #define CONFIG_STRING_MACRLC_LIST "MACRLCs" diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf index 15a6d640c4..1d48bd6bc6 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf @@ -199,34 +199,6 @@ eNBs = } ); -DU = ( - { - DU_INTERFACE_NAME_FOR_F1U = "lo"; - DU_IPV4_ADDRESS_FOR_F1U = "127.0.0.1/16"; - DU_PORT_FOR_F1U = 22100; - F1_U_DU_TRANSPORT_TYPE = "TCP"; - } - ); - -CU = ( - { - CU_INTERFACE_NAME_FOR_F1U = "lo"; - CU_IPV4_ADDRESS_FOR_F1U = "127.0.0.1"; //Address to search the DU - CU_PORT_FOR_F1U = 22100; - F1_U_CU_TRANSPORT_TYPE = "TCP"; // One of TCP/UDP/SCTP - DU_TYPE = "LTE"; - }//, -// { -// CU_INTERFACE_NAME_FOR_F1U = "eth0"; -// CU_IPV4_ADDRESS_FOR_F1U = "10.64.93.142"; //Address to search the DU -// CU_PORT_FOR_F1U = 2211; -// F1_U_CU_TRANSPORT_TYPE = "TCP"; // One of TCP/UDP/SCTP -// DU_TYPE = "WiFi"; -// } - ); - - CU_BALANCING = "ALL"; - MACRLCs = ( { num_cc = 1; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf index 92c1db094a..c193cd70b3 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf @@ -201,34 +201,6 @@ eNBs = } ); -DU = ( - { - DU_INTERFACE_NAME_FOR_F1U = "lo"; - DU_IPV4_ADDRESS_FOR_F1U = "127.0.0.1/16"; - DU_PORT_FOR_F1U = 22100; - F1_U_DU_TRANSPORT_TYPE = "TCP"; - } - ); - -CU = ( - { - CU_INTERFACE_NAME_FOR_F1U = "lo"; - CU_IPV4_ADDRESS_FOR_F1U = "127.0.0.1"; //Address to search the DU - CU_PORT_FOR_F1U = 22100; - F1_U_CU_TRANSPORT_TYPE = "TCP"; // One of TCP/UDP/SCTP - DU_TYPE = "LTE"; - }//, -// { -// CU_INTERFACE_NAME_FOR_F1U = "eth0"; -// CU_IPV4_ADDRESS_FOR_F1U = "10.64.93.142"; //Address to search the DU -// CU_PORT_FOR_F1U = 2211; -// F1_U_CU_TRANSPORT_TYPE = "TCP"; // One of TCP/UDP/SCTP -// DU_TYPE = "WiFi"; -// } - ); - - CU_BALANCING = "ALL"; - MACRLCs = ( { num_cc = 1; From f21c2cf82257f5a8e84cbff4b41ca906628e58e5 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 22 Mar 2024 15:19:22 +0100 Subject: [PATCH 08/20] 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 From 71486a0d7e87a45e0b8a006f1bf06b73df7d446e Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 22 Mar 2024 16:25:12 +0100 Subject: [PATCH 09/20] Fixup: correct gnb-cucp AMF bind address, corresponding to docker container --- ci-scripts/conf_files/gnb-cucp.sa.f1.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci-scripts/conf_files/gnb-cucp.sa.f1.conf b/ci-scripts/conf_files/gnb-cucp.sa.f1.conf index a62b4861f5..a8f8f1bb85 100644 --- a/ci-scripts/conf_files/gnb-cucp.sa.f1.conf +++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.conf @@ -60,7 +60,7 @@ gNBs = NETWORK_INTERFACES : { - GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.140/24"; + GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.71.150/24"; }; } ); @@ -92,5 +92,6 @@ security = { rrc_log_level ="info"; f1ap_log_level ="info"; ngap_log_level ="debug"; + sctp_log_level ="debug"; }; From 2241ed17cfa3fc64fc26132b1d9203770aaec263 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 22 Mar 2024 19:40:50 +0100 Subject: [PATCH 10/20] CU F1+E1 test: use some service names --- ci-scripts/conf_files/gnb-cucp.sa.f1.conf | 4 ++-- ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci-scripts/conf_files/gnb-cucp.sa.f1.conf b/ci-scripts/conf_files/gnb-cucp.sa.f1.conf index a8f8f1bb85..f783a2f54d 100644 --- a/ci-scripts/conf_files/gnb-cucp.sa.f1.conf +++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.conf @@ -40,7 +40,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.71.132"; + amf_ip_address = ( { ipv4 = "oai-amf"; ipv6 = "192:168:30::17"; active = "yes"; preference = "ipv4"; @@ -92,6 +92,6 @@ security = { rrc_log_level ="info"; f1ap_log_level ="info"; ngap_log_level ="debug"; - sctp_log_level ="debug"; + sctp_log_level ="info"; }; diff --git a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml index a6fa3bd715..cc968e8755 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml @@ -188,7 +188,7 @@ services: environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time --MACRLCs.[0].local_n_address 192.168.72.3 - --MACRLCs.[0].remote_n_address 192.168.72.2 + --MACRLCs.[0].remote_n_address oai-cucp --MACRLCs.[0].local_n_address_f1u 192.168.73.3 ASAN_OPTIONS: detect_leaks=0 depends_on: @@ -218,7 +218,7 @@ services: --gNBs.[0].gNB_DU_ID 0xe01 --gNBs.[0].nr_cellid 87654321 --gNBs.[0].servingCellConfigCommon.[0].physCellId 1 - --MACRLCs.[0].remote_n_address 192.168.72.2 + --MACRLCs.[0].remote_n_address oai-cucp --MACRLCs.[0].local_n_address 192.168.72.4 --MACRLCs.[0].local_n_address_f1u 192.168.74.3 ASAN_OPTIONS: detect_leaks=0 @@ -249,7 +249,7 @@ services: --gNBs.[0].gNB_DU_ID 0xe02 --gNBs.[0].nr_cellid 11111111 --gNBs.[0].servingCellConfigCommon.[0].physCellId 2 - --MACRLCs.[0].remote_n_address 192.168.72.2 + --MACRLCs.[0].remote_n_address oai-cucp --MACRLCs.[0].local_n_address 192.168.72.5 --MACRLCs.[0].local_n_address_f1u 192.168.76.3 ASAN_OPTIONS: detect_leaks=0 From 915c106ee3ee290ef071c586baadb73267ee525d Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 25 Mar 2024 09:48:44 +0100 Subject: [PATCH 11/20] Remove IPv6/active/preference fields from eNBs.[0].mme_ip_address array In a previous commit, the functionality of handling IPv6 (and DNS names) as part of the IPv4 was introduced (in IPv4 field for backwards compatibility). This commit now removes superfluous configuration fields: - IPv6: handled by IPv4 field - active: users can just remove an entry - preference: not needed --- ...-rcc.band40.25prb.tm1.if4p5.fair-scheduler.conf | 8 +------- .../conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf | 8 +------- ci-scripts/conf_files/enb.band38.25prb.rfsim.conf | 8 +------- .../enb.band38.lte_2x2.100prb.usrpn310.conf | 7 +------ .../enb.band38.lte_2x2_tm2.100prb.usrpn310.conf | 7 +------ .../enb.band38.nsa_2x2.100prb.usrpn310.conf | 7 +------ ...and40.100prb.usrpb200.tm1-defaultscheduler.conf | 8 +------- .../conf_files/enb.band40.25prb.usrpb200.conf | 8 +------- ci-scripts/conf_files/enb.band7.100prb.rfsim.conf | 8 +------- .../conf_files/enb.band7.100prb.usrpb200.tm1.conf | 8 +------- ci-scripts/conf_files/enb.band7.25prb.l2sim.conf | 8 +------- ci-scripts/conf_files/enb.band7.25prb.rfsim.conf | 8 +------- .../conf_files/enb.band7.25prb.rfsim.nos1.conf | 8 +------- .../conf_files/enb.band7.25prb.usrpb200.conf | 8 +------- .../enb.band7.25prb.usrpb200.tm1-norrc.conf | 8 +------- .../conf_files/enb.band7.25prb.usrpb200.tm1.conf | 8 +------- ci-scripts/conf_files/enb.band7.50prb.rfsim.conf | 8 +------- .../conf_files/enb.band7.50prb.usrpb200.tm1.conf | 8 +------- .../conf_files/enb.band7.tm1.50prb.usrpb210.conf | 8 +------- .../conf_files/enb.nsa.band7.25prb.usrpb200.conf | 8 +------- .../gnb.band66.106prb.rfsim.phytest-dora.conf | 7 +------ .../gnb.band78.106prb.rfsim.phytest-dora.conf | 8 +------- .../gnb.band78.106prb.usrpn300.phytest-dora.conf | 8 +------- .../gnb.band78.162prb.usrpn300.phytest-dora.conf | 8 +------- .../gnb.band78.273prb.usrpn300.phytest-dora.conf | 8 +------- .../conf_files/gnb.nsa.band78.106prb.usrpb200.conf | 8 +------- ci-scripts/conf_files/untested/benetel-4g.conf | 7 +------ ci-scripts/conf_files/untested/benetel-5g.conf | 7 +------ .../untested/enb.band13.tm1.25PRB.usrpb210.conf | 8 +------- .../untested/enb.band13.tm1.50PRB.emtc.conf | 8 +------- .../untested/enb.band17.tm1.25PRB.usrpb210.conf | 8 +------- .../enb.band17.tm1.mbms.25PRB.usrpb210.conf | 8 +------- ...b.band40.tm1.100PRB.FairScheduler.usrpb210.conf | 8 +------- ...nb.band40.tm1.25PRB.FairScheduler.usrpb210.conf | 8 +------- ...nb.band40.tm1.50PRB.FairScheduler.usrpb210.conf | 8 +------- ...nb.band40.tm2.25PRB.FairScheduler.usrpb210.conf | 8 +------- .../untested/enb.band7.tm1.100PRB.usrpb210.conf | 8 +------- .../enb.band7.tm1.25PRB.slave.usrpb210.conf | 8 +------- .../untested/enb.band7.tm1.25PRB.usrpb210.conf | 8 +------- .../untested/enb.band7.tm1.fr1.25PRB.usrpb210.conf | 8 +------- .../untested/enb.band7.tm2.25PRB.usrpb210.conf | 8 +------- .../enb.slave.band13.tm1.25PRB.usrpb210.conf | 9 ++------- .../episci/episci_rcc.band7.tm1.nfapi.conf | 8 +------- .../episci/episci_rcc.band78.tm1.106PRB.nfapi.conf | 8 ++------ .../untested/episci/proxy_rcc.band7.tm1.nfapi.conf | 8 +------- .../episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf | 8 ++------ .../gnb.band78.tm1.fr1.106PRB.usrpb210.conf | 8 +------- .../gnb.band78.tm1.fr1.106PRB.usrpn310.conf | 8 +------- .../conf_files/untested/lte-tdd-basic-sim.conf | 8 +------- .../untested/rcc.band38.tm1.50PRB.multi.rru.conf | 8 +------- .../rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf | 8 +------- .../rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf | 8 +------- .../conf_files/untested/rcc.band7.tm1.nfapi.conf | 8 +------- doc/L2NFAPI_NOS1.md | 7 +------ doc/L2NFAPI_S1.md | 7 +------ doc/TESTING_GNB_W_COTS_UE.md | 14 ++------------ doc/testing_gnb_w_cots_ue_resources/enb.conf | 7 +------ doc/testing_gnb_w_cots_ue_resources/gnb.conf | 7 +------ openair2/ENB_APP/enb_config.c | 14 ++------------ openair2/ENB_APP/enb_paramdef.h | 13 ++----------- .../CONF/enb.centos.calisson.conf | 7 +------ .../CONF/enb.centos.memphis.conf | 7 +------ .../CONF/enb.centos.nord.conf | 7 +------ .../PROJECTS/GENERIC-LTE-EPC/CONF/benetel-4g.conf | 7 +------ .../PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf | 7 +------ targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf | 9 +-------- .../CONF/enb.band13.tm1.50PRB.emtc.conf | 7 +------ .../CONF/enb.band38.tm1.100PRB.usrpx310.conf | 7 +------ .../CONF/enb.band38.tm1.25PRB.iris030.conf | 7 +------ .../CONF/enb.band38.tm1.usrpx310.conf | 7 +------ .../CONF/enb.band42.tm1.25PRB.iris030.conf | 7 +------ .../CONF/enb.band7.25prb.bladerf.conf | 7 +------ .../GENERIC-LTE-EPC/CONF/enb.band7.master.conf | 7 +------ .../CONF/enb.band7.tm1.100PRB.usrpx310.conf | 7 +------ .../CONF/enb.band7.tm1.25PRB.iris030.conf | 7 +------ .../CONF/enb.band7.tm1.25PRB.usrpb210.replay.conf | 7 +------ .../CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf | 7 +------ .../CONF/enb.band7.tm1.50PRB.usrpb210.conf | 7 +------ .../enb.band7.tm1.50PRB.usrpb210_ue_expansion.conf | 7 +------ .../CONF/gnb.band257.tm1.32PRB.usrpn300.conf | 7 +------ .../CONF/gnb.band257.tm1.32PRB.usrpx300.conf | 7 +------ .../CONF/gnb.band257.tm1.66PRB.usrpn300.conf | 7 +------ .../CONF/gnb.band261.tm1.32PRB.usrpn300.conf | 7 +------ .../CONF/gnb.band66.tm1.106PRB.usrpn300.conf | 7 +------ .../CONF/gnb.band66.tm1.106PRB.usrpx300.conf | 7 +------ .../CONF/gnb.band66.tm1.24PRB.usrpx300.conf | 7 +------ .../CONF/gnb.band66.tm1.25PRB.usrpn300.conf | 7 +------ .../CONF/gnb.band66.tm1.25PRB.usrpx300.conf | 7 +------ .../CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf | 7 +------ .../CONF/gnb.band78.106PRB.slave.conf | 7 +------ .../GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf | 7 +------ .../CONF/gnb.band78.tm1.106PRB.PTRS.usrpx300.conf | 7 +------ .../CONF/gnb.band78.tm1.106PRB.usrpb210.conf | 7 +------ .../CONF/gnb.band78.tm1.106PRB.usrpn300.conf | 7 +------ .../CONF/gnb.band78.tm1.106PRB.usrpx300.conf | 7 +------ .../CONF/gnb.band78.tm1.217PRB.usrpn300.conf | 7 +------ .../CONF/gnb.band78.tm1.217PRB.usrpx300.conf | 7 +------ .../CONF/gnb.band78.tm1.24PRB.usrpb210.conf | 7 +------ .../CONF/gnb.band78.tm1.24PRB.usrpn300.conf | 7 +------ .../CONF/gnb.band78.tm1.24PRB.usrpx300.conf | 7 +------ .../CONF/gnb.band78.tm1.273PRB.usrpn300.conf | 7 +------ .../CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf | 7 +------ .../CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf | 7 +------ .../CONF/rcc.band7.tm1.50PRB.nfapi.conf | 7 +------ .../CONF/rcc.band7.tm1.if4p5.50PRB.conf | 7 +------ .../CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf | 7 +------ .../CONF/rcc.band78.tm1.106PRB.nfapi.conf | 7 +------ .../GENERIC-LTE-EPC/CONF/rcc_b38_if5_ENDC.conf | 7 +------ .../GENERIC-LTE-EPC/CONF/testing_eNB_band13.conf | 7 +------ .../PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf | 7 +------ .../GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf | 7 +------ .../GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf | 7 +------ .../CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf | 7 +------ 113 files changed, 119 insertions(+), 742 deletions(-) diff --git a/ci-scripts/conf_files/enb-rcc.band40.25prb.tm1.if4p5.fair-scheduler.conf b/ci-scripts/conf_files/enb-rcc.band40.25prb.tm1.if4p5.fair-scheduler.conf index 3addb51ee0..88194c94b7 100644 --- a/ci-scripts/conf_files/enb-rcc.band40.25prb.tm1.if4p5.fair-scheduler.conf +++ b/ci-scripts/conf_files/enb-rcc.band40.25prb.tm1.if4p5.fair-scheduler.conf @@ -137,13 +137,7 @@ eNBs = }; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "172.21.18.48"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf b/ci-scripts/conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf index 521c61d1df..2eb186b542 100644 --- a/ci-scripts/conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf +++ b/ci-scripts/conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf @@ -174,13 +174,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "172.21.18.48"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/enb.band38.25prb.rfsim.conf b/ci-scripts/conf_files/enb.band38.25prb.rfsim.conf index 0869c5fde5..c98544557b 100644 --- a/ci-scripts/conf_files/enb.band38.25prb.rfsim.conf +++ b/ci-scripts/conf_files/enb.band38.25prb.rfsim.conf @@ -134,13 +134,7 @@ eNBs = }; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.61.3"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf b/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf index e2a4651718..183b91407c 100644 --- a/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf +++ b/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf @@ -172,12 +172,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.61.195"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.61.195"; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf b/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf index b81746efc9..21fc241994 100644 --- a/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf +++ b/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf @@ -172,12 +172,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.61.195"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.61.195"; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf b/ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf index 5e7abfc462..a3f3b2a64c 100644 --- a/ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf +++ b/ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf @@ -172,12 +172,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf b/ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf index b5264bd3a1..8b2a689705 100644 --- a/ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf +++ b/ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf @@ -134,13 +134,7 @@ eNBs = }; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "172.21.18.48"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf b/ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf index af905bd7d4..4a8218e1b4 100644 --- a/ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf +++ b/ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf @@ -134,13 +134,7 @@ eNBs = }; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "172.21.18.48"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf b/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf index 8c4910964d..bb73349202 100644 --- a/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf +++ b/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf @@ -177,13 +177,7 @@ eNBs = enable_measurement_reports = "no"; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.61.3"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; }); ///X2 enable_x2 = "no"; diff --git a/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf b/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf index 51fd6458ad..b45b381a89 100644 --- a/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf +++ b/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf @@ -177,13 +177,7 @@ eNBs = enable_measurement_reports = "no"; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "172.21.18.48"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; }); ///X2 enable_x2 = "no"; diff --git a/ci-scripts/conf_files/enb.band7.25prb.l2sim.conf b/ci-scripts/conf_files/enb.band7.25prb.l2sim.conf index 069539cbcb..c1890bbade 100644 --- a/ci-scripts/conf_files/enb.band7.25prb.l2sim.conf +++ b/ci-scripts/conf_files/enb.band7.25prb.l2sim.conf @@ -172,13 +172,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.61.3"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/enb.band7.25prb.rfsim.conf b/ci-scripts/conf_files/enb.band7.25prb.rfsim.conf index 3ffc66fb5b..63b96e0249 100644 --- a/ci-scripts/conf_files/enb.band7.25prb.rfsim.conf +++ b/ci-scripts/conf_files/enb.band7.25prb.rfsim.conf @@ -177,13 +177,7 @@ eNBs = enable_measurement_reports = "no"; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.61.3"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; }); ///X2 enable_x2 = "no"; diff --git a/ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf b/ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf index 3ffc66fb5b..63b96e0249 100644 --- a/ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf +++ b/ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf @@ -177,13 +177,7 @@ eNBs = enable_measurement_reports = "no"; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.61.3"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; }); ///X2 enable_x2 = "no"; diff --git a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.conf b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.conf index cacde64166..4d972d4570 100644 --- a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.conf +++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.conf @@ -177,13 +177,7 @@ eNBs = enable_measurement_reports = "no"; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); ///X2 enable_x2 = "no"; diff --git a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf index 9ce2fbbea7..0d84e971c2 100644 --- a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf +++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf @@ -177,13 +177,7 @@ eNBs = enable_measurement_reports = "no"; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "172.21.18.48"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; }); ///X2 enable_x2 = "no"; diff --git a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf index b0dff73ed7..64ea130a43 100644 --- a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf +++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf @@ -177,13 +177,7 @@ eNBs = enable_measurement_reports = "no"; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "172.21.18.48"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; }); ///X2 enable_x2 = "no"; diff --git a/ci-scripts/conf_files/enb.band7.50prb.rfsim.conf b/ci-scripts/conf_files/enb.band7.50prb.rfsim.conf index 7e1119bb80..991b188092 100644 --- a/ci-scripts/conf_files/enb.band7.50prb.rfsim.conf +++ b/ci-scripts/conf_files/enb.band7.50prb.rfsim.conf @@ -177,13 +177,7 @@ eNBs = enable_measurement_reports = "no"; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.61.3"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; }); ///X2 enable_x2 = "no"; diff --git a/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf b/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf index 9ed681be05..10430a3785 100644 --- a/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf +++ b/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf @@ -177,13 +177,7 @@ eNBs = enable_measurement_reports = "no"; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "172.21.18.48"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; }); ///X2 enable_x2 = "no"; diff --git a/ci-scripts/conf_files/enb.band7.tm1.50prb.usrpb210.conf b/ci-scripts/conf_files/enb.band7.tm1.50prb.usrpb210.conf index ee0c20d39d..dafdf0dd80 100644 --- a/ci-scripts/conf_files/enb.band7.tm1.50prb.usrpb210.conf +++ b/ci-scripts/conf_files/enb.band7.tm1.50prb.usrpb210.conf @@ -179,13 +179,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf b/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf index d573088cfd..b39bee72e5 100644 --- a/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf +++ b/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf @@ -177,13 +177,7 @@ eNBs = enable_measurement_reports = "yes"; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "172.21.16.137"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "172.21.16.137"; port = 36412; }); ///X2 enable_x2 = "yes"; diff --git a/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf b/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf index ca1d488691..a76aa1a096 100644 --- a/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf +++ b/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf @@ -150,12 +150,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf b/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf index cd1d4bbad9..551d860d33 100644 --- a/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf +++ b/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf @@ -162,13 +162,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; port = 36412; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf b/ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf index b9cb726ba7..aa2e7a31c2 100644 --- a/ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf +++ b/ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf @@ -162,13 +162,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; port = 36412; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf b/ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf index 1adbd0fcb4..79333e50ba 100644 --- a/ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf +++ b/ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf @@ -162,13 +162,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; port = 36412; }); NETWORK_INTERFACES : { GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; diff --git a/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf b/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf index 558b9cca14..29f420710a 100644 --- a/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf +++ b/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf @@ -164,13 +164,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; port = 36412; }); NETWORK_INTERFACES : { GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24"; diff --git a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf index 2d34ea8a32..70e6cfc93a 100644 --- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf +++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf @@ -158,13 +158,7 @@ gNBs = ////////// MME parameters: -# mme_ip_address = ( { ipv4 = "192.168.68.130"; -# ipv6 = "192:168:30::17"; -# port = 36412 ; -# active = "yes"; -# preference = "ipv4"; -# } -# ); +# mme_ip_address = ({ ipv4 = "192.168.68.130"; port = 36412; }); ///X2 enable_x2 = "yes"; diff --git a/ci-scripts/conf_files/untested/benetel-4g.conf b/ci-scripts/conf_files/untested/benetel-4g.conf index de642bc12e..52f9ed5678 100644 --- a/ci-scripts/conf_files/untested/benetel-4g.conf +++ b/ci-scripts/conf_files/untested/benetel-4g.conf @@ -176,12 +176,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; }); enable_measurement_reports = "yes"; diff --git a/ci-scripts/conf_files/untested/benetel-5g.conf b/ci-scripts/conf_files/untested/benetel-5g.conf index 0d7c70981d..260c9d8a98 100644 --- a/ci-scripts/conf_files/untested/benetel-5g.conf +++ b/ci-scripts/conf_files/untested/benetel-5g.conf @@ -166,12 +166,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 "CI_MME_IP_ADDR"; }); ///X2 enable_x2 = "yes"; diff --git a/ci-scripts/conf_files/untested/enb.band13.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band13.tm1.25PRB.usrpb210.conf index 9c8c9413ae..0a4da4b1a8 100644 --- a/ci-scripts/conf_files/untested/enb.band13.tm1.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band13.tm1.25PRB.usrpb210.conf @@ -173,13 +173,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); ///X2 enable_x2 = "yes"; diff --git a/ci-scripts/conf_files/untested/enb.band13.tm1.50PRB.emtc.conf b/ci-scripts/conf_files/untested/enb.band13.tm1.50PRB.emtc.conf index e69b257ce3..67a1cac977 100644 --- a/ci-scripts/conf_files/untested/enb.band13.tm1.50PRB.emtc.conf +++ b/ci-scripts/conf_files/untested/enb.band13.tm1.50PRB.emtc.conf @@ -354,13 +354,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port 36412; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/untested/enb.band17.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band17.tm1.25PRB.usrpb210.conf index 87ba577d08..6d48b2458d 100644 --- a/ci-scripts/conf_files/untested/enb.band17.tm1.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band17.tm1.25PRB.usrpb210.conf @@ -175,13 +175,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf index ed869e0be6..4b46553778 100644 --- a/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf @@ -176,13 +176,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/untested/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf index f991e22a90..fcd2d930ae 100644 --- a/ci-scripts/conf_files/untested/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf @@ -134,13 +134,7 @@ eNBs = }; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412 ; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/untested/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf index 98692b30a1..36e482ecac 100644 --- a/ci-scripts/conf_files/untested/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf @@ -134,13 +134,7 @@ eNBs = }; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/untested/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf index fe9ff9b5c7..fe63d49e0a 100644 --- a/ci-scripts/conf_files/untested/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf @@ -134,13 +134,7 @@ eNBs = }; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/untested/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf index 6eef6c94ce..3b2603982a 100644 --- a/ci-scripts/conf_files/untested/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf @@ -134,13 +134,7 @@ eNBs = }; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); ///X2 enable_x2 = "no"; diff --git a/ci-scripts/conf_files/untested/enb.band7.tm1.100PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band7.tm1.100PRB.usrpb210.conf index 3b2a0a975d..b323feea28 100644 --- a/ci-scripts/conf_files/untested/enb.band7.tm1.100PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band7.tm1.100PRB.usrpb210.conf @@ -171,13 +171,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf index aa81417dcc..1b764262f8 100644 --- a/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf @@ -174,13 +174,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.usrpb210.conf index 17414fe1ac..8141c3ec41 100644 --- a/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.usrpb210.conf @@ -177,13 +177,7 @@ eNBs = enable_measurement_reports = "no"; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); ///X2 enable_x2 = "no"; diff --git a/ci-scripts/conf_files/untested/enb.band7.tm1.fr1.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band7.tm1.fr1.25PRB.usrpb210.conf index d55fe2f6aa..58e98f79e7 100644 --- a/ci-scripts/conf_files/untested/enb.band7.tm1.fr1.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band7.tm1.fr1.25PRB.usrpb210.conf @@ -177,13 +177,7 @@ eNBs = enable_measurement_reports = "yes"; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); ///X2 enable_x2 = "yes"; diff --git a/ci-scripts/conf_files/untested/enb.band7.tm2.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band7.tm2.25PRB.usrpb210.conf index e6188c77ab..9274de85c0 100644 --- a/ci-scripts/conf_files/untested/enb.band7.tm2.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band7.tm2.25PRB.usrpb210.conf @@ -174,13 +174,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf index de4e9922a9..f052b30228 100644 --- a/ci-scripts/conf_files/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf @@ -173,13 +173,8 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); + ///X2 enable_x2 = "yes"; t_reloc_prep = 1000; /* unit: millisecond */ 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 25b04e8455..905938d49b 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 @@ -172,13 +172,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.61.195"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.61.195"; port = 36412; }); enable_measurement_reports = "yes"; 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 642d516631..7392da907e 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 @@ -162,12 +162,8 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.61.195"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.61.195"; }); + ///X2 enable_x2 = "yes"; t_reloc_prep = 1000; /* unit: millisecond */ 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 dd8db0adf7..0f55290a55 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 @@ -172,13 +172,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.61.3"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; }); enable_measurement_reports = "no"; 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 9014e1e704..d791cb29ee 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 @@ -185,12 +185,8 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.61.3"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.61.3"; }); + ///X2 enable_x2 = "yes"; t_reloc_prep = 1000; /* unit: millisecond */ diff --git a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf index c0c5696d6b..dfcbf32335 100644 --- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf @@ -157,13 +157,7 @@ gNBs = ////////// MME parameters: -# mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; -# ipv6 = "192:168:30::17"; -# port = 36412 ; -# active = "yes"; -# preference = "ipv4"; -# } -# ); +# mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); ///X2 enable_x2 = "yes"; diff --git a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf index 8fac94befc..79ade04c88 100644 --- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf +++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf @@ -162,13 +162,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); ///X2 enable_x2 = "yes"; diff --git a/ci-scripts/conf_files/untested/lte-tdd-basic-sim.conf b/ci-scripts/conf_files/untested/lte-tdd-basic-sim.conf index b982b0bb96..86198c06b8 100644 --- a/ci-scripts/conf_files/untested/lte-tdd-basic-sim.conf +++ b/ci-scripts/conf_files/untested/lte-tdd-basic-sim.conf @@ -134,13 +134,7 @@ eNBs = }; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/untested/rcc.band38.tm1.50PRB.multi.rru.conf b/ci-scripts/conf_files/untested/rcc.band38.tm1.50PRB.multi.rru.conf index b3778ad27a..316152527d 100644 --- a/ci-scripts/conf_files/untested/rcc.band38.tm1.50PRB.multi.rru.conf +++ b/ci-scripts/conf_files/untested/rcc.band38.tm1.50PRB.multi.rru.conf @@ -139,13 +139,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf index 5fa54b7f9d..bc508c3851 100644 --- a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf +++ b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf @@ -142,13 +142,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.15.130"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.15.130"; port = 36412; }); enable_measurement_reports = "no"; diff --git a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf index ad47de21f3..2563381ff3 100644 --- a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf +++ b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf @@ -142,13 +142,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "127.0.0.3"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "127.0.0.3"; port = 36412; }); enable_measurement_reports = "no"; 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 e892ed99d0..68ddc4efa4 100644 --- a/ci-scripts/conf_files/untested/rcc.band7.tm1.nfapi.conf +++ b/ci-scripts/conf_files/untested/rcc.band7.tm1.nfapi.conf @@ -172,13 +172,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - port = 36412 ; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; }); enable_measurement_reports = "no"; diff --git a/doc/L2NFAPI_NOS1.md b/doc/L2NFAPI_NOS1.md index d9536b97a2..1c11dd0d71 100644 --- a/doc/L2NFAPI_NOS1.md +++ b/doc/L2NFAPI_NOS1.md @@ -165,12 +165,7 @@ Last, the S1 interface shall be properly set. ``` ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; // replace with 192.168.122.195 - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; }); // replace with 192.168.122.195 NETWORK_INTERFACES : { diff --git a/doc/L2NFAPI_S1.md b/doc/L2NFAPI_S1.md index ea56006a91..ed0ac907db 100644 --- a/doc/L2NFAPI_S1.md +++ b/doc/L2NFAPI_S1.md @@ -170,12 +170,7 @@ Last, the S1 interface shall be properly set. ``` ////////// MME parameters: - mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; // replace with 192.168.122.195 - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; }); // replace with 192.168.122.195 NETWORK_INTERFACES : { diff --git a/doc/TESTING_GNB_W_COTS_UE.md b/doc/TESTING_GNB_W_COTS_UE.md index 7102a254ed..42de92d5c5 100644 --- a/doc/TESTING_GNB_W_COTS_UE.md +++ b/doc/TESTING_GNB_W_COTS_UE.md @@ -107,12 +107,7 @@ whether the clock is internal or external is defined in the configuration files - look for MME IP address, and update the **ipv4 field** with the IP address of the **EPC** server ``` ////////// MME parameters: - mme_ip_address = ( { ipv4 = "**YOUR_EPC_IP_ADDR**"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "**YOUR_EPC_IP_ADDR**"; }); ``` @@ -133,12 +128,7 @@ whether the clock is internal or external is defined in the configuration files - look for MME IP address, and update the **ipv4 field** with the IP address of the **EPC** server ``` ////////// MME parameters: - mme_ip_address = ( { ipv4 = "**YOUR_EPC_IP_ADDR**"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "**YOUR_EPC_IP_ADDR**"; }); ``` - look for X2 IP address, and update the **4 fields** with the IP address of the **eNB** server / **gNB** server as below (notice : even if -in principle- S1 MME is not required for gNB setting) ``` diff --git a/doc/testing_gnb_w_cots_ue_resources/enb.conf b/doc/testing_gnb_w_cots_ue_resources/enb.conf index 67d714175a..a2bebf9c33 100755 --- a/doc/testing_gnb_w_cots_ue_resources/enb.conf +++ b/doc/testing_gnb_w_cots_ue_resources/enb.conf @@ -176,12 +176,7 @@ eNBs = enable_measurement_reports = "yes"; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.18.99"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.18.99"; }); ///X2 enable_x2 = "yes"; diff --git a/doc/testing_gnb_w_cots_ue_resources/gnb.conf b/doc/testing_gnb_w_cots_ue_resources/gnb.conf index 8ff179ecc2..6538a6db26 100755 --- a/doc/testing_gnb_w_cots_ue_resources/gnb.conf +++ b/doc/testing_gnb_w_cots_ue_resources/gnb.conf @@ -162,12 +162,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.18.99"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.18.99"; }); ///X2 enable_x2 = "yes"; diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c index 522024774e..23e5289ae9 100644 --- a/openair2/ENB_APP/enb_config.c +++ b/openair2/ENB_APP/enb_config.c @@ -2342,18 +2342,8 @@ int RCconfig_S1( for (int l = 0; l < S1ParamList.numelt; l++) { S1AP_REGISTER_ENB_REQ (msg_p).nb_mme += 1; strcpy(S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[l].ipv4_address,*(S1ParamList.paramarray[l][ENB_MME_IPV4_ADDRESS_IDX].strptr)); - strcpy(S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[l].ipv6_address,*(S1ParamList.paramarray[l][ENB_MME_IPV6_ADDRESS_IDX].strptr)); - - if (strcmp(*(S1ParamList.paramarray[l][ENB_MME_IP_ADDRESS_PREFERENCE_IDX].strptr), "ipv4") == 0) { - S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[l].ipv4 = 1; - S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[l].ipv6 = 0; - } else if (strcmp(*(S1ParamList.paramarray[l][ENB_MME_IP_ADDRESS_PREFERENCE_IDX].strptr), "ipv6") == 0) { - S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[l].ipv4 = 0; - S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[l].ipv6 = 1; - } else if (strcmp(*(S1ParamList.paramarray[l][ENB_MME_IP_ADDRESS_PREFERENCE_IDX].strptr), "no") == 0) { - S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[l].ipv4 = 1; - S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[l].ipv6 = 1; - } + S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[l].ipv4 = 1; + S1AP_REGISTER_ENB_REQ (msg_p).mme_ip_address[l].ipv6 = 0; if (S1ParamList.paramarray[l][ENB_MME_BROADCAST_PLMN_INDEX].iptr) { S1AP_REGISTER_ENB_REQ(msg_p).broadcast_plmn_num[l] = S1ParamList.paramarray[l][ENB_MME_BROADCAST_PLMN_INDEX].numelt; diff --git a/openair2/ENB_APP/enb_paramdef.h b/openair2/ENB_APP/enb_paramdef.h index 70bf704ea5..fc06be7930 100644 --- a/openair2/ENB_APP/enb_paramdef.h +++ b/openair2/ENB_APP/enb_paramdef.h @@ -996,10 +996,7 @@ typedef struct srb1_params_s { #define ENB_CONFIG_STRING_MME_IPV4_ADDRESS "ipv4" -#define ENB_CONFIG_STRING_MME_IPV6_ADDRESS "ipv6" #define ENB_CONFIG_STRING_MME_PORT "port" -#define ENB_CONFIG_STRING_MME_IP_ADDRESS_ACTIVE "active" -#define ENB_CONFIG_STRING_MME_IP_ADDRESS_PREFERENCE "preference" #define ENB_CONFIG_STRING_MME_BROADCAST_PLMN_INDEX "broadcast_plmn_index" @@ -1010,9 +1007,6 @@ typedef struct srb1_params_s { // clang-format off #define S1PARAMS_DESC { \ {ENB_CONFIG_STRING_MME_IPV4_ADDRESS, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ - {ENB_CONFIG_STRING_MME_IPV6_ADDRESS, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ - {ENB_CONFIG_STRING_MME_IP_ADDRESS_ACTIVE, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ - {ENB_CONFIG_STRING_MME_IP_ADDRESS_PREFERENCE, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_MME_BROADCAST_PLMN_INDEX, NULL, 0, .uptr=NULL, .defintarrayval=NULL, TYPE_UINTARRAY, 6}, \ {ENB_CONFIG_STRING_MME_PORT, NULL, 0, .u16ptr=NULL, .defuintval=S1AP_PORT_NUMBER, TYPE_UINT16, 0}, \ } @@ -1022,11 +1016,8 @@ typedef struct srb1_params_s { #define ENB_MME_IPV4_ADDRESS_IDX 0 -#define ENB_MME_IPV6_ADDRESS_IDX 1 -#define ENB_MME_IP_ADDRESS_ACTIVE_IDX 2 -#define ENB_MME_IP_ADDRESS_PREFERENCE_IDX 3 -#define ENB_MME_BROADCAST_PLMN_INDEX 4 -#define ENB_MME_PORT_IDX 5 +#define ENB_MME_BROADCAST_PLMN_INDEX 1 +#define ENB_MME_PORT_IDX 2 /*---------------------------------------------------------------------------------------------------------------------------------------*/ /* X2 configuration parameters section name */ diff --git a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf index 7ead77d2d4..896a03af9f 100644 --- a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf +++ b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf @@ -30,12 +30,7 @@ eNBs = uplink_frequency_offset = -120000000; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.13.11"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.13.11"; }); enable_measurement_reports = "no"; diff --git a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf index 7cd2cac355..0580d74ce5 100644 --- a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf +++ b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf @@ -42,12 +42,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.13.11"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.13.11"; }); enable_measurement_reports = "no"; diff --git a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf index 6e425ceb92..2785f4a698 100644 --- a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf +++ b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf @@ -29,12 +29,7 @@ eNBs = uplink_frequency_offset = -120000000; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.13.11"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.13.11"; }); enable_measurement_reports = "no"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-4g.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-4g.conf index ba4dc9e604..e32db67009 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-4g.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-4g.conf @@ -176,12 +176,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.18.99"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.18.99"; }); enable_measurement_reports = "yes"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf index 96821e64ba..fa99bdcfac 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf @@ -168,12 +168,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.18.150"; #"192.168.18.99"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.18.150"; }); ///X2 enable_x2 = "yes"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf index 86d6a1d25a..e486be3605 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/cu.lte.conf @@ -176,14 +176,7 @@ eNBs = ( ////////// MME parameters: - mme_ip_address = ( - { - ipv4 = "127.0.1.10"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "127.0.1.10"; }); NETWORK_INTERFACES : { ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.1.30/24"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf index 60a46f47a4..051c0845b4 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf @@ -354,12 +354,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "127.0.0.3"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "127.0.0.3"; }); enable_measurement_reports = "no"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.100PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.100PRB.usrpx310.conf index 5bf2eea967..2882356c65 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.100PRB.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.100PRB.usrpx310.conf @@ -135,12 +135,7 @@ eNBs = }; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); enable_measurement_reports = "no"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.25PRB.iris030.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.25PRB.iris030.conf index ed08c4c21a..2e80aaba8c 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.25PRB.iris030.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.25PRB.iris030.conf @@ -171,12 +171,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "127.0.0.20"; - ipv6 = "fe80::d65d:dfff:fe1d:f4d4"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "127.0.0.20"; }); enable_measurement_reports = "no"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.usrpx310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.usrpx310.conf index 98d53dbb0c..ad1888a8b6 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.usrpx310.conf @@ -135,12 +135,7 @@ eNBs = }; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); enable_measurement_reports = "no"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band42.tm1.25PRB.iris030.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band42.tm1.25PRB.iris030.conf index 330a7b756f..99903672cb 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band42.tm1.25PRB.iris030.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band42.tm1.25PRB.iris030.conf @@ -171,12 +171,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "127.0.0.20"; - ipv6 = "fe80::d65d:dfff:fe1d:f4d4"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "127.0.0.20"; }); enable_measurement_reports = "no"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.25prb.bladerf.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.25prb.bladerf.conf index 683d56381c..982156d6e0 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.25prb.bladerf.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.25prb.bladerf.conf @@ -174,12 +174,7 @@ eNBs = }; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.148"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.148"; }); enable_measurement_reports = "no"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf index 1d48bd6bc6..80db17c5a8 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf @@ -172,12 +172,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); ///X2 enable_x2 = "yes"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf index 86307fdbd9..ed9c803150 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf @@ -138,12 +138,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.148"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.148"; }); enable_measurement_reports = "no"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.iris030.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.iris030.conf index 2f7324c0ad..3e006e9bdd 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.iris030.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.iris030.conf @@ -171,12 +171,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "127.0.0.20"; - ipv6 = "fe80::d65d:dfff:fe1d:f4d4"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "127.0.0.20"; }); enable_measurement_reports = "no"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.usrpb210.replay.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.usrpb210.replay.conf index 223b8ccf31..2012800542 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.usrpb210.replay.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.usrpb210.replay.conf @@ -172,12 +172,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.13.11"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.13.11"; }); enable_measurement_reports = "no"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf index 6e5b1f2b52..32ee9b9ff1 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf @@ -172,12 +172,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "127.0.0.3"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "127.0.0.3"; }); enable_measurement_reports = "no"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf index c193cd70b3..2cfada3141 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf @@ -172,12 +172,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "10.64.93.19"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "10.64.93.19"; }); enable_measurement_reports = "no"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210_ue_expansion.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210_ue_expansion.conf index 78ba4caa51..d74e0afe57 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210_ue_expansion.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210_ue_expansion.conf @@ -139,12 +139,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); enable_measurement_reports = "no"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf index 7aed3516c6..b3c952ded7 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf @@ -162,12 +162,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.18.99"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.18.99"; }); ///X2 enable_x2 = "yes"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf index 0feccb8dc0..dd1b4c6478 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf @@ -162,12 +162,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf index 29cf43f0ae..0f81c797f3 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf @@ -161,12 +161,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf index 03b8a6a4ba..610e7e0ab8 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf @@ -162,12 +162,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.18.99"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.18.99"; }); ///X2 enable_x2 = "no"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpn300.conf index 4639de5a26..7ecc44f395 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpn300.conf @@ -163,12 +163,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpx300.conf index 79b25f821a..69e664dabc 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpx300.conf @@ -150,12 +150,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.24PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.24PRB.usrpx300.conf index 004fa25d36..3c8055dc02 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.24PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.24PRB.usrpx300.conf @@ -150,12 +150,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpn300.conf index 21d1ddcf0c..415727fa09 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpn300.conf @@ -148,12 +148,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpx300.conf index 8defc961a1..a73a099411 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpx300.conf @@ -148,12 +148,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf index cb2459f70c..9d26adefe9 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf @@ -162,12 +162,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); ///X2 enable_x2 = "yes"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf index a628b28e10..0f5f6e4afc 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf @@ -162,12 +162,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); ///X2 enable_x2 = "yes"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf index 9579aa4d68..99f8f16fda 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf @@ -161,12 +161,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); ///X2 enable_x2 = "yes"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.PTRS.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.PTRS.usrpx300.conf index 4d6a1e0b95..b08b98044f 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.PTRS.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.PTRS.usrpx300.conf @@ -210,12 +210,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpb210.conf index 5e7199c65c..097eb6db97 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpb210.conf @@ -161,12 +161,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf index 373f040efb..dcb5c81dbb 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf @@ -160,12 +160,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf index cfebc22824..d607700f03 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf @@ -160,12 +160,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf index c39587926b..5cf4abaae2 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf @@ -161,12 +161,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); ///X2 enable_x2 = "no"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf index db5269a486..9e8bc1e771 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf @@ -162,12 +162,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpb210.conf index 0eb7093caf..9a86f088c5 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpb210.conf @@ -161,12 +161,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpn300.conf index b1f237b110..10841c62ef 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpn300.conf @@ -161,12 +161,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpx300.conf index dd22e298a0..cc49737c1a 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpx300.conf @@ -161,12 +161,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf index 2e9184e3b4..83663e52ef 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf @@ -162,12 +162,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf index 985971c158..7c49f8519b 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf @@ -141,12 +141,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "127.0.0.3"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "127.0.0.3"; }); enable_measurement_reports = "no"; 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 0b871b436b..c6b09a0618 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 @@ -141,12 +141,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.56.102"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.56.102"; }); enable_measurement_reports = "no"; 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 2a4f5c143f..04f2bc5d2f 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 @@ -172,12 +172,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); enable_measurement_reports = "no"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf index 3304f181db..517e8a8892 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf @@ -141,12 +141,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); enable_measurement_reports = "no"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf index 3b3d42a0da..f74bb99b17 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf @@ -142,12 +142,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "127.0.0.3"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "127.0.0.3"; }); enable_measurement_reports = "no"; 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 c6565e55c7..e2706004ea 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 @@ -184,12 +184,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.26"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.12.26"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc_b38_if5_ENDC.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc_b38_if5_ENDC.conf index a86688457c..276cf72f11 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc_b38_if5_ENDC.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc_b38_if5_ENDC.conf @@ -138,12 +138,7 @@ eNBs = }; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.18.150"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.18.150"; }); enable_measurement_reports = "no"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_eNB_band13.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_eNB_band13.conf index ee48e17455..22d05b6419 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_eNB_band13.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_eNB_band13.conf @@ -178,12 +178,7 @@ eNBs = enable_measurement_reports = "yes"; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.18.99"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.18.99"; }); ///X2 enable_x2 = "yes"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf index e4b965408d..b1d4006849 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf @@ -179,12 +179,7 @@ eNBs = enable_measurement_reports = "yes"; ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.18.99"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.18.99"; }); ///X2 enable_x2 = "yes"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf index ee1af659df..6d3f9477a7 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf @@ -162,12 +162,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.18.99"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.18.99"; }); ///X2 enable_x2 = "yes"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf index dea6f800d7..da494f0433 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf @@ -161,12 +161,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.18.99"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.18.99"; }); ///X2 enable_x2 = "yes"; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf index 9f16fae654..036059b0fe 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf @@ -162,12 +162,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.18.99"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + mme_ip_address = ({ ipv4 = "192.168.18.99"; }); ///X2 enable_x2 = "no"; From 235567bb6ae347dfc9b9b268ffceb9e8e7d07988 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 25 Mar 2024 09:52:24 +0100 Subject: [PATCH 12/20] Remove IPv6/active/preference fields from gNBs.[0].amf_ip_address array Same reasoning as in the previous commit. Remove filling of broadcast_plmn, which does not exist in the configuration. --- .../conf_files/gnb-cu.sa.band78.106prb.conf | 7 +------ ci-scripts/conf_files/gnb-cu.sa.f1.conf | 7 +------ ci-scripts/conf_files/gnb-cucp.sa.f1.conf | 7 +------ .../conf_files/gnb-cucp.sa.f1.quectel.conf | 7 +------ .../gnb-vnf.sa.band78.273prb.aerial.conf | 7 +------ .../gnb.nsa.band78.106prb.usrpn310.2x2.conf | 7 +------ .../gnb.sa.band261.u3.32prb.rfsim.conf | 7 +------ .../gnb.sa.band66.106prb.rfsim.conf | 7 +------ .../gnb.sa.band66.u0.25prb.rfsim.conf | 7 +------ .../gnb.sa.band78.106prb.l2sim.conf | 7 +------ .../gnb.sa.band78.106prb.n310.7ds2u.conf | 7 +------ .../gnb.sa.band78.106prb.rfsim.2x2.conf | 7 +------ .../gnb.sa.band78.106prb.rfsim.conf | 7 +------ .../gnb.sa.band78.106prb.usrp310.2x2.conf | 7 +------ ...gnb.sa.band78.106prb.usrpb200.sc-fdma.conf | 7 +------ ...b.sa.band78.106prb.usrpn310.ddsuu-2x2.conf | 7 +------ .../gnb.sa.band78.162prb.usrpn310.2x2.conf | 7 +------ .../conf_files/gnb.sa.band78.24prb.rfsim.conf | 7 +------ .../gnb.sa.band78.51prb.aw2s.ddsuu.conf | 7 +------ .../gnb.sa.band78.51prb.usrpb200.conf | 7 +------ .../gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf | 7 +------ .../gNB_SA_n78_106PRB.2x2_usrpn310.conf | 7 +------ .../gNB_SA_n78_133PRB.2x2_usrpn310.conf | 7 +------ .../gnb.band78.sa.fr1.106PRB.usrpn310.conf | 7 +------ .../gnb.sa.band66.fr1.106PRB.usrpn300.conf | 7 +------ .../gnb.sa.band78.fr1.51PRB.usrpb210.conf | 7 +------ ...oxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf | 7 +------ openair2/GNB_APP/gnb_config.c | 19 ++++--------------- openair2/GNB_APP/gnb_paramdef.h | 15 ++------------- .../GENERIC-LTE-EPC/CONF/testing_gnb.conf | 7 +------ .../CONF/testing_gnb_nsa_n310.conf | 7 +------ .../PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf | 7 +------ .../GENERIC-NR-5GC/CONF/gNB_SA_40_2x2.conf | 7 +------ .../CONF/gnb-vnf.sa.band78.273prb.aerial.conf | 7 +------ ...gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf | 7 +------ ...gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf | 7 +------ ...b.band78.tm1.106PRB.usrpn300.gtp-itti.conf | 7 +------ .../CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf | 7 +------ .../gnb.sa.band257.u3.32prb.usrpx410.conf | 7 +------ .../gnb.sa.band41.fr1.106PRB.usrpb210.conf | 7 +------ .../gnb.sa.band41.fr1.52PRB.usrpb210.conf | 7 +------ .../gnb.sa.band66.fr1.106PRB.usrpn300.conf | 7 +------ .../gnb.sa.band66.fr1.106PRB.usrpx300.conf | 7 +------ .../gnb.sa.band66.fr1.24PRB.usrpx300.conf | 7 +------ .../gnb.sa.band66.fr1.25PRB.usrpx300.conf | 7 +------ .../gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf | 7 +------ ...gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf | 9 +-------- .../gnb.sa.band77.fr1.273PRB.usrpx300.conf | 9 +-------- ...sa.band78.273prb.fhi72.4x2-benetel650.conf | 7 +------ ...gnb.sa.band78.273prb.fhi72.4x4-liteon.conf | 7 +------ ...gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf | 7 +------ ....sa.band78.fr1.106PRB.usrpb210.4layer.conf | 7 +------ .../gnb.sa.band78.fr1.106PRB.usrpb210.conf | 7 +------ ...b.sa.band78.fr1.106PRB.usrpb210.sabox.conf | 7 +------ ...gnb.sa.band78.fr1.217PRB.2x2.usrpn300.conf | 7 +------ .../gnb.sa.band78.fr1.24PRB.usrpb210.conf | 7 +------ .../gnb0.prs.band78.fr1.106PRB.usrpx310.conf | 7 +------ .../gnb1.prs.band78.fr1.106PRB.usrpx310.conf | 7 +------ 58 files changed, 62 insertions(+), 368 deletions(-) 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 772766ecb4..e828389ca8 100644 --- a/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf +++ b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf @@ -39,12 +39,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.71.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.71.132"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/gnb-cu.sa.f1.conf b/ci-scripts/conf_files/gnb-cu.sa.f1.conf index 97daeca9bc..1cd2d76318 100644 --- a/ci-scripts/conf_files/gnb-cu.sa.f1.conf +++ b/ci-scripts/conf_files/gnb-cu.sa.f1.conf @@ -39,12 +39,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "172.21.16.137"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "172.21.16.137"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/gnb-cucp.sa.f1.conf b/ci-scripts/conf_files/gnb-cucp.sa.f1.conf index f783a2f54d..66e3522181 100644 --- a/ci-scripts/conf_files/gnb-cucp.sa.f1.conf +++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.conf @@ -40,12 +40,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "oai-amf"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "oai-amf"; }); E1_INTERFACE = ( 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 9d17afbdef..7f7daa1370 100644 --- a/ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf +++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf @@ -40,12 +40,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "172.21.16.137"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "172.21.16.137"; }); E1_INTERFACE = ( 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 b201943849..dd8d3d80d1 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 @@ -190,12 +190,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.71.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.71.132"; }); NETWORK_INTERFACES : diff --git a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf index a273c58611..7d3e96e971 100644 --- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf +++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf @@ -163,12 +163,7 @@ gNBs = ////////// MME parameters: - amf_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; }); ///X2 enable_x2 = "yes"; diff --git a/ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf index 09216a405a..e7bd046f48 100644 --- a/ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf @@ -162,12 +162,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.71.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.71.132"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf index cde9269c6e..a5a4f1ef8a 100644 --- a/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf @@ -160,12 +160,7 @@ gNBs = ////////// MME parameters: - amf_ip_address = ( { ipv4 = "192.168.71.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.71.132"; }); NETWORK_INTERFACES : diff --git a/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf index 050687a2e8..c4d063ef45 100644 --- a/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf @@ -161,12 +161,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.71.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.71.132"; }); NETWORK_INTERFACES : { 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 56c101d68b..30890bec1d 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.l2sim.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.l2sim.conf @@ -158,12 +158,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.71.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.71.132"; }); NETWORK_INTERFACES : diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf index c3b75f1250..d43d2ed8e9 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf @@ -170,12 +170,7 @@ gNBs = }; ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "172.21.6.100"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "172.21.6.100"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf index 14337f3141..5e77c29ce2 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf @@ -161,12 +161,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.71.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.71.132"; }); NETWORK_INTERFACES : diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf index ce1b59c97d..48ac666f6a 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf @@ -164,12 +164,7 @@ gNBs = }; ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.71.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.71.132"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf index b48362f5c5..8ae97bcc19 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf @@ -163,12 +163,7 @@ gNBs = }; ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf index e43b91395f..82fb9f90e1 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf @@ -156,12 +156,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "172.21.16.137"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "172.21.16.137"; }); NETWORK_INTERFACES : diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf index e198c6c2bc..9e38bff23d 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf @@ -176,12 +176,7 @@ gNBs = }; ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf b/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf index e0d720af9e..7392a5916d 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf @@ -177,12 +177,7 @@ gNBs = }; ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf index 02df8b24e4..82bf680019 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf @@ -159,12 +159,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.71.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.71.132"; }); NETWORK_INTERFACES : diff --git a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf index 28da37a02f..34201a96b1 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf @@ -166,12 +166,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "172.21.6.100"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "172.21.6.100"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf index 6ac5083b81..d42f6a36ab 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf @@ -156,12 +156,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "172.21.16.137"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "172.21.16.137"; }); NETWORK_INTERFACES : 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 0dbf3310c9..8d2d138703 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 @@ -161,12 +161,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.70.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.70.132"; }); NETWORK_INTERFACES : diff --git a/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf b/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf index 7b187c5f3d..f01a93bf4e 100644 --- a/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf +++ b/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf @@ -176,12 +176,7 @@ gNBs = }; ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.69.131"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.69.131"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf b/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf index 62cfd0ce45..f34ac26a1c 100644 --- a/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf +++ b/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf @@ -173,12 +173,7 @@ gNBs = }; ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.69.131"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.69.131"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf index 49d22ecbc3..58809bbdf9 100644 --- a/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf +++ b/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf @@ -181,12 +181,7 @@ gNBs = }; ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf b/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf index 1e261ca472..cbed713ded 100644 --- a/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf +++ b/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf @@ -160,12 +160,7 @@ gNBs = ////////// MME parameters: - amf_ip_address = ( { ipv4 = "192.168.70.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.70.132"; }); NETWORK_INTERFACES : diff --git a/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf b/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf index eab8bb3e2b..28211685c8 100644 --- a/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf @@ -158,12 +158,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "172.21.16.136"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "172.21.16.136"; }); NETWORK_INTERFACES : 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 7429c9bd93..7925655519 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 @@ -158,12 +158,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.61.195"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.61.195"; }); NETWORK_INTERFACES : diff --git a/openair2/GNB_APP/gnb_config.c b/openair2/GNB_APP/gnb_config.c index 704591d08e..1ef59e34dd 100644 --- a/openair2/GNB_APP/gnb_config.c +++ b/openair2/GNB_APP/gnb_config.c @@ -1802,27 +1802,15 @@ int RCconfig_NR_NG(MessageDef *msg_p, uint32_t i) { for (int l = 0; l < NGParamList.numelt; l++) { NGAP_REGISTER_GNB_REQ (msg_p).nb_amf += 1; - strcpy(NGAP_REGISTER_GNB_REQ (msg_p).amf_ip_address[l].ipv4_address,*(NGParamList.paramarray[l][GNB_AMF_IPV4_ADDRESS_IDX].strptr)); - strcpy(NGAP_REGISTER_GNB_REQ (msg_p).amf_ip_address[l].ipv6_address,*(NGParamList.paramarray[l][GNB_AMF_IPV6_ADDRESS_IDX].strptr)); - - if (strcmp(*(NGParamList.paramarray[l][GNB_AMF_IP_ADDRESS_ACTIVE_IDX].strptr), "yes") == 0) { - } - if (strcmp(*(NGParamList.paramarray[l][GNB_AMF_IP_ADDRESS_PREFERENCE_IDX].strptr), "ipv4") == 0) { - NGAP_REGISTER_GNB_REQ (msg_p).amf_ip_address[j].ipv4 = 1; - } else if (strcmp(*(NGParamList.paramarray[l][GNB_AMF_IP_ADDRESS_PREFERENCE_IDX].strptr), "ipv6") == 0) { - NGAP_REGISTER_GNB_REQ (msg_p).amf_ip_address[j].ipv6 = 1; - } else if (strcmp(*(NGParamList.paramarray[l][GNB_AMF_IP_ADDRESS_PREFERENCE_IDX].strptr), "no") == 0) { - NGAP_REGISTER_GNB_REQ (msg_p).amf_ip_address[j].ipv4 = 1; - NGAP_REGISTER_GNB_REQ (msg_p).amf_ip_address[j].ipv6 = 1; - } + NGAP_REGISTER_GNB_REQ (msg_p).amf_ip_address[j].ipv4 = 1; + NGAP_REGISTER_GNB_REQ (msg_p).amf_ip_address[j].ipv6 = 0; /* not in configuration yet ... if (NGParamList.paramarray[l][GNB_AMF_BROADCAST_PLMN_INDEX].iptr) NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_num[l] = NGParamList.paramarray[l][GNB_AMF_BROADCAST_PLMN_INDEX].numelt; else NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_num[l] = 0; - */ AssertFatal(NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_num[l] <= NGAP_REGISTER_GNB_REQ(msg_p).num_plmn, "List of broadcast PLMN to be sent to AMF can not be longer than actual " @@ -1831,7 +1819,7 @@ int RCconfig_NR_NG(MessageDef *msg_p, uint32_t i) { NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_num[l]); for (int el = 0; el < NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_num[l]; ++el) { - /* UINTARRAY gets mapped to int, see config_libconfig.c:223 */ + // UINTARRAY gets mapped to int, see config_libconfig.c:223 NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_index[l][el] = NGParamList.paramarray[l][GNB_AMF_BROADCAST_PLMN_INDEX].iptr[el]; AssertFatal(NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_index[l][el] >= 0 && NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_index[l][el] < NGAP_REGISTER_GNB_REQ(msg_p).num_plmn, @@ -1839,6 +1827,7 @@ int RCconfig_NR_NG(MessageDef *msg_p, uint32_t i) { NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_index[l][el], NGAP_REGISTER_GNB_REQ(msg_p).num_plmn); } + */ /* if no broadcasst_plmn array is defined, fill default values */ if (NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_num[l] == 0) { diff --git a/openair2/GNB_APP/gnb_paramdef.h b/openair2/GNB_APP/gnb_paramdef.h index 7e536c4c84..b4ac31e6ed 100644 --- a/openair2/GNB_APP/gnb_paramdef.h +++ b/openair2/GNB_APP/gnb_paramdef.h @@ -286,28 +286,17 @@ typedef enum { #define GNB_CONFIG_STRING_AMF_IPV4_ADDRESS "ipv4" -#define GNB_CONFIG_STRING_AMF_IPV6_ADDRESS "ipv6" -#define GNB_CONFIG_STRING_AMF_IP_ADDRESS_ACTIVE "active" -#define GNB_CONFIG_STRING_AMF_IP_ADDRESS_PREFERENCE "preference" -#define GNB_CONFIG_STRING_AMF_BROADCAST_PLMN_INDEX "broadcast_plmn_index" - /*-------------------------------------------------------------------------------------------------------------------------------------*/ /* MME configuration parameters */ /* optname helpstr paramflags XXXptr defXXXval type numelt */ /*-------------------------------------------------------------------------------------------------------------------------------------*/ #define GNBNGPARAMS_DESC { \ -{GNB_CONFIG_STRING_AMF_IPV4_ADDRESS, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ -{GNB_CONFIG_STRING_AMF_IPV6_ADDRESS, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ -{GNB_CONFIG_STRING_AMF_IP_ADDRESS_ACTIVE, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ -{GNB_CONFIG_STRING_AMF_IP_ADDRESS_PREFERENCE, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ + {GNB_CONFIG_STRING_AMF_IPV4_ADDRESS, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ } #define GNB_AMF_IPV4_ADDRESS_IDX 0 -#define GNB_AMF_IPV6_ADDRESS_IDX 1 -#define GNB_AMF_IP_ADDRESS_ACTIVE_IDX 2 -#define GNB_AMF_IP_ADDRESS_PREFERENCE_IDX 3 -#define GNB_AMF_BROADCAST_PLMN_INDEX 4 + /*---------------------------------------------------------------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------------------------------------------------------------*/ /* SCTP configuration parameters section name */ diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf index 6f814ce857..a7e19fdf65 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf @@ -161,12 +161,7 @@ gNBs = ////////// MME parameters: - amf_ip_address = ( { ipv4 = "192.168.69.131"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.69.131"; }); ///X2 enable_x2 = "yes"; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf index 31020f7e01..9c41e9d1ef 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf @@ -164,12 +164,7 @@ gNBs = ////////// MME parameters: - amf_ip_address = ( { ipv4 = "192.168.18.99"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.18.99"; }); ///X2 enable_x2 = "yes"; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf index 1a3ace731c..6730f22b41 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf @@ -38,12 +38,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.69.131"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.69.131"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gNB_SA_40_2x2.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gNB_SA_40_2x2.conf index 434445a2a9..b6b17da2a6 100755 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gNB_SA_40_2x2.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gNB_SA_40_2x2.conf @@ -208,12 +208,7 @@ gNBs = }; ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.69.131"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.69.131"; }); NETWORK_INTERFACES : { 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 50563fe482..b3d7171784 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 @@ -190,12 +190,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.70.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.70.132"; }); NETWORK_INTERFACES : diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf index 1a1f372e99..668d4d1a61 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf @@ -192,12 +192,7 @@ gNBs = }; ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.70.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.70.132"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf index 0742b5686c..dea0ae4c43 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf @@ -196,12 +196,7 @@ gNBs = }; ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.70.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.70.132"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf index 6c74da2181..e1e12ec2f3 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf @@ -162,12 +162,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.199.223"; - ipv6 = "192:168:199::223"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.199.223"; }); diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf index f537a5b9f2..d75d39c452 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf @@ -157,12 +157,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.70.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.70.132"; }); NETWORK_INTERFACES : diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.u3.32prb.usrpx410.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.u3.32prb.usrpx410.conf index e23bedf75f..27b3b4b16f 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.u3.32prb.usrpx410.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.u3.32prb.usrpx410.conf @@ -164,12 +164,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.70.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.70.132"; }); NETWORK_INTERFACES : diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf index 305dea63d8..0b85cdc994 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf @@ -158,12 +158,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.70.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.70.132"; }); NETWORK_INTERFACES : diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.52PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.52PRB.usrpb210.conf index da1d3c8a2e..93659bb317 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.52PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.52PRB.usrpb210.conf @@ -164,12 +164,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.70.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.70.132"; }); NETWORK_INTERFACES : diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf index 58b1509cda..2b274462bb 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf @@ -159,12 +159,7 @@ gNBs = ////////// MME parameters: - amf_ip_address = ( { ipv4 = "192.168.70.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.70.132"; }); NETWORK_INTERFACES : diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpx300.conf index 81ebc76128..3f055dd36f 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpx300.conf @@ -175,12 +175,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.71.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.71.132"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf index d2e4b5c160..5dc2ba2f80 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf @@ -176,12 +176,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.71.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.71.132"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf index ed77a1cf67..cb68e65d0c 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf @@ -176,12 +176,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.71.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.71.132"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf index 0060065d65..7ae992bcce 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf @@ -171,12 +171,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "172.21.6.5"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "172.21.6.5"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf index 4f0e5d93fb..186344d81f 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf @@ -161,14 +161,7 @@ gNBs = ( ////////// AMF parameters: - amf_ip_address = ( - { - ipv4 = "192.168.70.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.70.132"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.usrpx300.conf index 8ce20405b5..327a109e53 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.usrpx300.conf @@ -161,14 +161,7 @@ gNBs = ( ////////// AMF parameters: - amf_ip_address = ( - { - ipv4 = "192.168.80.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.80.132"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel650.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel650.conf index 1ffdd10727..2fd6bc6ca0 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel650.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel650.conf @@ -170,12 +170,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "172.21.6.5"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "172.21.6.5"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf index ede124400d..0df4af5faa 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf @@ -170,12 +170,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "172.21.6.5"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "172.21.6.5"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf index 050630e575..d9b4bbc495 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf @@ -160,12 +160,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.70.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.70.132"; }); NETWORK_INTERFACES : diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.4layer.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.4layer.conf index 0957e59846..a04679eac8 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.4layer.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.4layer.conf @@ -160,12 +160,7 @@ gNBs = ////////// MME parameters: - amf_ip_address = ( { ipv4 = "192.168.70.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.70.132"; }); NETWORK_INTERFACES : diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf index 382ce159ee..43cafc0931 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf @@ -159,12 +159,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.70.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.70.132"; }); NETWORK_INTERFACES : diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf index 21eb24035b..86a934a9dd 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf @@ -159,12 +159,7 @@ gNBs = ////////// MME parameters: - amf_ip_address = ( { ipv4 = "192.168.5.233"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.5.233"; }); ///X2 enable_x2 = "no"; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.2x2.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.2x2.usrpn300.conf index f512c178a4..5ec42222de 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.2x2.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.2x2.usrpn300.conf @@ -161,12 +161,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.70.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.70.132"; }); NETWORK_INTERFACES : diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf index 29a8946272..32725071ce 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf @@ -159,12 +159,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "192.168.70.132"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "192.168.70.132"; }); NETWORK_INTERFACES : diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band78.fr1.106PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band78.fr1.106PRB.usrpx310.conf index 986a12db35..86065d2dd9 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band78.fr1.106PRB.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band78.fr1.106PRB.usrpx310.conf @@ -196,12 +196,7 @@ gNBs = }; ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band78.fr1.106PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band78.fr1.106PRB.usrpx310.conf index 82f660642a..60cab9432c 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band78.fr1.106PRB.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band78.fr1.106PRB.usrpx310.conf @@ -195,12 +195,7 @@ gNBs = }; ////////// AMF parameters: - amf_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; }); NETWORK_INTERFACES : { From 27447f94bf309412b7a01e80f2609efc9234e898 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 25 Mar 2024 09:56:29 +0100 Subject: [PATCH 13/20] Remove IPv6/active/preference fields from e/gNBs.[0].target_enb_x2_ip_address array Some reasoning as in previous commit. --- .../gnb.nsa.band78.106prb.usrpb200.conf | 6 +----- .../gnb.nsa.band78.106prb.usrpn310.2x2.conf | 7 +------ ci-scripts/conf_files/untested/benetel-5g.conf | 7 +------ .../enb.band7.tm1.25PRB.slave.usrpb210.conf | 7 +------ .../enb.slave.band13.tm1.25PRB.usrpb210.conf | 7 +------ .../episci_rcc.band78.tm1.106PRB.nfapi.conf | 7 +------ .../proxy_rcc.band78.tm1.106PRB.nfapi.conf | 7 +------ .../gnb.band78.tm1.fr1.106PRB.usrpb210.conf | 6 +----- .../gnb.band78.tm1.fr1.106PRB.usrpn310.conf | 7 +------ doc/TESTING_GNB_W_COTS_UE.md | 7 +------ doc/testing_gnb_w_cots_ue_resources/gnb.conf | 7 +------ openair2/ENB_APP/enb_config.c | 16 +++------------- openair2/ENB_APP/enb_paramdef.h | 7 ------- openair2/GNB_APP/gnb_config.c | 14 ++------------ .../GENERIC-LTE-EPC/CONF/benetel-5g.conf | 7 +------ .../CONF/gnb.band257.tm1.32PRB.usrpn300.conf | 7 +------ .../CONF/gnb.band261.tm1.32PRB.usrpn300.conf | 7 +------ .../CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf | 7 +------ .../CONF/gnb.band78.106PRB.slave.conf | 7 +------ .../GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf | 7 +------ .../CONF/gnb.band78.tm1.217PRB.usrpn300.conf | 7 +------ .../GENERIC-LTE-EPC/CONF/testing_gnb.conf | 7 +------ .../GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf | 7 +------ .../GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf | 7 +------ .../CONF/testing_gnb_nsa_n310.conf | 7 +------ .../gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf | 7 +------ .../gnb0.prs.band261.fr2.64PRB.usrpx310.conf | 7 +------ .../gnb1.prs.band261.fr2.64PRB.usrpx310.conf | 7 +------ 28 files changed, 30 insertions(+), 180 deletions(-) diff --git a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf index 70e6cfc93a..f21eae2b1f 100644 --- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf +++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf @@ -167,11 +167,7 @@ gNBs = t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( { ipv4 = "192.168.68.130"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "192.168.68.130"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf index 7d3e96e971..fa17a177b0 100644 --- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf +++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf @@ -171,12 +171,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "CI_FR1_CTL_ENB_IP_ADDR"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "CI_FR1_CTL_ENB_IP_ADDR"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/untested/benetel-5g.conf b/ci-scripts/conf_files/untested/benetel-5g.conf index 260c9d8a98..2e8c6436d2 100644 --- a/ci-scripts/conf_files/untested/benetel-5g.conf +++ b/ci-scripts/conf_files/untested/benetel-5g.conf @@ -174,12 +174,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "127.0.0.1"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "127.0.0.1"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf index 1b764262f8..23a7837419 100644 --- a/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band7.tm1.25PRB.slave.usrpb210.conf @@ -184,12 +184,7 @@ eNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "CI_RCC_IP_ADDR"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "CI_RCC_IP_ADDR"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf index f052b30228..b92a4d4144 100644 --- a/ci-scripts/conf_files/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.slave.band13.tm1.25PRB.usrpb210.conf @@ -181,12 +181,7 @@ eNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "CI_RCC_IP_ADDR"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "CI_RCC_IP_ADDR"; }); NETWORK_INTERFACES : { 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 7392da907e..e85d8368bf 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 @@ -170,12 +170,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "172.16.0.1"; # rrc.band7.tm1.nfapi.conf:line 201 - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "172.16.0.1"; }); NETWORK_INTERFACES : { # All of these have to be IP addr of gNB 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 d791cb29ee..3ec768469a 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 @@ -193,12 +193,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "127.0.0.1"; # rrc.band7.tm1.nfapi.conf:line 201 - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "127.0.0.1"; }); NETWORK_INTERFACES : { # All of these have to be IP addr of gNB diff --git a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf index dfcbf32335..85f627b37b 100644 --- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf @@ -166,11 +166,7 @@ gNBs = t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( { ipv4 = "CI_FR1_CTL_ENB_IP_ADDR"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "CI_FR1_CTL_ENB_IP_ADDR"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf index 79ade04c88..3ec1161d6b 100644 --- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf +++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf @@ -170,12 +170,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "CI_FR1_CTL_ENB_IP_ADDR"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "CI_FR1_CTL_ENB_IP_ADDR"; }); NETWORK_INTERFACES : { diff --git a/doc/TESTING_GNB_W_COTS_UE.md b/doc/TESTING_GNB_W_COTS_UE.md index 42de92d5c5..be53cb371c 100644 --- a/doc/TESTING_GNB_W_COTS_UE.md +++ b/doc/TESTING_GNB_W_COTS_UE.md @@ -137,12 +137,7 @@ whether the clock is internal or external is defined in the configuration files enable_x2 = "yes"; t_reloc_prep = 1000; /* unit: millisecond */ tx2_reloc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "**YOUR_ENB_IP_ADDR**"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "**YOUR_ENB_IP_ADDR**"; }); NETWORK_INTERFACES : { diff --git a/doc/testing_gnb_w_cots_ue_resources/gnb.conf b/doc/testing_gnb_w_cots_ue_resources/gnb.conf index 6538a6db26..3d2a6ee9f7 100755 --- a/doc/testing_gnb_w_cots_ue_resources/gnb.conf +++ b/doc/testing_gnb_w_cots_ue_resources/gnb.conf @@ -170,12 +170,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "192.168.18.199"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "192.168.18.199"; }); NETWORK_INTERFACES : { diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c index 23e5289ae9..272f81f988 100644 --- a/openair2/ENB_APP/enb_config.c +++ b/openair2/ENB_APP/enb_config.c @@ -2558,19 +2558,9 @@ int RCconfig_X2(MessageDef *msg_p, uint32_t i) { for (l = 0; l < X2ParamList.numelt; l++) { X2AP_REGISTER_ENB_REQ (msg_p).nb_x2 += 1; strcpy(X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv4_address,*(X2ParamList.paramarray[l][ENB_X2_IPV4_ADDRESS_IDX].strptr)); - strcpy(X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv6_address,*(X2ParamList.paramarray[l][ENB_X2_IPV6_ADDRESS_IDX].strptr)); - - LOG_I(X2AP,"registering with ip : %s\n",*(X2ParamList.paramarray[l][ENB_X2_IPV4_ADDRESS_IDX].strptr)); - if (strcmp(*(X2ParamList.paramarray[l][ENB_X2_IP_ADDRESS_PREFERENCE_IDX].strptr), "ipv4") == 0) { - X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv4 = 1; - X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv6 = 0; - } else if (strcmp(*(X2ParamList.paramarray[l][ENB_X2_IP_ADDRESS_PREFERENCE_IDX].strptr), "ipv6") == 0) { - X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv4 = 0; - X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv6 = 1; - } else if (strcmp(*(X2ParamList.paramarray[l][ENB_X2_IP_ADDRESS_PREFERENCE_IDX].strptr), "no") == 0) { - X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv4 = 1; - X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv6 = 1; - } + LOG_I(X2AP, "registering with ip : %s\n", *(X2ParamList.paramarray[l][ENB_X2_IPV4_ADDRESS_IDX].strptr)); + X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv4 = 1; + X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv6 = 0; } // timers diff --git a/openair2/ENB_APP/enb_paramdef.h b/openair2/ENB_APP/enb_paramdef.h index fc06be7930..b2e261252a 100644 --- a/openair2/ENB_APP/enb_paramdef.h +++ b/openair2/ENB_APP/enb_paramdef.h @@ -1027,9 +1027,6 @@ typedef struct srb1_params_s { #define ENB_CONFIG_STRING_TARGET_ENB_X2_IPV4_ADDRESS "ipv4" -#define ENB_CONFIG_STRING_TARGET_ENB_X2_IPV6_ADDRESS "ipv6" -#define ENB_CONFIG_STRING_TARGET_ENB_X2_IP_ADDRESS_PREFERENCE "preference" - /*-------------------------------------------------------------------------------------------------------------------------------------*/ /* X2 configuration parameters */ @@ -1038,14 +1035,10 @@ typedef struct srb1_params_s { // clang-format off #define X2PARAMS_DESC { \ {ENB_CONFIG_STRING_TARGET_ENB_X2_IPV4_ADDRESS, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ - {ENB_CONFIG_STRING_TARGET_ENB_X2_IPV6_ADDRESS, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ - {ENB_CONFIG_STRING_TARGET_ENB_X2_IP_ADDRESS_PREFERENCE, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ } // clang-format on #define ENB_X2_IPV4_ADDRESS_IDX 0 -#define ENB_X2_IPV6_ADDRESS_IDX 1 -#define ENB_X2_IP_ADDRESS_PREFERENCE_IDX 2 /*---------------------------------------------------------------------------------------------------------------------------------------*/ diff --git a/openair2/GNB_APP/gnb_config.c b/openair2/GNB_APP/gnb_config.c index 1ef59e34dd..0de3db8cc3 100644 --- a/openair2/GNB_APP/gnb_config.c +++ b/openair2/GNB_APP/gnb_config.c @@ -2067,18 +2067,8 @@ int RCconfig_NR_X2(MessageDef *msg_p, uint32_t i) { for (l = 0; l < X2ParamList.numelt; l++) { X2AP_REGISTER_ENB_REQ (msg_p).nb_x2 += 1; strcpy(X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv4_address,*(X2ParamList.paramarray[l][ENB_X2_IPV4_ADDRESS_IDX].strptr)); - strcpy(X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv6_address,*(X2ParamList.paramarray[l][ENB_X2_IPV6_ADDRESS_IDX].strptr)); - - if (strcmp(*(X2ParamList.paramarray[l][ENB_X2_IP_ADDRESS_PREFERENCE_IDX].strptr), "ipv4") == 0) { - X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv4 = 1; - X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv6 = 0; - } else if (strcmp(*(X2ParamList.paramarray[l][ENB_X2_IP_ADDRESS_PREFERENCE_IDX].strptr), "ipv6") == 0) { - X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv4 = 0; - X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv6 = 1; - } else if (strcmp(*(X2ParamList.paramarray[l][ENB_X2_IP_ADDRESS_PREFERENCE_IDX].strptr), "no") == 0) { - X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv4 = 1; - X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv6 = 1; - } + X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv4 = 1; + X2AP_REGISTER_ENB_REQ (msg_p).target_enb_x2_ip_address[l].ipv6 = 0; } // timers diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf index fa99bdcfac..8b237d1513 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf @@ -176,12 +176,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "127.0.0.1"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "127.0.0.1"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf index b3c952ded7..a14a72b0db 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf @@ -170,12 +170,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "192.168.18.199"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "192.168.18.199"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf index 610e7e0ab8..f0be508668 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf @@ -170,12 +170,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "192.168.18.199"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "192.168.18.199"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf index 9d26adefe9..2b09a173d4 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf @@ -170,12 +170,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "192.168.12.196"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "192.168.12.196"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf index 0f5f6e4afc..8cb63f7768 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf @@ -170,12 +170,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "192.168.12.188"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "192.168.12.188"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf index 99f8f16fda..d8649d9211 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf @@ -169,12 +169,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "192.168.12.188"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "192.168.12.188"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf index 5cf4abaae2..d5c9ab09a9 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf @@ -169,12 +169,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "192.168.12.108"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "192.168.12.108"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf index a7e19fdf65..5a60f7e8df 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf @@ -169,12 +169,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "192.168.18.199"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "192.168.18.199"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf index 6d3f9477a7..8af8d83f2a 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf @@ -170,12 +170,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "192.168.18.199"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "192.168.18.199"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf index da494f0433..9c0601b202 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf @@ -169,12 +169,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "192.168.18.199"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "192.168.18.199"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf index 9c41e9d1ef..299747cd06 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf @@ -172,12 +172,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "192.168.18.199"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "192.168.18.199"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf index 86a934a9dd..aa6b255973 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf @@ -167,12 +167,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "CI_FR1_CTL_ENB_IP_ADDR"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "CI_FR1_CTL_ENB_IP_ADDR"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf index 036059b0fe..d965d289d1 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf @@ -170,12 +170,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "192.168.18.199"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "192.168.18.199"; }); NETWORK_INTERFACES : { diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band261.fr2.64PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band261.fr2.64PRB.usrpx310.conf index dfd2c70ded..732c35da31 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band261.fr2.64PRB.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band261.fr2.64PRB.usrpx310.conf @@ -175,12 +175,7 @@ gNBs = tx2_reloc_overall = 2000; /* unit: millisecond */ t_dc_prep = 1000; /* unit: millisecond */ t_dc_overall = 2000; /* unit: millisecond */ - target_enb_x2_ip_address = ( - { ipv4 = "192.168.18.199"; - ipv6 = "192:168:30::17"; - preference = "ipv4"; - } - ); + target_enb_x2_ip_address = ({ ipv4 = "192.168.18.199"; }); NETWORK_INTERFACES : { From 3596955fb0bcdf61b981d87a46b1f330756591da Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 25 Mar 2024 09:58:28 +0100 Subject: [PATCH 14/20] Remove IPv6/active/preference fields from eNBs.[0].target_mce_m2_ip_address array Same reasoning as in the previous commit. --- .../conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf | 7 +------ .../enb.band17.tm1.mbms.25PRB.usrpb210.conf | 7 +------ .../rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf | 7 +------ .../rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf | 7 +------ openair2/ENB_APP/enb_config.c | 14 ++------------ openair2/ENB_APP/enb_paramdef.h | 6 ------ 6 files changed, 6 insertions(+), 42 deletions(-) diff --git a/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf b/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf index 911a1f9b9f..8bdbd4acad 100644 --- a/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf +++ b/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf @@ -180,12 +180,7 @@ eNBs = t_dc_overall = 2000; /* unit: millisecond */ ////////// MCE parameters: - target_mce_m2_ip_address = ( { ipv4 = "127.0.0.7"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + target_mce_m2_ip_address = ({ ipv4 = "127.0.0.7"; }); ///M2 enable_enb_m2 = "yes"; diff --git a/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf index 4b46553778..5557e9f7f3 100644 --- a/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf @@ -188,12 +188,7 @@ eNBs = t_dc_overall = 2000; /* unit: millisecond */ ///M2 - target_mce_m2_ip_address = ( { ipv4 = "127.0.0.7"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + target_mce_m2_ip_address = ({ ipv4 = "127.0.0.7"; }); enable_enb_m2 = "yes"; diff --git a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf index bc508c3851..d5eaf02f68 100644 --- a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf +++ b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf @@ -155,12 +155,7 @@ eNBs = ////////// MCE parameters: - target_mce_m2_ip_address = ( { ipv4 = "127.0.0.7"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + target_mce_m2_ip_address = ({ ipv4 = "127.0.0.7"; }); ///M2 enable_enb_m2 = "yes"; diff --git a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf index 2563381ff3..17ca9567a4 100644 --- a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf +++ b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf @@ -155,12 +155,7 @@ eNBs = ////////// MCE parameters: - target_mce_m2_ip_address = ( { ipv4 = "127.0.0.7"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + target_mce_m2_ip_address = ({ ipv4 = "127.0.0.7"; }); ///M2 enable_enb_m2 = "yes"; diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c index 272f81f988..2f775f504e 100644 --- a/openair2/ENB_APP/enb_config.c +++ b/openair2/ENB_APP/enb_config.c @@ -2046,18 +2046,8 @@ int RCconfig_M2(MessageDef *msg_p, uint32_t i) { for (l = 0; l < M2ParamList.numelt; l++) { M2AP_REGISTER_ENB_REQ (msg_p).nb_m2 += 1; strcpy(M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv4_address,*(M2ParamList.paramarray[l][ENB_M2_IPV4_ADDRESS_IDX].strptr)); - strcpy(M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv6_address,*(M2ParamList.paramarray[l][ENB_M2_IPV6_ADDRESS_IDX].strptr)); - - if (strcmp(*(M2ParamList.paramarray[l][ENB_M2_IP_ADDRESS_PREFERENCE_IDX].strptr), "ipv4") == 0) { - M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv4 = 1; - M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv6 = 0; - } else if (strcmp(*(M2ParamList.paramarray[l][ENB_M2_IP_ADDRESS_PREFERENCE_IDX].strptr), "ipv6") == 0) { - M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv4 = 0; - M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv6 = 1; - } else if (strcmp(*(M2ParamList.paramarray[l][ENB_M2_IP_ADDRESS_PREFERENCE_IDX].strptr), "no") == 0) { - M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv4 = 1; - M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv6 = 1; - } + M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv4 = 1; + M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv6 = 0; } // timers //{ diff --git a/openair2/ENB_APP/enb_paramdef.h b/openair2/ENB_APP/enb_paramdef.h index b2e261252a..ff594608ac 100644 --- a/openair2/ENB_APP/enb_paramdef.h +++ b/openair2/ENB_APP/enb_paramdef.h @@ -1050,8 +1050,6 @@ typedef struct srb1_params_s { #define ENB_CONFIG_STRING_TARGET_MCE_M2_IPV4_ADDRESS "ipv4" -#define ENB_CONFIG_STRING_TARGET_MCE_M2_IPV6_ADDRESS "ipv6" -#define ENB_CONFIG_STRING_TARGET_MCE_M2_IP_ADDRESS_PREFERENCE "preference" /*---------------------------------------------------------------------------------------------------------------------------------------*/ @@ -1064,14 +1062,10 @@ typedef struct srb1_params_s { // clang-format off #define M2PARAMS_DESC { \ {ENB_CONFIG_STRING_TARGET_MCE_M2_IPV4_ADDRESS, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ - {ENB_CONFIG_STRING_TARGET_MCE_M2_IPV6_ADDRESS, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ - {ENB_CONFIG_STRING_TARGET_MCE_M2_IP_ADDRESS_PREFERENCE, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ } // clang-format on #define ENB_M2_IPV4_ADDRESS_IDX 0 -#define ENB_M2_IPV6_ADDRESS_IDX 1 -#define ENB_M2_IP_ADDRESS_PREFERENCE_IDX 2 /*---------------------------------------------------------------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------------------------------------------------------------*/ From 4666cddb1a0a9318c90ee3134c0c37d7879514e5 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 25 Mar 2024 09:59:05 +0100 Subject: [PATCH 15/20] Remove IPv6/active/preference fields from eNBs.[0].target_mme_m3_ip_address array Same reasoning as in previous commit. --- .../enb.band7.tm1.25prb.rfsim.mbms.conf | 7 +----- .../enb.band17.tm1.mbms.25PRB.usrpb210.conf | 7 +----- ...cc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf | 7 +----- .../rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf | 7 +----- openair2/ENB_APP/enb_paramdef_mce.h | 8 +----- openair2/MCE_APP/mce_config.c | 25 ++++++------------- 6 files changed, 13 insertions(+), 48 deletions(-) diff --git a/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf b/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf index 8bdbd4acad..4e0b0fa089 100644 --- a/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf +++ b/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf @@ -245,12 +245,7 @@ MCEs = ( //M3 enable_mce_m3 = "yes"; - target_mme_m3_ip_address = ( { ipv4 = "127.0.0.18"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + target_mme_m3_ip_address = ({ ipv4 = "127.0.0.18"; }); diff --git a/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf b/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf index 5557e9f7f3..2fa185121f 100644 --- a/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/enb.band17.tm1.mbms.25PRB.usrpb210.conf @@ -231,12 +231,7 @@ MCEs = ( //M3 enable_mce_m3 = "yes"; - target_mme_m3_ip_address = ( { ipv4 = "127.0.0.18"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + target_mme_m3_ip_address = ({ ipv4 = "127.0.0.18"; }); NETWORK_INTERFACES : diff --git a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf index d5eaf02f68..2465b96ef1 100644 --- a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf +++ b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms-s1ap.if4p5.50PRB.lo.conf @@ -200,12 +200,7 @@ MCEs = ( //M3 enable_mce_m3 = "yes"; - target_mme_m3_ip_address = ( { ipv4 = "127.0.0.18"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + target_mme_m3_ip_address = ({ ipv4 = "127.0.0.18"; }); diff --git a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf index 17ca9567a4..ba45e1dec3 100644 --- a/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf +++ b/ci-scripts/conf_files/untested/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf @@ -200,12 +200,7 @@ MCEs = ( //M3 enable_mce_m3 = "yes"; - target_mme_m3_ip_address = ( { ipv4 = "127.0.0.18"; - ipv6 = "192:168:30::17"; - active = "yes"; - preference = "ipv4"; - } - ); + target_mme_m3_ip_address = ({ ipv4 = "127.0.0.18"; }); diff --git a/openair2/ENB_APP/enb_paramdef_mce.h b/openair2/ENB_APP/enb_paramdef_mce.h index 5b61bc3d6e..c93fb4097e 100644 --- a/openair2/ENB_APP/enb_paramdef_mce.h +++ b/openair2/ENB_APP/enb_paramdef_mce.h @@ -96,18 +96,12 @@ #define MCE_CONFIG_STRING_TARGET_MME_M3_IP_ADDRESS "target_mme_m3_ip_address" /* M3 configuration parameters names */ #define MCE_CONFIG_STRING_TARGET_MME_M3_IPV4_ADDRESS "ipv4" -#define MCE_CONFIG_STRING_TARGET_MME_M3_IPV6_ADDRESS "ipv6" -#define MCE_CONFIG_STRING_TARGET_MME_M3_IP_ADDRESS_PREFERENCE "preference" /* optname helpstr paramflags XXXptr defXXXval type numelt */ #define M3PARAMS_DESC { \ -{MCE_CONFIG_STRING_TARGET_MME_M3_IPV4_ADDRESS, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ -{MCE_CONFIG_STRING_TARGET_MME_M3_IPV6_ADDRESS, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ -{MCE_CONFIG_STRING_TARGET_MME_M3_IP_ADDRESS_PREFERENCE, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ + {MCE_CONFIG_STRING_TARGET_MME_M3_IPV4_ADDRESS, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ } #define MCE2_M3_IPV4_ADDRESS_IDX 0 -#define MCE2_M3_IPV6_ADDRESS_IDX 1 -#define MCE2_M3_IP_ADDRESS_PREFERENCE_IDX 2 /*-----------------------------------------------------------------------------------------------------------------------------------*/ diff --git a/openair2/MCE_APP/mce_config.c b/openair2/MCE_APP/mce_config.c index 7d52908b76..755bb42b4a 100644 --- a/openair2/MCE_APP/mce_config.c +++ b/openair2/MCE_APP/mce_config.c @@ -150,24 +150,15 @@ int RCconfig_M3(MessageDef *msg_p, uint32_t i) { //printf("M3ParamList.numelt %d\n",M3ParamList.numelt); M3AP_REGISTER_MCE_REQ (msg_p).nb_m3 = 0; for (l = 0; l < M3ParamList.numelt; l++) { - M3AP_REGISTER_MCE_REQ (msg_p).nb_m3 += 1; - M3AP_REGISTER_MCE_REQ (msg_p).MCE_name = strdup(*(M3ParamList.paramarray[l][MCE_MCE_NAME_IDX].strptr)); + M3AP_REGISTER_MCE_REQ(msg_p).nb_m3 += 1; + M3AP_REGISTER_MCE_REQ(msg_p).MCE_name = strdup(*(M3ParamList.paramarray[l][MCE_MCE_NAME_IDX].strptr)); - strcpy(M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv4_address,*(M3ParamList.paramarray[l][MCE2_M3_IPV4_ADDRESS_IDX].strptr)); - strcpy(M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv6_address,*(M3ParamList.paramarray[l][MCE2_M3_IPV6_ADDRESS_IDX].strptr)); - - if (strcmp(*(M3ParamList.paramarray[l][MCE2_M3_IP_ADDRESS_PREFERENCE_IDX].strptr), "ipv4") == 0) { - M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv4 = 1; - M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv6 = 0; - } else if (strcmp(*(M3ParamList.paramarray[l][MCE2_M3_IP_ADDRESS_PREFERENCE_IDX].strptr), "ipv6") == 0) { - M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv4 = 0; - M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv6 = 1; - } else if (strcmp(*(M3ParamList.paramarray[l][MCE2_M3_IP_ADDRESS_PREFERENCE_IDX].strptr), "no") == 0) { - M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv4 = 1; - M3AP_REGISTER_MCE_REQ (msg_p).target_mme_m3_ip_address[l].ipv6 = 1; - } - M3AP_REGISTER_MCE_REQ (msg_p).sctp_out_streams = 2; - M3AP_REGISTER_MCE_REQ (msg_p).sctp_in_streams = 2; + strcpy(M3AP_REGISTER_MCE_REQ(msg_p).target_mme_m3_ip_address[l].ipv4_address, + *(M3ParamList.paramarray[l][MCE2_M3_IPV4_ADDRESS_IDX].strptr)); + M3AP_REGISTER_MCE_REQ(msg_p).target_mme_m3_ip_address[l].ipv4 = 1; + M3AP_REGISTER_MCE_REQ(msg_p).target_mme_m3_ip_address[l].ipv6 = 0; + M3AP_REGISTER_MCE_REQ(msg_p).sctp_out_streams = 2; + M3AP_REGISTER_MCE_REQ(msg_p).sctp_in_streams = 2; } sprintf(aprefix,"%s.[%i].%s","MCEs",0,MCE_CONFIG_STRING_NETWORK_INTERFACES_CONFIG); From d81b617d1cc4792d8c533586745adbd2ffde541b Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 29 Mar 2024 16:00:47 +0100 Subject: [PATCH 16/20] Fix MCE Name parameter reading The code (author) confused MCE_PARAMS_DESC and MCE_NETPARAMS_DESC and tried to read the MCE name from MCE_NETPARAMS_DESC when in reality it should come from MCE_PARAMS_DESC. This commit fixes to use the right array. --- openair2/MCE_APP/mce_config.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openair2/MCE_APP/mce_config.c b/openair2/MCE_APP/mce_config.c index 755bb42b4a..d958bcea5f 100644 --- a/openair2/MCE_APP/mce_config.c +++ b/openair2/MCE_APP/mce_config.c @@ -130,12 +130,13 @@ int RCconfig_M3(MessageDef *msg_p, uint32_t i) { char mcepath[MAX_OPTNAME_SIZE*2 + 8]; - paramdef_t MCEParams[] = MCE_NETPARAMS_DESC; paramdef_t M3Params[] = M3PARAMS_DESC; paramdef_t MCCHParams[] = MCCH_PARAMS_DESC; + paramdef_t MCENameParams[] = MCE_PARAMS_DESC; sprintf(mcepath,"%s.[%i].%s","MCEs",0,MCE_CONFIG_STRING_NETWORK_INTERFACES_CONFIG); - config_get(config_get_if(), MCEParams, sizeofArray(MCEParams), mcepath); + config_get(config_get_if(), MCENameParams, sizeofArray(MCENameParams), mcepath); + M3AP_REGISTER_MCE_REQ(msg_p).MCE_name = strdup(*(MCENameParams[MCE_MCE_NAME_IDX].strptr)); paramlist_def_t M3ParamList = {MCE_CONFIG_STRING_TARGET_MME_M3_IP_ADDRESS,NULL,0}; paramlist_def_t MCCHParamList = {MCE_CONFIG_STRING_MCCH_CONFIG_PER_MBSFN_AREA,NULL,0}; @@ -151,8 +152,6 @@ int RCconfig_M3(MessageDef *msg_p, uint32_t i) { M3AP_REGISTER_MCE_REQ (msg_p).nb_m3 = 0; for (l = 0; l < M3ParamList.numelt; l++) { M3AP_REGISTER_MCE_REQ(msg_p).nb_m3 += 1; - M3AP_REGISTER_MCE_REQ(msg_p).MCE_name = strdup(*(M3ParamList.paramarray[l][MCE_MCE_NAME_IDX].strptr)); - strcpy(M3AP_REGISTER_MCE_REQ(msg_p).target_mme_m3_ip_address[l].ipv4_address, *(M3ParamList.paramarray[l][MCE2_M3_IPV4_ADDRESS_IDX].strptr)); M3AP_REGISTER_MCE_REQ(msg_p).target_mme_m3_ip_address[l].ipv4 = 1; @@ -162,6 +161,7 @@ int RCconfig_M3(MessageDef *msg_p, uint32_t i) { } sprintf(aprefix,"%s.[%i].%s","MCEs",0,MCE_CONFIG_STRING_NETWORK_INTERFACES_CONFIG); + paramdef_t MCEParams[] = MCE_NETPARAMS_DESC; config_get(config_get_if(), MCEParams, sizeofArray(MCEParams), aprefix); M3AP_REGISTER_MCE_REQ (msg_p).mme_port_for_M3C = (uint32_t)*(MCEParams[MCE2_PORT_FOR_M3C_IDX].uptr); From 5fa52ecf76adedda7068004687417de9f66cb051 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Thu, 4 Apr 2024 08:11:43 +0200 Subject: [PATCH 17/20] CI RFsim-4G: wait for attach, instead of sleep For various reasons, the UE might take longer to connect to the eNB. A simple sleep might not be enough; instead, use Attach() to actively wait that the UE gets an IP address. The added bonus of this function is that it will also stop&restart a UE if it did not attach, i.e., it will try multiple times to attach the UE. --- ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml | 8 +++++++- ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml | 8 +++++++- ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml | 8 +++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml index 9f88fb71ef..36b67a70b4 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml @@ -34,7 +34,7 @@ 000013 000001 000014 - 000002 + 000015 020011 020012 030011 @@ -94,6 +94,12 @@ 9 + + Attach_UE + Attach OAI UE (Wait for IP) + rfsim4g_ue + + Ping Ping Traffic-Gen from LTE-UE diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml index d058f9f150..f37812ecb2 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml @@ -34,7 +34,7 @@ 000013 000001 000014 - 000002 + 000015 020011 020012 030011 @@ -94,6 +94,12 @@ 9 + + Attach_UE + Attach OAI UE (Wait for IP) + rfsim4g_ue + + Ping Ping Traffic-Gen from LTE-UE diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml index 280814a888..db157a5138 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml @@ -34,7 +34,7 @@ 000013 000001 000014 - 000002 + 000015 020011 020012 030011 @@ -94,6 +94,12 @@ 9 + + Attach_UE + Attach OAI UE (Wait for IP) + rfsim4g_ue + + Ping Ping Traffic-Gen from LTE-UE From a652a032b0a7589ea5a4091a03b5805c88dbdc0a Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Thu, 4 Apr 2024 08:13:02 +0200 Subject: [PATCH 18/20] CI RFsim-4G noS1: use longer sleep Unlike the previous commit, in noS1, we cannot use Attach(), as noS1 automatically brings up an interface, no matter whether the connection succeeded or not. Therefore, consistently wait a bit longer to increase the chance that the radio is really up. --- ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml | 4 ++-- ci-scripts/xml_files/container_4g_rfsim_fembms.xml | 2 +- ci-scripts/xml_files/container_4g_rfsim_mbms.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml index 9b6fdabbce..655cbf0d82 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml @@ -28,9 +28,9 @@ 111111 100011 000013 - 000001 - 000014 000002 + 000014 + 000001 020011 020012 030011 diff --git a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml b/ci-scripts/xml_files/container_4g_rfsim_fembms.xml index 1a508b772a..941b59a040 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fembms.xml @@ -30,7 +30,7 @@ 000013 000002 000014 - 000002 + 000001 030011 100011 diff --git a/ci-scripts/xml_files/container_4g_rfsim_mbms.xml b/ci-scripts/xml_files/container_4g_rfsim_mbms.xml index 56ab42c323..3dc26454a1 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_mbms.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_mbms.xml @@ -30,7 +30,7 @@ 000013 000002 000014 - 000002 + 000001 030011 100011 From 0c15ee9706716f5c0a018012159949c90e5e7724 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Thu, 4 Apr 2024 11:58:13 +0200 Subject: [PATCH 19/20] commands for attach/detach --- ci-scripts/ci_infra.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci-scripts/ci_infra.yaml b/ci-scripts/ci_infra.yaml index 8142e960dd..ca90b8f3ea 100644 --- a/ci-scripts/ci_infra.yaml +++ b/ci-scripts/ci_infra.yaml @@ -327,6 +327,9 @@ rfsim4g_ue: NetworkScript: docker exec rfsim4g-oai-lte-ue0 ip a show dev oaitun_ue1 CmdPrefix: docker exec rfsim4g-oai-lte-ue0 IF: oaitun_ue1 + AttachScript: docker start rfsim4g-oai-lte-ue0 + DetachScript: docker stop rfsim4g-oai-lte-ue0 + MTU: 1500 rfsim4g_ext_dn: Host: localhost From a953cd0d8bbeaada596808a64ddb77f7789d007b Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 12 Apr 2024 15:34:15 +0200 Subject: [PATCH 20/20] Demote periodic PHY log: floods the screen, is unhelpful --- openair1/SCHED/phy_procedures_lte_eNb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c index cdd1837bb4..e109ae8146 100644 --- a/openair1/SCHED/phy_procedures_lte_eNb.c +++ b/openair1/SCHED/phy_procedures_lte_eNb.c @@ -155,7 +155,7 @@ void common_signal_procedures_fembms (PHY_VARS_eNB *eNB,int frame, int subframe) if((frame&3)!=0 /*&& subframe != 0*/) return; - LOG_I(PHY,"common_signal_procedures: frame %d, subframe %d fdd:%s dir:%s index:%d\n",frame,subframe,fp->frame_type == FDD?"FDD":"TDD", subframe_select(fp,subframe) == SF_DL?"DL":"UL?",(frame&15)/4); + LOG_D(PHY,"common_signal_procedures: frame %d, subframe %d fdd:%s dir:%s index:%d\n",frame,subframe,fp->frame_type == FDD?"FDD":"TDD", subframe_select(fp,subframe) == SF_DL?"DL":"UL?",(frame&15)/4); // generate Cell-Specific Reference Signals for both slots //VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_RS_TX,1);