update configuration files for local testbed

README.txt

@@ -43,7 +43,7 @@ cd /oai-cn5g-smf/build/scripts
 
 ## Create configuration file for SMF
 cd /oai-cn5g-smf/build/scripts
-./smf_conf_local.sh
+./smf_conf.sh
 
 ## launch SMF
 sudo smf -c /usr/local/etc/oai/smf.conf -o 
@@ -54,7 +54,7 @@ cd /openair-cn-cups/build/scripts
 ./build_spgwu -I -f
 ./build_spgwu -c -V -b Debug -j
 
-cd /oai-cn5g-smf/src/test/upf
+cp /oai-cn5g-smf/src/test/upf/spgwu_conf.sh . 
 ./spgwu_conf.sh
 sudo spgwu -c /usr/local/etc/oai/spgw_u.conf  -o
 

build/scripts/smf_conf.sh

 # prompt has been removed for easier Ctrl+C Ctrl+V
-sudo ifconfig eno1:n4 172.55.55.101 up # SMF N4 interface
-sudo ifconfig eno1:an11 172.16.1.102 up # AMF N11 interface
-sudo ifconfig eno1:sn11 172.16.1.101 up # SMF N11 interface
-#for N10
-sudo ifconfig eno1:un10 172.58.58.102 up  # UDM N10 interface 
-sudo ifconfig eno1:sn10 172.58.58.101 up  # SMF N10 interface 
+sudo ifconfig eno1:smf  172.16.1.101 up # SMF 
+sudo ifconfig eno1:amf  172.16.1.102 up # AMF 
+sudo ifconfig eno1:udm  172.16.1.103 up # UDM
+sudo ifconfig eno1:upf  172.16.1.104 up # UPF
 
-
-
-sudo ifconfig eno1:sxc 10.10.10.1 up  # SMF N10 interface
 INSTANCE=1
 PREFIX='/usr/local/etc/oai'
 sudo mkdir -m 0777 -p $PREFIX
@@ -19,22 +14,20 @@ declare -A SMF_CONF
 SMF_CONF[@INSTANCE@]=$INSTANCE
 SMF_CONF[@PREFIX@]=$PREFIX
 SMF_CONF[@PID_DIRECTORY@]='/var/run'
-SMF_CONF[@SMF_INTERFACE_NAME_FOR_N4@]='eno1:n4'
-SMF_CONF[@SMF_INTERFACE_NAME_FOR_N11@]='eno1:sn11'
+SMF_CONF[@SMF_INTERFACE_NAME_FOR_N4@]='eno1:smf'
+SMF_CONF[@SMF_INTERFACE_NAME_FOR_N11@]='eno1:smf'
 SMF_CONF[@SMF_INTERFACE_IPV4_ADDRESS_FOR_N11@]='172.16.1.101'
 
-SMF_CONF[@SMF_INTERFACE_PORT_FOR_N11@]='8080'
-
+SMF_CONF[@SMF_INTERFACE_PORT_FOR_N11@]='80'
 
-SMF_CONF[@SMF_UDM_IPV4_ADDRESS@]='172.58.58.102'
-SMF_CONF[@SMF_UDM_PORT@]='8181'
+SMF_CONF[@UDM_IPV4_ADDRESS@]='172.16.1.103'
+SMF_CONF[@UDM_PORT@]='8383'
 
-SMF_CONF[@SMF_AMF_IPV4_ADDRESS@]='172.16.1.102'
-SMF_CONF[@SMF_AMF_PORT@]='8282'
+SMF_CONF[@AMF_IPV4_ADDRESS@]='172.16.1.102'
+SMF_CONF[@AMF_PORT@]='8282'
 
+SMF_CONF[@UPF_IPV4_ADDRESS@]='172.16.1.104'
 
-SMF_CONF[@SGW_INTERFACE_NAME_FOR_S11@]='eno1:s11'
-SMF_CONF[@PGW_INTERFACE_NAME_FOR_SX@]='eno1:sxc'
 SMF_CONF[@DEFAULT_DNS_IPV4_ADDRESS@]='8.8.8.8'
 SMF_CONF[@DEFAULT_DNS_SEC_IPV4_ADDRESS@]='4.4.4.4'
 

etc/smf.conf

@@ -95,7 +95,7 @@ SMF =
 
     APN_LIST = (
        # IPV4_POOL, IPV6_POOL are index in IPV4_LIST, IPV6_LIST, PDN_TYPE choice in {IPv4, IPv6, IPv4v6}
-      {APN_NI = "default"; PDN_TYPE = "IPv4"; IPV4_POOL  = 0; IPV6_POOL = -1},
+      {APN_NI = "carrier.com"; PDN_TYPE = "IPv4"; IPV4_POOL  = 0; IPV6_POOL = -1},
       {APN_NI = "apn1"; PDN_TYPE = "IPv4"; IPV4_POOL = 1; IPV6_POOL = -1},
       {APN_NI = "apn2"; PDN_TYPE = "IPv4"; IPV4_POOL = 2; IPV6_POOL = -1},
       {APN_NI = "apn3"; PDN_TYPE = "IPv4"; IPV4_POOL = 3; IPV6_POOL = -1},
@@ -129,7 +129,7 @@ SMF =
     };
     
     UPF_LIST = (
-         {IPV4_ADDRESS="172.55.55.102" ;}
+         {IPV4_ADDRESS="@UPF_IPV4_ADDRESS@" ;}
     );
 };
 

src/test/udm/udm-api-server.cpp

@@ -82,7 +82,7 @@ int main() {
     std::vector<int> sigs{SIGQUIT, SIGINT, SIGTERM, SIGHUP};
     setUpUnixSignals(sigs);
 #endif
-    Pistache::Address addr("192.168.200.1", Pistache::Port(8181));
+    Pistache::Address addr("172.16.1.103", Pistache::Port(8383));
 
     httpEndpoint = new Pistache::Http::Endpoint((addr));
     auto router = std::make_shared<Pistache::Rest::Router>();

src/test/upf/spgwu_conf.sh

 # prompt has been removed for easier Ctrl+C Ctrl+V
-#sudo ifconfig eno1:sxu 172.55.55.102 up   # SPGW-U SXab interface
 sudo ifconfig eno1:s1u 192.168.248.159 up # SPGW-U S1U interface
 INSTANCE=1
 PREFIX='/usr/local/etc/oai'
@@ -12,7 +11,7 @@ SPGWU_CONF[@INSTANCE@]=$INSTANCE
 SPGWU_CONF[@PREFIX@]=$PREFIX
 SPGWU_CONF[@PID_DIRECTORY@]='/var/run'
 SPGWU_CONF[@SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP@]='eno1:s1u'
-SPGWU_CONF[@SGW_INTERFACE_NAME_FOR_SX@]='eno1:un4'
+SPGWU_CONF[@SGW_INTERFACE_NAME_FOR_SX@]='eno1:upf'
 SPGWU_CONF[@SGW_INTERFACE_NAME_FOR_SGI@]='eno1'
 
 for K in "${!SPGWU_CONF[@]}"; do