Merge branch 'conf_fix' into 'develop'

Default var added for ext NRF and NSSF

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

etc/amf.conf

@@ -100,10 +100,10 @@ AMF =
 
     UDM :
     {
-      IPV4_ADDRESS = "127.0.0.1";    # YOUR UDM CONFIG HERE
-      PORT         = 80;              # YOUR UDM CONFIG HERE (default: 80)
+      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
+      FQDN         = "@UDM_FQDN@";           # YOUR UDM FQDN CONFIG HERE
     };
 
     NSSF :
@@ -120,11 +120,11 @@ AMF =
      # STRING, {"yes", "no"}, 
      NF_REGISTRATION = "@NF_REGISTRATION@";  # Set to yes if AMF resgisters to an NRF
      NRF_SELECTION   = "@NRF_SELECTION@";    # Set to yes to enable NRF discovery and selection
-     EXTERNAL_NRF    = "no";                 # Set to yes if AMF works with an external NRF
+     EXTERNAL_NRF    = "@EXTERNAL_NRF@";     # Set to yes if AMF works with an external NRF
      SMF_SELECTION   = "@SMF_SELECTION@";    # Set to yes to enable SMF discovery and selection
      EXTERNAL_AUSF   = "@EXTERNAL_AUSF@";    # Set to yes if AMF works with an external AUSF
      EXTERNAL_UDM    = "@EXTERNAL_UDM@";     # Set to yes if AMF works with an external UDM
-     EXTERNAL_NSSF   = "no";                 # Set to yes if AMF works with an external NSSF
+     EXTERNAL_NSSF   = "@EXTERNAL_NSSF@";    # Set to yes if AMF works with an external NSSF
      USE_FQDN_DNS    = "@USE_FQDN_DNS@";     # Set to yes if AMF relies on a DNS to resolve NRF/SMF/UDM/AUSF's FQDN
      USE_HTTP2       = "@USE_HTTP2@";        # Set to yes to enable HTTP2 for AMF server
 }

scripts/entrypoint.sh

@@ -5,6 +5,8 @@ set -euo pipefail
 CONFIG_DIR="/openair-amf/etc"
 
 # Default values
+EXTERNAL_NRF=${EXTERNAL_NRF:-no}
+EXTERNAL_NSSF=${EXTERNAL_NSSF:-no}
 EXTERNAL_AUSF=${EXTERNAL_AUSF:-no}
 EXTERNAL_UDM=${EXTERNAL_UDM:-no}
 UDM_IPV4_ADDRESS=${UDM_IPV4_ADDRESS:-0.0.0.0}

src/utils/fqdn.cpp

@@ -28,6 +28,7 @@ bool fqdn::resolve(
     const std::string& host_name, std::string& address, uint32_t& port,
     uint8_t& addr_type, const std::string& protocol) {
   try {
+    Logger::amf_app().debug("Resolving DNS:- %s", host_name.c_str());
     boost::asio::io_context io_context = {};
 
     boost::asio::ip::tcp::resolver resolver{io_context};