input plugin ip and udsf ip in config file

docker/Dockerfile

 FROM ubuntu:18.04
 ENV DEBIAN_FRONTEND=noninteractive
-RUN export http_proxy=http://10.112.222.16:8123
-RUN export https_proxy=http://10.112.222.16:8123
+RUN export http_proxy=http://10.112.93.158:8123
+RUN export https_proxy=http://10.112.93.158:8123
 RUN mkdir amf
 RUN cd amf
 COPY ./amf /amf
 RUN apt-get update -y && \
     apt-get install --no-install-recommends -y net-tools vim inetutils-ping git
 RUN apt-get install -y update-notifier-common
-RUN git config --global http.proxy http://10.112.222.16:8123
-RUN git config --global https.proxy http://10.112.222.16:8123
+RUN git config --global http.proxy http://10.112.93.158:8123
+RUN git config --global https.proxy http://10.112.93.158:8123
 RUN /bin/bash -c "if [[ -v NEEDED_GIT_PROXY ]]; then git config --global http.proxy $NEEDED_GIT_PROXY; fi"
 RUN git config --global https.postBuffer 123289600
 RUN git config --global http.sslverify false

etc/register+stateless.conf

@@ -73,7 +73,16 @@ AMF =
       IPV4_ADDRESS   = "192.168.199.10";
       PORT           = 8383;               # YOUR NETWORK CONFIG HERE
     };
-
+    NUDSF:
+    {
+      IPV4_ADDRESS   = "1.2.3.4";
+      PORT           = 8383;               # YOUR NETWORK CONFIG HERE
+    };
+    RISE:
+    {
+      IPV4_ADDRESS   = "1.2.3.4";
+      PORT           = 8383;               # YOUR NETWORK CONFIG HERE
+    };
      NRF :
     {
       IPV4_ADDRESS = "10.103.239.54"; # YOUR NRF CONFIG HERE
@@ -106,10 +115,10 @@ AMF =
   AUTHENTICATION:
   {
     ## MySQL mandatory options
-    MYSQL_server = "127.0.0.1"; # MySQL Server address
-    MYSQL_user   = "witcomm";   # Database server login
+    MYSQL_server = "172.17.0.2"; # MySQL Server address
+    MYSQL_user   = "root";   # Database server login
     MYSQL_pass   = "123456";   # Database server password
-    MYSQL_db     = "witcomm";     # Your database name
+    MYSQL_db     = "test";     # Your database name
     
     ## OP
     OPERATOR_key = "63bfa50ee6523365ff14c1f45f88737d"; # OP key matching your database

src/amf-app/amf_app.cpp

@@ -164,7 +164,7 @@ void amf_app_task(void*) {
   itti_inst->notify_task_ready(task_id);
     // nlohmann::json udsf_response2;
     // std::string record_id = "RECORD_ID=\'" + to_string(1221) + "\'";
-    // std::string udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/"+ std::string("nas_context/records/") +  record_id;
+    // std::string udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/"+ std::string("nas_context/records/") +  record_id;
     // while(1)
     // {amf_n2_inst->curl_http_client_udsf(udsf_url,"","GET",udsf_response2);}
   do {
@@ -423,8 +423,8 @@ void amf_app::handle_itti_message(
   std::shared_ptr<ue_context> uc = std::shared_ptr<ue_context>(new ue_context());
   string ue_context_key = "app_ue_ranid_" + to_string(itti_msg.ran_ue_ngap_id) + "-amfid_" + to_string(amf_ue_ngap_id);
   std::string record_id = "amf_ue_ngap_id=\'" + to_string(amf_ue_ngap_id) + "\'";
-  std::string udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + record_id ;
-  //std::string udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + "RECORD_ID=\'" + ue_context_key + "\'";
+  std::string udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + record_id ;
+  //std::string udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + "RECORD_ID=\'" + ue_context_key + "\'";
   if(!amf_n2_inst->curl_http_client_udsf(udsf_url,"","GET",udsf_response)){
     Logger::amf_n2().error("No existing ue_context with ue_context_key ...");
   }else if(udsf_response.dump().length()<8){
@@ -452,8 +452,8 @@ void amf_app::handle_itti_message(
   //Update ue_context to UDSF
   Logger::amf_app().debug("Update ue_context to UDSF");
   record_id = "amf_ue_ngap_id=\'" + to_string(amf_ue_ngap_id) + "\'";
-  udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + record_id ;
-  //udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + "RECORD_ID=\'" + ue_context_key + "\'";
+  udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + record_id ;
+  //udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + "RECORD_ID=\'" + ue_context_key + "\'";
   nlohmann::json udsf_ue_context;
   nlohmann::json  cgi;
   cgi["Content-ID"] = "cgi";
@@ -578,7 +578,7 @@ void amf_app::handle_itti_message(
   /**********************   hxs add *******************************/
 
   std::string record_id = "amf_ue_ngap_id=\'" + to_string(amf_ue_ngap_id) + "\'";
-  std::string udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + record_id ;
+  std::string udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + record_id ;
   nlohmann::json udsf_ue_context;
   nlohmann::json  cgi;
   cgi["Content-ID"] = "cgi";
@@ -608,7 +608,7 @@ void amf_app::handle_itti_message(
   //amf_n2_inst->curl_http_client_udsf(udsf_url,json_part,"PUT",udsf_ue_context);
   nlohmann::json udsf_response;
   amf_n2_inst->curl_http_client_udsf(udsf_url,json_part,"PUT",udsf_response);
-  // udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("gnb_context/records/") + std::to_string(itti_msg.assoc_id) ;
+  // udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("gnb_context/records/") + std::to_string(itti_msg.assoc_id) ;
   // if(!amf_n2_inst->curl_http_client_udsf(udsf_url,"","GET",udsf_response)){
   //   Logger::amf_n2().error("No existing gNG context with assoc_id (%d)", itti_msg.assoc_id);
   //   return;
@@ -619,7 +619,7 @@ void amf_app::handle_itti_message(
   // gc1->gnb_context_from_json(udsf_response);
   // gc2 = std::shared_ptr<gnb_context>(gc1);
 
-  // udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + std::to_string(uc.get()->ran_ue_ngap_id) ;
+  // udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + std::to_string(uc.get()->ran_ue_ngap_id) ;
   // if(!amf_n2_inst->curl_http_client_udsf(udsf_url,"","GET",udsf_response)){
   //   Logger::amf_n2().error("No existing gNG context with assoc_id (%d)", uc.get()->ran_ue_ngap_id);
   //   return;
@@ -672,8 +672,8 @@ bool amf_app::generate_5g_guti(
   nlohmann::json udsf_response;
   //std::string record_id = "RECORD_ID=\'" + to_string(amfid) + "\'";
   std::string record_id = "RECORD_ID=\'" + ue_context_key + "\'";
-  std::string udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + record_id;
-  //std::string udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + "RECORD_ID=\'" + ue_context_key + "\'";
+  std::string udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + record_id;
+  //std::string udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + "RECORD_ID=\'" + ue_context_key + "\'";
   if(!amf_n2_inst->curl_http_client_udsf(udsf_url,"","GET",udsf_response)){
     Logger::amf_n2().error("No existing gNG context with assoc_id");
     return false;

src/amf-app/amf_config.cpp

@@ -59,6 +59,8 @@ namespace config {
 amf_config::amf_config() {
   // TODO:
   is_Nausf = true;
+  is_Nudsf = true;
+  is_Rise = true;
   use_fqdn_dns              = false;
     enable_nf_registration    = false;
   enable_smf_selection      = false;
@@ -202,6 +204,18 @@ int amf_config::load(const std::string& config_file) {
       nausf_amf_cfg.lookupValue(AMF_CONFIG_STRING_IPV4_ADDRESS, nausf.addr4);
       nausf_amf_cfg.lookupValue(AMF_CONFIG_STRING_PORT, nausf.port);
     }
+    if (is_Nudsf) {
+      const Setting& nudsf_amf_cfg =
+          new_if_cfg[AMF_CONFIG_STRING_INTERFACE_NUDSF];
+      nudsf_amf_cfg.lookupValue(AMF_CONFIG_STRING_IPV4_ADDRESS, nudsf.addr4);
+      nudsf_amf_cfg.lookupValue(AMF_CONFIG_STRING_PORT, nudsf.port);
+    }
+    if (is_Rise) {
+      const Setting& rise_amf_cfg =
+          new_if_cfg[AMF_CONFIG_STRING_INTERFACE_RISE];
+      rise_amf_cfg.lookupValue(AMF_CONFIG_STRING_IPV4_ADDRESS, rise.addr4);
+      rise_amf_cfg.lookupValue(AMF_CONFIG_STRING_PORT, rise.port);
+    }
     const Setting& n11_cfg = new_if_cfg[AMF_CONFIG_STRING_INTERFACE_N11];
     load_interface(n11_cfg, n11);
     const Setting& smf_addr_pool =
@@ -470,6 +484,24 @@ void amf_config::display() {
     Logger::config().warn(
         "- Not using ausf: Please remove [--no-ausf] using it.");
   }
+  if (is_Nudsf) {
+    Logger::config().info("- Nudsf Networking:");
+    Logger::config().info(
+        "    ip ...................: %s", nudsf.addr4.c_str());
+    Logger::config().info("    port .................: %d", nudsf.port);
+  } else {
+    Logger::config().warn(
+        "- Not using ausf: Please remove [--no-ausf] using it.");
+  }
+  if (is_Rise) {
+    Logger::config().info("- Rise Networking:");
+    Logger::config().info(
+        "    ip ...................: %s", rise.addr4.c_str());
+    Logger::config().info("    port .................: %d", rise.port);
+  } else {
+    Logger::config().warn(
+        "- Not using ausf: Please remove [--no-ausf] using it.");
+  }
   if (enable_nf_registration or enable_smf_selection) {
     Logger::config().info("- NRF:");
     Logger::config().info(

src/amf-app/amf_config.hpp

@@ -46,6 +46,8 @@
 #define AMF_CONFIG_STRING_INTERFACES "INTERFACES"
 #define AMF_CONFIG_STRING_INTERFACE_NGAP_AMF "NGAP_AMF"
 #define AMF_CONFIG_STRING_INTERFACE_NAUSF "NAUSF"
+#define AMF_CONFIG_STRING_INTERFACE_NUDSF "NUDSF"
+#define AMF_CONFIG_STRING_INTERFACE_RISE  "RISE"
 
 #define AMF_CONFIG_STRING_INTERFACE_NAME "INTERFACE_NAME"
 #define AMF_CONFIG_STRING_IPV4_ADDRESS "IPV4_ADDRESS"
@@ -175,6 +177,14 @@ typedef struct {
   std::string addr4;
   unsigned int port;
 } ausf_if;
+typedef struct {
+  std::string addr4;
+  unsigned int port;
+} udsf_if;
+typedef struct {
+  std::string addr4;
+  unsigned int port;
+} rise_if;
 class amf_config {
  public:
   amf_config();
@@ -192,6 +202,8 @@ class amf_config {
   interface_cfg_t n11;
   //interface_cfg_t nausf;
   ausf_if nausf;
+  udsf_if nudsf;
+  rise_if rise;
   itti_cfg_t itti;
   unsigned int statistics_interval;
   std::string AMF_Name;
@@ -205,6 +217,8 @@ class amf_config {
   std::vector<smf_inst_t> smf_pool;
 
   bool is_Nausf;
+  bool is_Nudsf;
+  bool is_Rise;
   struct {
     struct in_addr ipv4_addr;
     unsigned int port;

src/amf-app/amf_n11.cpp

@@ -191,7 +191,7 @@ void amf_n11::handle_itti_message(
   nlohmann::json udsf_response;
   std::shared_ptr<nas_context> nc = std::shared_ptr<nas_context>(new nas_context());
   std::string record_id_nas = "amf_ue_ngap_id=\'" + to_string(itti_msg.amf_ue_ngap_id) + "\'";
-  std::string udsf_url_nas = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("nas_context/records/") +record_id_nas ;
+  std::string udsf_url_nas = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("nas_context/records/") +record_id_nas ;
   if(!amf_n2_inst->curl_http_client_udsf(udsf_url_nas,"","GET",udsf_response)){
     Logger::amf_n2().error("No existing pdu_session_context with assoc_id ");
     return ;
@@ -210,7 +210,7 @@ void amf_n11::handle_itti_message(
       supi.c_str(), itti_msg.pdu_session_id);
 
   std::string record_id = "RECORD_ID=\'" +supi  + "\'";
-  std::string udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id;
+  std::string udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id;
  if(!amf_n2_inst->curl_http_client_udsf(udsf_url,"","GET",udsf_response)){
     Logger::amf_n2().error("No existing pdu_session_context with assoc_id ");
 return ;
@@ -322,7 +322,7 @@ void amf_n11::handle_itti_message(itti_smf_services_consumer& smf) {
 
 
   std::string record_id = "RECORD_ID=\'" +supi  + "\'";
-  std::string udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id;
+  std::string udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id;
   if(!amf_n2_inst->curl_http_client_udsf(udsf_url,"","GET",udsf_response) ){
     Logger::amf_n2().error("No existing pdu_session_context with assoc_id ");
     psc = std::shared_ptr<pdu_session_context>(new pdu_session_context());
@@ -507,7 +507,7 @@ void amf_n11::handle_pdu_session_initial_request(
   //send udsf to storage us_ngap_context recordid=ran+ue_ngap_id
 
    std::string record_id = "RECORD_ID=\'" +supi  + "\'";
-  std::string udsf_put_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ;
+  std::string udsf_put_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ;
   nlohmann::json udsf_pdu_session_context;
  // nlohmann::json udsf_response;
   udsf_pdu_session_context["meta"] ["tags"] = {
@@ -602,7 +602,7 @@ void amf_n11::handle_itti_message(
   nlohmann::json udsf_response;
 
    std::string record_id = "RECORD_ID=\'" +itti_msg.supi  + "\'";
-  std::string udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ;
+  std::string udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ;
   if(!amf_n2_inst->curl_http_client_udsf(udsf_url,"","GET",udsf_response)){
     Logger::amf_n2().error("No existing pdu_session_context with assoc_id ");
   }
@@ -717,7 +717,7 @@ void amf_n11::curl_http_client(
   //***************************stateless
   nlohmann::json udsf_response;
   std::string record_id = "RECORD_ID=\'" +supi  + "\'";
-  std::string udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id;
+  std::string udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id;
   if(!amf_n2_inst->curl_http_client_udsf(udsf_url,"","GET",udsf_response)){
     Logger::amf_n2().error("No existing pdu_session_context with assoc_id ");
     return;
@@ -881,7 +881,7 @@ void amf_n11::curl_http_client(
 
 
         std::string record_id = "RECORD_ID=\'" +supi  + "\'";
-        std::string udsf_put_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ;
+        std::string udsf_put_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ;
         nlohmann::json udsf_put_pdu_session_context;
         udsf_put_pdu_session_context["meta"] ["tags"] = {
                                             {"RECORD_ID",nlohmann::json::array({supi})},

src/ngap/ngap_app/ngap_message_callback.hpp

@@ -48,7 +48,9 @@
 using namespace sctp;
 using namespace ngap;
 using namespace amf_application;
-
+#include "amf_config.hpp"
+using namespace config;
+extern amf_config amf_cfg;
 extern itti_mw* itti_inst;
 extern amf_n1* amf_n1_inst;
 extern amf_n11* amf_n11_inst;
@@ -395,7 +397,7 @@ std::shared_ptr<pdu_session_context> psc = std::shared_ptr<pdu_session_context>(
       nlohmann::json udsf_response;
 
       std::string record_id = "RECORD_ID=\'" +supi  + "\'";
-      std::string udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ;
+      std::string udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ;
       if(!amf_n2_inst->curl_http_client_udsf(udsf_url,"","GET",udsf_response)){
         Logger::amf_n2().error("No existing pdu_session_context with assoc_id ");
         return 0 ;
@@ -419,7 +421,7 @@ std::shared_ptr<pdu_session_context> psc = std::shared_ptr<pdu_session_context>(
 
 
      record_id = "RECORD_ID=\'" +supi  + "\'";
-      std::string udsf_put_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id;
+      std::string udsf_put_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id;
       nlohmann::json udsf_put_pdu_session_context;
       //nlohmann::json udsf_response;
       udsf_put_pdu_session_context["meta"] ["tags"] = {

src/sbi/amf_server/impl/IndividualSubscriptionDocumentApiImpl.cpp

@@ -14,8 +14,10 @@
 #include "IndividualSubscriptionDocumentApiImpl.h"
 #include "bstrlib.h"
 #include "amf_n2.hpp"
-
+#include "amf_config.hpp"
 #include <shared_mutex>
+using namespace config;
+extern amf_config amf_cfg;
 using namespace amf_application;
 using namespace ngap;
 extern amf_n2 *amf_n2_inst;
@@ -66,7 +68,7 @@ void IndividualSubscriptionDocumentApiImpl::gnb_message_from_plugin(const std::u
     amf_n2_inst->set_assoc_id_2_gnb_context(assoc_id, gc);
     nlohmann::json udsf_response;
     std::string record_id = "RECORD_ID=\'" +std::to_string(assoc_id)  + "\'";
-    std::string udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("gnb_context/records/") + record_id ;
+    std::string udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("gnb_context/records/") + record_id ;
     if(!amf_n2_inst->curl_http_client_udsf(udsf_url,"","GET",udsf_response)){
       Logger::amf_n2().error("No existing gNG context with assoc_id ...");
       is_gnb_context_present = false;

src/sbi/amf_server/impl/N1N2MessageCollectionDocumentApiImpl.cpp

@@ -23,7 +23,9 @@
 #include "pdu_session_context.hpp"
 using namespace amf_application;
 using namespace ngap;
-
+#include "amf_config.hpp"
+using namespace config;
+extern amf_config amf_cfg;
 extern void octet_stream_2_hex_stream(uint8_t *buf, int len, std::string &out);
 extern void msg_str_2_msg_hex(std::string msg, bstring& b);
 extern void convert_string_2_hex(std::string& input, std::string& output);
@@ -94,7 +96,7 @@ std::shared_ptr<pdu_session_context> psc = std::shared_ptr<pdu_session_context>(
   nlohmann::json udsf_response;
 
   std::string record_id = "RECORD_ID=\'" +supi  + "\'";
-  std::string udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ;
+  std::string udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ;
   if(!amf_n2_inst->curl_http_client_udsf(udsf_url,"","GET",udsf_response)){
     Logger::amf_n2().error("No existing pdu_session_context with assoc_id ");
   }
@@ -131,7 +133,7 @@ std::shared_ptr<pdu_session_context> psc = std::shared_ptr<pdu_session_context>(
 
 
     record_id = "RECORD_ID=\'" +supi  + "\'";
-    std::string udsf_put_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ;
+    std::string udsf_put_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ;
     nlohmann::json udsf_put_pdu_session_context;
     //nlohmann::json udsf_response;
     udsf_put_pdu_session_context["meta"] ["tags"] = {

src/sbi/amf_server/impl/TestSignallingApiImpl.cpp

@@ -6,7 +6,9 @@
 #include "pdu_session_context.hpp"
 using namespace amf_application;
 //using namespace ngap;
-
+#include "amf_config.hpp"
+using namespace config;
+extern amf_config amf_cfg;
 extern itti_mw* itti_inst;
 extern amf_n11* amf_n11_inst;
 extern amf_n2* amf_n2_inst;
@@ -39,7 +41,7 @@ std::shared_ptr<pdu_session_context> psc = std::shared_ptr<pdu_session_context>(
   nlohmann::json udsf_response;
 
   std::string record_id = "RECORD_ID=\'" +supi  + "\'";
-  std::string udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ;
+  std::string udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ;
   if(amf_n2_inst->curl_http_client_udsf(udsf_url,"","GET",udsf_response)){
        Logger::amf_server().debug("udsf_response: %s", udsf_response.dump().c_str());
        psc.get()->pdu_session_context_from_json(udsf_response);
@@ -106,7 +108,7 @@ std::shared_ptr<pdu_session_context> psc = std::shared_ptr<pdu_session_context>(
   nlohmann::json udsf_response;
 
   std::string record_id = "RECORD_ID=\'" +supi  + "\'";
-  std::string udsf_url = "http://10.103.239.53:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id;
+  std::string udsf_url = "http://" + std::string(amf_cfg.nudsf.addr4.c_str())+":" + std::to_string(amf_cfg.nudsf.port)+ "/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id;
   if(amf_n2_inst->curl_http_client_udsf(udsf_url,"","GET",udsf_response)){
        Logger::amf_server().debug("udsf_response: %s", udsf_response.dump().c_str());
        psc.get()->pdu_session_context_from_json(udsf_response);

src/sctp/sctp_server.cpp

@@ -28,7 +28,7 @@
 
 #include "sctp_server.hpp"
 #include "logger.hpp"
-
+#include "amf_config.hpp"
 #include <nlohmann/json.hpp>
 #include "amf.hpp"
 
@@ -53,6 +53,8 @@ extern "C" {
 
 #include <iostream>
 using namespace std;
+using namespace config;
+extern amf_config amf_cfg;
 namespace sctp {
 
 //------------------------------------------------------------------------------
@@ -449,9 +451,13 @@ void sctp_server::curl_http_client_Plugin(sctp_assoc_id_t assoc_id, sctp_stream_
     json_data["n2_data"] = ngapmsg;
 
 
-    std::string url  = 
-        "http://" + std::string("10.103.239.53") +
-        ":" + std::to_string(38414) + "/nplugin-dr/v1/" +
+    // std::string url  = 
+    //     "http://" + std::string("10.103.239.53") +
+    //     ":" + std::to_string(38414) + "/nplugin-dr/v1/" +
+    //     to_string (assoc_id ) + "/" + to_string (stream) ;
+      std::string url  = 
+        "http://" + std::string(amf_cfg.rise.addr4.c_str()) +
+        ":" + std::to_string(amf_cfg.rise.port) + "/nplugin-dr/v1/" +
         to_string (assoc_id ) + "/" + to_string (stream) ;
 
       Logger::sctp().debug(