Merge branch 'develop' into 'conf_fix'

# Conflicts:
#   scripts/entrypoint.sh

build/scripts/generate_amf_conf.sh

@@ -29,44 +29,52 @@ AMF_CONF[@SERVED_GUAMI_AMF_SET_ID_1@]='1'
 AMF_CONF[@PLMN_SUPPORT_MCC@]='208'
 AMF_CONF[@PLMN_SUPPORT_MNC@]='95'
 AMF_CONF[@PLMN_SUPPORT_TAC@]='0xa000'
-AMF_CONF[@SST_0@]='222'
-AMF_CONF[@SD_0@]='123'
+AMF_CONF[@SST_0@]='128'
+AMF_CONF[@SD_0@]='128'
 AMF_CONF[@SST_1@]='1'
-AMF_CONF[@SD_1@]='12'
+AMF_CONF[@SD_1@]='1'
 
-AMF_CONF[@AMF_INTERFACE_NAME_FOR_NGAP@]='wlo1'
-AMF_CONF[@AMF_INTERFACE_NAME_FOR_N11@]='wlo1'
+AMF_CONF[@AMF_INTERFACE_NAME_FOR_NGAP@]='eth0'
+AMF_CONF[@AMF_INTERFACE_NAME_FOR_N11@]='eth0'
 
 AMF_CONF[@EXTERNAL_AUSF@]='no'
 AMF_CONF[@EXTERNAL_UDM@]='no'
+AMF_CONF[@EXTERNAL_NRF@]='no'
+AMF_CONF[@EXTERNAL_NSSF@]='no'
 AMF_CONF[@USE_FQDN_DNS@]='no'
+AMF_CONF[@USE_HTTP2@]='no'
 
 AMF_CONF[@NF_REGISTRATION@]='no'
 AMF_CONF[@SMF_SELECTION@]='no'
 
 AMF_CONF[@SMF_INSTANCE_ID_0@]='1'
-AMF_CONF[@SMF_IPV4_ADDR_0@]='192.168.122.1'
+AMF_CONF[@SMF_IPV4_ADDR_0@]='192.168.22.208'
 AMF_CONF[@SMF_HTTP_VERSION_0@]='v1'
-AMF_CONF[@SMF_FQDN_0@]='localhost'
+AMF_CONF[@SMF_FQDN_0@]='oai-smf'
 AMF_CONF[@SMF_INSTANCE_ID_1@]='2'
-AMF_CONF[@SMF_IPV4_ADDR_1@]='192.168.122.2'
+AMF_CONF[@SMF_IPV4_ADDR_1@]='192.168.22.207'
 AMF_CONF[@SMF_HTTP_VERSION_1@]='v1'
-AMF_CONF[@SMF_FQDN_1@]='localhost'
+AMF_CONF[@SMF_FQDN_1@]='oai-smf2'
 
-AMF_CONF[@NRF_IPV4_ADDRESS@]='192.168.1.23'
+AMF_CONF[@NRF_IPV4_ADDRESS@]='192.168.22.195'
 AMF_CONF[@NRF_PORT@]='80'
 AMF_CONF[@NRF_API_VERSION@]='v1'
-AMF_CONF[@NRF_FQDN@]='localhost'
+AMF_CONF[@NRF_FQDN@]='oai-nrf'
 
-AMF_CONF[@AUSF_IPV4_ADDRESS@]='192.168.1.23'
+AMF_CONF[@AUSF_IPV4_ADDRESS@]='192.168.22.199'
 AMF_CONF[@AUSF_PORT@]='80'
 AMF_CONF[@AUSF_API_VERSION@]='v1'
-AMF_CONF[@AUSF_FQDN@]='localhost'
+AMF_CONF[@AUSF_FQDN@]='oai-ausf'
 
-AMF_CONF[@NSSF_IPV4_ADDRESS@]='192.168.1.23'
+AMF_CONF[@NSSF_IPV4_ADDRESS@]='192.168.22.214'
 AMF_CONF[@NSSF_PORT@]='80'
 AMF_CONF[@NSSF_API_VERSION@]='v1'
