Skip to content

O
OpenXG-RAN
Commit 235567bb authored by Robert Schmidt's avatar Robert Schmidt
Browse files
Options

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.
parent 915c106e
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 368 deletions
ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
View file @ 235567bb
...@@ -39,12 +39,7 @@ gNBs = ...@@ -39,12 +39,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.71.132"; amf_ip_address = ({ ipv4 = "192.168.71.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
ci-scripts/conf_files/gnb-cu.sa.f1.conf
View file @ 235567bb
...@@ -39,12 +39,7 @@ gNBs = ...@@ -39,12 +39,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "172.21.16.137"; amf_ip_address = ({ ipv4 = "172.21.16.137"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
ci-scripts/conf_files/gnb-cucp.sa.f1.conf
View file @ 235567bb
...@@ -40,12 +40,7 @@ gNBs = ...@@ -40,12 +40,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "oai-amf"; amf_ip_address = ({ ipv4 = "oai-amf"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
E1_INTERFACE = E1_INTERFACE =
( (
......
ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf
View file @ 235567bb
...@@ -40,12 +40,7 @@ gNBs = ...@@ -40,12 +40,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "172.21.16.137"; amf_ip_address = ({ ipv4 = "172.21.16.137"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
E1_INTERFACE = E1_INTERFACE =
( (
......
ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
View file @ 235567bb
...@@ -190,12 +190,7 @@ gNBs = ...@@ -190,12 +190,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.71.132"; amf_ip_address = ({ ipv4 = "192.168.71.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf
View file @ 235567bb
...@@ -163,12 +163,7 @@ gNBs = ...@@ -163,12 +163,7 @@ gNBs =
////////// MME parameters: ////////// MME parameters:
amf_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
///X2 ///X2
enable_x2 = "yes"; enable_x2 = "yes";
......
ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf
View file @ 235567bb
...@@ -162,12 +162,7 @@ gNBs = ...@@ -162,12 +162,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.71.132"; amf_ip_address = ({ ipv4 = "192.168.71.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
View file @ 235567bb
...@@ -160,12 +160,7 @@ gNBs = ...@@ -160,12 +160,7 @@ gNBs =
////////// MME parameters: ////////// MME parameters:
amf_ip_address = ( { ipv4 = "192.168.71.132"; amf_ip_address = ({ ipv4 = "192.168.71.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
View file @ 235567bb
...@@ -161,12 +161,7 @@ gNBs = ...@@ -161,12 +161,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.71.132"; amf_ip_address = ({ ipv4 = "192.168.71.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
ci-scripts/conf_files/gnb.sa.band78.106prb.l2sim.conf
View file @ 235567bb
...@@ -158,12 +158,7 @@ gNBs = ...@@ -158,12 +158,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.71.132"; amf_ip_address = ({ ipv4 = "192.168.71.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
View file @ 235567bb
...@@ -170,12 +170,7 @@ gNBs = ...@@ -170,12 +170,7 @@ gNBs =
}; };
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "172.21.6.100"; amf_ip_address = ({ ipv4 = "172.21.6.100"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
View file @ 235567bb
...@@ -161,12 +161,7 @@ gNBs = ...@@ -161,12 +161,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.71.132"; amf_ip_address = ({ ipv4 = "192.168.71.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf
View file @ 235567bb
...@@ -164,12 +164,7 @@ gNBs = ...@@ -164,12 +164,7 @@ gNBs =
}; };
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.71.132"; amf_ip_address = ({ ipv4 = "192.168.71.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf
View file @ 235567bb
...@@ -163,12 +163,7 @@ gNBs = ...@@ -163,12 +163,7 @@ gNBs =
}; };
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf
View file @ 235567bb
...@@ -156,12 +156,7 @@ gNBs = ...@@ -156,12 +156,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "172.21.16.137"; amf_ip_address = ({ ipv4 = "172.21.16.137"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf
View file @ 235567bb
...@@ -176,12 +176,7 @@ gNBs = ...@@ -176,12 +176,7 @@ gNBs =
}; };
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf
View file @ 235567bb
...@@ -177,12 +177,7 @@ gNBs = ...@@ -177,12 +177,7 @@ gNBs =
}; };
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
View file @ 235567bb
...@@ -159,12 +159,7 @@ gNBs = ...@@ -159,12 +159,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.71.132"; amf_ip_address = ({ ipv4 = "192.168.71.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
View file @ 235567bb
...@@ -166,12 +166,7 @@ gNBs = ...@@ -166,12 +166,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "172.21.6.100"; amf_ip_address = ({ ipv4 = "172.21.6.100"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
View file @ 235567bb
...@@ -156,12 +156,7 @@ gNBs = ...@@ -156,12 +156,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "172.21.16.137"; amf_ip_address = ({ ipv4 = "172.21.16.137"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf
View file @ 235567bb
...@@ -161,12 +161,7 @@ gNBs = ...@@ -161,12 +161,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.70.132"; amf_ip_address = ({ ipv4 = "192.168.70.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf
View file @ 235567bb
...@@ -176,12 +176,7 @@ gNBs = ...@@ -176,12 +176,7 @@ gNBs =
}; };
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.69.131"; amf_ip_address = ({ ipv4 = "192.168.69.131"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf
View file @ 235567bb
...@@ -173,12 +173,7 @@ gNBs = ...@@ -173,12 +173,7 @@ gNBs =
}; };
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.69.131"; amf_ip_address = ({ ipv4 = "192.168.69.131"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf
View file @ 235567bb
...@@ -181,12 +181,7 @@ gNBs = ...@@ -181,12 +181,7 @@ gNBs =
}; };
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
View file @ 235567bb
...@@ -160,12 +160,7 @@ gNBs = ...@@ -160,12 +160,7 @@ gNBs =
////////// MME parameters: ////////// MME parameters:
amf_ip_address = ( { ipv4 = "192.168.70.132"; amf_ip_address = ({ ipv4 = "192.168.70.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
View file @ 235567bb
...@@ -158,12 +158,7 @@ gNBs = ...@@ -158,12 +158,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "172.21.16.136"; amf_ip_address = ({ ipv4 = "172.21.16.136"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
ci-scripts/conf_files/untested/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
View file @ 235567bb
...@@ -158,12 +158,7 @@ gNBs = ...@@ -158,12 +158,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.61.195"; amf_ip_address = ({ ipv4 = "192.168.61.195"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
openair2/GNB_APP/gnb_config.c
View file @ 235567bb
...@@ -1802,27 +1802,15 @@ int RCconfig_NR_NG(MessageDef *msg_p, uint32_t i) { ...@@ -1802,27 +1802,15 @@ int RCconfig_NR_NG(MessageDef *msg_p, uint32_t i) {
for (int l = 0; l < NGParamList.numelt; l++) { for (int l = 0; l < NGParamList.numelt; l++) {
NGAP_REGISTER_GNB_REQ (msg_p).nb_amf += 1; 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].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)); NGAP_REGISTER_GNB_REQ (msg_p).amf_ip_address[j].ipv4 = 1;
NGAP_REGISTER_GNB_REQ (msg_p).amf_ip_address[j].ipv6 = 0;
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;
}
/* not in configuration yet ... /* not in configuration yet ...
if (NGParamList.paramarray[l][GNB_AMF_BROADCAST_PLMN_INDEX].iptr) 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; NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_num[l] = NGParamList.paramarray[l][GNB_AMF_BROADCAST_PLMN_INDEX].numelt;
else else
NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_num[l] = 0; 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, 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 " "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) { ...@@ -1831,7 +1819,7 @@ int RCconfig_NR_NG(MessageDef *msg_p, uint32_t i) {
NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_num[l]); 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) { 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]; 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 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, && 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) { ...@@ -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).broadcast_plmn_index[l][el],
NGAP_REGISTER_GNB_REQ(msg_p).num_plmn); NGAP_REGISTER_GNB_REQ(msg_p).num_plmn);
} }
*/
/* if no broadcasst_plmn array is defined, fill default values */ /* if no broadcasst_plmn array is defined, fill default values */
if (NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_num[l] == 0) { if (NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_num[l] == 0) {
......
openair2/GNB_APP/gnb_paramdef.h
View file @ 235567bb
...@@ -286,28 +286,17 @@ typedef enum { ...@@ -286,28 +286,17 @@ typedef enum {
#define GNB_CONFIG_STRING_AMF_IPV4_ADDRESS "ipv4" #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 */ /* MME configuration parameters */
/* optname helpstr paramflags XXXptr defXXXval type numelt */ /* optname helpstr paramflags XXXptr defXXXval type numelt */
/*-------------------------------------------------------------------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------------------------------------------------------------------*/
#define GNBNGPARAMS_DESC { \ #define GNBNGPARAMS_DESC { \
{GNB_CONFIG_STRING_AMF_IPV4_ADDRESS, NULL, 0, .uptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ {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}, \
} }
#define GNB_AMF_IPV4_ADDRESS_IDX 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 */ /* SCTP configuration parameters section name */
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf
View file @ 235567bb
...@@ -161,12 +161,7 @@ gNBs = ...@@ -161,12 +161,7 @@ gNBs =
////////// MME parameters: ////////// MME parameters:
amf_ip_address = ( { ipv4 = "192.168.69.131"; amf_ip_address = ({ ipv4 = "192.168.69.131"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
///X2 ///X2
enable_x2 = "yes"; enable_x2 = "yes";
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf
View file @ 235567bb
...@@ -164,12 +164,7 @@ gNBs = ...@@ -164,12 +164,7 @@ gNBs =
////////// MME parameters: ////////// MME parameters:
amf_ip_address = ( { ipv4 = "192.168.18.99"; amf_ip_address = ({ ipv4 = "192.168.18.99"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
///X2 ///X2
enable_x2 = "yes"; enable_x2 = "yes";
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
View file @ 235567bb
...@@ -38,12 +38,7 @@ gNBs = ...@@ -38,12 +38,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.69.131"; amf_ip_address = ({ ipv4 = "192.168.69.131"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gNB_SA_40_2x2.conf
View file @ 235567bb
...@@ -208,12 +208,7 @@ gNBs = ...@@ -208,12 +208,7 @@ gNBs =
}; };
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.69.131"; amf_ip_address = ({ ipv4 = "192.168.69.131"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.aerial.conf
View file @ 235567bb
...@@ -190,12 +190,7 @@ gNBs = ...@@ -190,12 +190,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.70.132"; amf_ip_address = ({ ipv4 = "192.168.70.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
View file @ 235567bb
...@@ -192,12 +192,7 @@ gNBs = ...@@ -192,12 +192,7 @@ gNBs =
}; };
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.70.132"; amf_ip_address = ({ ipv4 = "192.168.70.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
View file @ 235567bb
...@@ -196,12 +196,7 @@ gNBs = ...@@ -196,12 +196,7 @@ gNBs =
}; };
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.70.132"; amf_ip_address = ({ ipv4 = "192.168.70.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf
View file @ 235567bb
...@@ -162,12 +162,7 @@ gNBs = ...@@ -162,12 +162,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.199.223"; amf_ip_address = ({ ipv4 = "192.168.199.223"; });
ipv6 = "192:168:199::223";
active = "yes";
preference = "ipv4";
}
);
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf
View file @ 235567bb
...@@ -157,12 +157,7 @@ gNBs = ...@@ -157,12 +157,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.70.132"; amf_ip_address = ({ ipv4 = "192.168.70.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.u3.32prb.usrpx410.conf
View file @ 235567bb
...@@ -164,12 +164,7 @@ gNBs = ...@@ -164,12 +164,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.70.132"; amf_ip_address = ({ ipv4 = "192.168.70.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
View file @ 235567bb
...@@ -158,12 +158,7 @@ gNBs = ...@@ -158,12 +158,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.70.132"; amf_ip_address = ({ ipv4 = "192.168.70.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.52PRB.usrpb210.conf
View file @ 235567bb
...@@ -164,12 +164,7 @@ gNBs = ...@@ -164,12 +164,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.70.132"; amf_ip_address = ({ ipv4 = "192.168.70.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf
View file @ 235567bb
...@@ -159,12 +159,7 @@ gNBs = ...@@ -159,12 +159,7 @@ gNBs =
////////// MME parameters: ////////// MME parameters:
amf_ip_address = ( { ipv4 = "192.168.70.132"; amf_ip_address = ({ ipv4 = "192.168.70.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpx300.conf
View file @ 235567bb
...@@ -175,12 +175,7 @@ gNBs = ...@@ -175,12 +175,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.71.132"; amf_ip_address = ({ ipv4 = "192.168.71.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf
View file @ 235567bb
...@@ -176,12 +176,7 @@ gNBs = ...@@ -176,12 +176,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.71.132"; amf_ip_address = ({ ipv4 = "192.168.71.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf
View file @ 235567bb
...@@ -176,12 +176,7 @@ gNBs = ...@@ -176,12 +176,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.71.132"; amf_ip_address = ({ ipv4 = "192.168.71.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
View file @ 235567bb
...@@ -171,12 +171,7 @@ gNBs = ...@@ -171,12 +171,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "172.21.6.5"; amf_ip_address = ({ ipv4 = "172.21.6.5"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf
View file @ 235567bb
...@@ -161,14 +161,7 @@ gNBs = ( ...@@ -161,14 +161,7 @@ gNBs = (
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( amf_ip_address = ({ ipv4 = "192.168.70.132"; });
{
ipv4 = "192.168.70.132";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.usrpx300.conf
View file @ 235567bb
...@@ -161,14 +161,7 @@ gNBs = ( ...@@ -161,14 +161,7 @@ gNBs = (
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( amf_ip_address = ({ ipv4 = "192.168.80.132"; });
{
ipv4 = "192.168.80.132";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel650.conf
View file @ 235567bb
...@@ -170,12 +170,7 @@ gNBs = ...@@ -170,12 +170,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "172.21.6.5"; amf_ip_address = ({ ipv4 = "172.21.6.5"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf
View file @ 235567bb
...@@ -170,12 +170,7 @@ gNBs = ...@@ -170,12 +170,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "172.21.6.5"; amf_ip_address = ({ ipv4 = "172.21.6.5"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
View file @ 235567bb
...@@ -160,12 +160,7 @@ gNBs = ...@@ -160,12 +160,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.70.132"; amf_ip_address = ({ ipv4 = "192.168.70.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.4layer.conf
View file @ 235567bb
...@@ -160,12 +160,7 @@ gNBs = ...@@ -160,12 +160,7 @@ gNBs =
////////// MME parameters: ////////// MME parameters:
amf_ip_address = ( { ipv4 = "192.168.70.132"; amf_ip_address = ({ ipv4 = "192.168.70.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
View file @ 235567bb
...@@ -159,12 +159,7 @@ gNBs = ...@@ -159,12 +159,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.70.132"; amf_ip_address = ({ ipv4 = "192.168.70.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf
View file @ 235567bb
...@@ -159,12 +159,7 @@ gNBs = ...@@ -159,12 +159,7 @@ gNBs =
////////// MME parameters: ////////// MME parameters:
amf_ip_address = ( { ipv4 = "192.168.5.233"; amf_ip_address = ({ ipv4 = "192.168.5.233"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
///X2 ///X2
enable_x2 = "no"; enable_x2 = "no";
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.2x2.usrpn300.conf
View file @ 235567bb
...@@ -161,12 +161,7 @@ gNBs = ...@@ -161,12 +161,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.70.132"; amf_ip_address = ({ ipv4 = "192.168.70.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf
View file @ 235567bb
...@@ -159,12 +159,7 @@ gNBs = ...@@ -159,12 +159,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.70.132"; amf_ip_address = ({ ipv4 = "192.168.70.132"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band78.fr1.106PRB.usrpx310.conf
View file @ 235567bb
...@@ -196,12 +196,7 @@ gNBs = ...@@ -196,12 +196,7 @@ gNBs =
}; };
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band78.fr1.106PRB.usrpx310.conf
View file @ 235567bb
...@@ -195,12 +195,7 @@ gNBs = ...@@ -195,12 +195,7 @@ gNBs =
}; };
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment