Merge branch 'conf_fix' into 'develop'

Fix for snssai default parameters in config

See merge request oai/cn5g/oai-cn5g-amf!124

etc/amf.conf

@@ -28,7 +28,7 @@ AMF =
   
   RELATIVE_CAPACITY = 30;
   # Display statistics about whole system (in seconds)
-  STATISTICS_TIMER_INTERVAL = 20;  # YOUR CONFIG HERE
+  STATISTICS_TIMER_INTERVAL = 20;  
   
   CORE_CONFIGURATION:
   {
@@ -37,7 +37,7 @@ AMF =
   
   GUAMI: 
   {
-    MCC = "@MCC@"; MNC = "@MNC@"; RegionID = "@REGION_ID@"; AMFSetID = "@AMF_SET_ID@"; AMFPointer = "1" # YOUR GUAMI CONFIG HERE
+    MCC = "@MCC@"; MNC = "@MNC@"; RegionID = "@REGION_ID@"; AMFSetID = "@AMF_SET_ID@"; AMFPointer = "1" 
   }
   
   SERVED_GUAMI_LIST = (
@@ -47,11 +47,11 @@ AMF =
     
   PLMN_SUPPORT_LIST = (
   {
-    MCC = "@PLMN_SUPPORT_MCC@"; MNC = "@PLMN_SUPPORT_MNC@"; TAC = @PLMN_SUPPORT_TAC@;  # YOUR PLMN CONFIG HERE
+    MCC = "@PLMN_SUPPORT_MCC@"; MNC = "@PLMN_SUPPORT_MNC@"; TAC = @PLMN_SUPPORT_TAC@;  
     SLICE_SUPPORT_LIST = (
-      {SST = "@SST_0@"; SD = "@SD_0@"},  # YOUR NSSAI CONFIG HERE
-      {SST = "@SST_1@"; SD = "@SD_1@"},  # YOUR NSSAI CONFIG HERE
-      {SST = "4"; SD = "4"}              # YOUR NSSAI CONFIG HERE
+      {SST = "@SST_0@"; SD = "@SD_0@"},  
+      {SST = "@SST_1@"; SD = "@SD_1@"}, 
+      {SST = "@SST_2@"; SD = "@SD_2@"}   
      )
   }
   );
@@ -61,57 +61,57 @@ AMF =
     # AMF binded interface for N1/N2 interface (NGAP) 
     NGAP_AMF: 
     {
-      INTERFACE_NAME = "@AMF_INTERFACE_NAME_FOR_NGAP@";  # YOUR NETWORK CONFIG HERE
+      INTERFACE_NAME = "@AMF_INTERFACE_NAME_FOR_NGAP@";  
       IPV4_ADDRESS   = "read";
-      PORT           = 38412;                            # YOUR NETWORK CONFIG HERE
-      PPID           = 60;                               # YOUR NETWORK CONFIG HERE
+      PORT           = 38412;                            
+      PPID           = 60;                               
     };  
    
     # AMF binded interface for SBI (N11 (SMF)/N12 (AUSF), etc.)
     N11:
     {
-      INTERFACE_NAME = "@AMF_INTERFACE_NAME_FOR_N11@"; # YOUR NETWORK CONFIG HERE
+      INTERFACE_NAME = "@AMF_INTERFACE_NAME_FOR_N11@"; 
       IPV4_ADDRESS   = "read"; 
-      PORT           = 80;                             # YOUR NETWORK CONFIG HERE
-      API_VERSION    = "v1";                           # YOUR AMF API VERSION CONFIG HERE
-      HTTP2_PORT     = 8080;                           # YOUR NETWORK CONFIG HERE      
+      PORT           = 80;                             
+      API_VERSION    = "v1";                           
+      HTTP2_PORT     = 8080;                                
       
       SMF_INSTANCES_POOL = (
-        {SMF_INSTANCE_ID = @SMF_INSTANCE_ID_0@; IPV4_ADDRESS = "@SMF_IPV4_ADDR_0@"; PORT = "80"; HTTP2_PORT = 8080, VERSION = "@SMF_HTTP_VERSION_0@"; FQDN = "@SMF_FQDN_0@", SELECTED = "true"}, # YOUR SMF CONFIG HERE
-        {SMF_INSTANCE_ID = @SMF_INSTANCE_ID_1@; IPV4_ADDRESS = "@SMF_IPV4_ADDR_1@"; PORT = "80"; HTTP2_PORT = 8080, VERSION = "@SMF_HTTP_VERSION_1@"; FQDN = "@SMF_FQDN_1@", SELECTED = "false"} # YOUR SMF CONFIG HERE
+        {SMF_INSTANCE_ID = @SMF_INSTANCE_ID_0@; IPV4_ADDRESS = "@SMF_IPV4_ADDR_0@"; PORT = "80"; HTTP2_PORT = 8080, VERSION = "@SMF_HTTP_VERSION_0@"; FQDN = "@SMF_FQDN_0@", SELECTED = "true"},
+        {SMF_INSTANCE_ID = @SMF_INSTANCE_ID_1@; IPV4_ADDRESS = "@SMF_IPV4_ADDR_1@"; PORT = "80"; HTTP2_PORT = 8080, VERSION = "@SMF_HTTP_VERSION_1@"; FQDN = "@SMF_FQDN_1@", SELECTED = "false"} 
       );
     };
      
-    NRF :
+    NRF : 
     {
-      IPV4_ADDRESS = "@NRF_IPV4_ADDRESS@";  # YOUR NRF CONFIG HERE
-      PORT         = @NRF_PORT@;            # YOUR NRF CONFIG HERE (default: 80)
-      API_VERSION  = "@NRF_API_VERSION@";   # YOUR NRF API VERSION FOR SBI CONFIG HERE
-      FQDN         = "@NRF_FQDN@"           # YOUR NRF FQDN CONFIG HERE
+      IPV4_ADDRESS = "@NRF_IPV4_ADDRESS@";  
+      PORT         = @NRF_PORT@;            # Default: 80
+      API_VERSION  = "@NRF_API_VERSION@";   
+      FQDN         = "@NRF_FQDN@"           
     };
     
     AUSF :
     {
-      IPV4_ADDRESS = "@AUSF_IPV4_ADDRESS@";  # YOUR AUSF CONFIG HERE
-      PORT         = @AUSF_PORT@;            # YOUR AUSF CONFIG HERE (default: 80)
-      API_VERSION  = "@AUSF_API_VERSION@";   # YOUR AUSF API VERSION FOR SBI CONFIG HERE
-      FQDN         = "@AUSF_FQDN@"           # YOUR AUSF FQDN CONFIG HERE
+      IPV4_ADDRESS = "@AUSF_IPV4_ADDRESS@";  
+      PORT         = @AUSF_PORT@;            # Default: 80
+      API_VERSION  = "@AUSF_API_VERSION@";   
+      FQDN         = "@AUSF_FQDN@"           
     };
 
     UDM :
     {
-      IPV4_ADDRESS = "@UDM_IPV4_ADDRESS@";   # YOUR UDM CONFIG HERE
-      PORT         = @UDM_PORT@;             # YOUR UDM CONFIG HERE (default: 80)
-      API_VERSION  = "v2";                   # YOUR UDM API VERSION FOR SBI CONFIG HERE
-      FQDN         = "@UDM_FQDN@";           # YOUR UDM FQDN CONFIG HERE
+      IPV4_ADDRESS = "@UDM_IPV4_ADDRESS@";   
+      PORT         = @UDM_PORT@;             # Default: 80
+      API_VERSION  = "v2";                   
+      FQDN         = "@UDM_FQDN@";           
     };
 
     NSSF :
     {
-      IPV4_ADDRESS = "@NSSF_IPV4_ADDRESS@";  # YOUR NSSF CONFIG HERE
-      PORT         = @NSSF_PORT@;            # YOUR NSSF CONFIG HERE (default: 80)
-      API_VERSION  = "@NSSF_API_VERSION@";   # YOUR NSSF API VERSION FOR SBI CONFIG HERE
-      FQDN         = "@NSSF_FQDN@"           # YOUR NSSF FQDN CONFIG HERE
+      IPV4_ADDRESS = "@NSSF_IPV4_ADDRESS@";  
+      PORT         = @NSSF_PORT@;            # Default: 80
+      API_VERSION  = "@NSSF_API_VERSION@";   
+      FQDN         = "@NSSF_FQDN@"           
     };
   };  
 

scripts/entrypoint.sh

@@ -23,6 +23,12 @@ NSSF_FQDN=${NSSF_FQDN:-oai-nssf}
 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:-128}
+SST_1=${SST_1:-1}
+SD_1=${SD_1:-0xFFFFFF}
+SST_2=${SST_2:-130}
+SD_2=${SD_2:-130}
 OPERATOR_KEY=${OPERATOR_KEY:-'63bfa50ee6523365ff14c1f45f88737d'}
 
 if [[ ${USE_FQDN_DNS} == "yes" ]];then