-AMF_CONF[@NSSF_FQDN@]='localhost'
+AMF_CONF[@NSSF_FQDN@]='oai-nssf'
+
+AMF_CONF[@UDM_IPV4_ADDRESS@]='192.168.22.209'
+AMF_CONF[@UDM_PORT@]='80'
+AMF_CONF[@UDM_API_VERSION@]='v1'
+AMF_CONF[@UDM_FQDN@]='oai-udm'
 
 AMF_CONF[@NRF_SELECTION@]='no'
 AMF_CONF[@INT_ALGO_LIST@]='[ "NIA0" , "NIA1" , "NIA2" ]'
@@ -76,7 +84,6 @@ AMF_CONF[@MYSQL_SERVER@]='127.0.0.1'
 AMF_CONF[@MYSQL_USER@]='root'
 AMF_CONF[@MYSQL_PASS@]='linux'
 AMF_CONF[@MYSQL_DB@]='oai_db'
-AMF_CONF[@OPERATOR_KEY@]='63bfa50ee6523365ff14c1f45f88737d'
 
 for K in "${!AMF_CONF[@]}"; do 
   egrep -lRZ "$K" $PREFIX | xargs -0 -l sed -i -e "s|$K|${AMF_CONF[$K]}|g"

ci-scripts/dsTesterDockerCompose/docker-compose.tplt

@@ -73,7 +73,6 @@ services:
             - MYSQL_USER=root
             - MYSQL_PASS=linux
             - MYSQL_DB=oai_db
-            - OPERATOR_KEY=63bfa50ee6523365ff14c1f45f88737d
             - NRF_IPV4_ADDRESS=0.0.0.0
             - NRF_PORT=80
             - NF_REGISTRATION=no

etc/amf.conf

@@ -136,9 +136,6 @@ AMF =
     MYSQL_user   = "@MYSQL_USER@";   # Database server login
     MYSQL_pass   = "@MYSQL_PASS@";   # Database server password
     MYSQL_db     = "@MYSQL_DB@";     # Your database name
-    
-    ## OP
-    OPERATOR_key = "@OPERATOR_KEY@"; # OP key matching your database
     RANDOM = "true";
   };
   
@@ -147,10 +144,8 @@ AMF =
     ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = @INT_ALGO_LIST@;  #Default [ "NIA0" , "NIA1" , "NIA2" ];
     ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = @CIPH_ALGO_LIST@; #Default [ "NEA0" , "NEA1" , "NEA2" ];
   };
-  
 };
 
-
 MODULES =
 {
   NGAP_MESSAGE = (

scripts/entrypoint.sh

@@ -24,11 +24,12 @@ INT_ALGO_LIST=${INT_ALGO_LIST:-'[ "NIA0" , "NIA1" , "NIA2" ]'}
 CIPH_ALGO_LIST=${CIPH_ALGO_LIST:-'[ "NEA0" , "NEA1" , "NEA2" ]'}
 USE_HTTP2=${USE_HTTP2:-no}
 SST_0=${SST_0:-128}
-SD_0=${SD_0:-2}
+SD_0=${SD_0:-128}
 SST_1=${SST_1:-1}
 SD_1=${SD_1:-0xFFFFFF}
-SST_2=${SST_2:-129}
-SD_2=${SD_2:-4}
+SST_2=${SST_2:-130}
+SD_2=${SD_2:-130}
+OPERATOR_KEY=${OPERATOR_KEY:-'63bfa50ee6523365ff14c1f45f88737d'}
 
 if [[ ${USE_FQDN_DNS} == "yes" ]];then
     NSSF_IPV4_ADDR=${NSSF_IPV4_ADDR_0:-0.0.0.0}

src/amf-app/amf_config.hpp

@@ -95,7 +95,6 @@
 #define AMF_CONFIG_STRING_AUTH_MYSQL_USER "MYSQL_user"
 #define AMF_CONFIG_STRING_AUTH_MYSQL_PASS "MYSQL_pass"
 #define AMF_CONFIG_STRING_AUTH_MYSQL_DB "MYSQL_db"
-#define AMF_CONFIG_STRING_AUTH_OPERATOR_KEY "OPERATOR_key"
 #define AMF_CONFIG_STRING_AUTH_RANDOM "RANDOM"
 #define AMF_CONFIG_STRING_NAS "NAS"
 #define AMF_CONFIG_STRING_NAS_SUPPORTED_INTEGRITY_ALGORITHM_LIST               \

src/ngap/CODEOWNERS

-
 #NGAP Library  - CODEOWNERS  
 Keliang DU, BUPT
 Niuxiansheng Niu, BUPT