Skip to content

O
OpenXG-AMF
Commit fcab3bd2 authored by Niuhaiwen's avatar Niuhaiwen
Browse files
Options

modify udsf IP address

parent 333cfe49
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 73 deletions
src/amf-app/amf_app.cpp
View file @ fcab3bd2
...@@ -104,7 +104,7 @@ void amf_app_task(void*) { ...@@ -104,7 +104,7 @@ void amf_app_task(void*) {
itti_inst->notify_task_ready(task_id); itti_inst->notify_task_ready(task_id);
// nlohmann::json udsf_response2; // nlohmann::json udsf_response2;
// std::string record_id = "RECORD_ID=\'" + to_string(1221) + "\'"; // std::string record_id = "RECORD_ID=\'" + to_string(1221) + "\'";
// std::string udsf_url = "http://192.168.199.201:7123/nudsf-dr/v1/amfdata/"+ std::string("nas_context/records/") + record_id; // std::string udsf_url = "http://192.168.83.130:7123/nudsf-dr/v1/amfdata/"+ std::string("nas_context/records/") + record_id;
// while(1) // while(1)
// {amf_n2_inst->curl_http_client_udsf(udsf_url,"","GET",udsf_response2);} // {amf_n2_inst->curl_http_client_udsf(udsf_url,"","GET",udsf_response2);}
do { do {
...@@ -366,7 +366,7 @@ void amf_app::handle_itti_message( ...@@ -366,7 +366,7 @@ void amf_app::handle_itti_message(
/********************** hxs add *******************************/ /********************** hxs add *******************************/
std::string record_id = "amf_ue_ngap_id=\'" + 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://192.168.199.201:7123/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + record_id ; std::string udsf_url = "http://192.168.83.130:7123/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + record_id ;
nlohmann::json udsf_ue_context; nlohmann::json udsf_ue_context;
nlohmann::json cgi; nlohmann::json cgi;
cgi["Content-ID"] = "cgi"; cgi["Content-ID"] = "cgi";
...@@ -396,7 +396,7 @@ void amf_app::handle_itti_message( ...@@ -396,7 +396,7 @@ void amf_app::handle_itti_message(
//amf_n2_inst->curl_http_client_udsf(udsf_url,json_part,"PUT",udsf_ue_context); //amf_n2_inst->curl_http_client_udsf(udsf_url,json_part,"PUT",udsf_ue_context);
nlohmann::json udsf_response; nlohmann::json udsf_response;
amf_n2_inst->curl_http_client_udsf(udsf_url,json_part,"PUT",udsf_response); amf_n2_inst->curl_http_client_udsf(udsf_url,json_part,"PUT",udsf_response);
// udsf_url = "http://192.168.199.201:7123/nudsf-dr/v1/amfdata/" + std::string("gnb_context/records/") + std::to_string(itti_msg.assoc_id) ; // udsf_url = "http://192.168.83.130:7123/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)){ // 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); // Logger::amf_n2().error("No existing gNG context with assoc_id (%d)", itti_msg.assoc_id);
// return; // return;
...@@ -407,7 +407,7 @@ void amf_app::handle_itti_message( ...@@ -407,7 +407,7 @@ void amf_app::handle_itti_message(
// gc1->gnb_context_from_json(udsf_response); // gc1->gnb_context_from_json(udsf_response);
// gc2 = std::shared_ptr<gnb_context>(gc1); // gc2 = std::shared_ptr<gnb_context>(gc1);
// udsf_url = "http://192.168.199.201:7123/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + std::to_string(uc.get()->ran_ue_ngap_id) ; // udsf_url = "http://192.168.83.130:7123/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)){ // 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); // Logger::amf_n2().error("No existing gNG context with assoc_id (%d)", uc.get()->ran_ue_ngap_id);
// return; // return;
...@@ -458,7 +458,7 @@ bool amf_app::generate_5g_guti( ...@@ -458,7 +458,7 @@ bool amf_app::generate_5g_guti(
std::shared_ptr<ue_context> uc = std::shared_ptr<ue_context>(new ue_context()); std::shared_ptr<ue_context> uc = std::shared_ptr<ue_context>(new ue_context());
nlohmann::json udsf_response; nlohmann::json udsf_response;
std::string record_id = "RECORD_ID=\'" + ue_context_key + "\'"; std::string record_id = "RECORD_ID=\'" + ue_context_key + "\'";
std::string udsf_url = "http://192.168.199.201:7123/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + record_id; std::string udsf_url = "http://192.168.83.130:7123/nudsf-dr/v1/amfdata/" + std::string("ue_context/records/") + record_id;
if(!amf_n2_inst->curl_http_client_udsf(udsf_url,"","GET",udsf_response)){ if(!amf_n2_inst->curl_http_client_udsf(udsf_url,"","GET",udsf_response)){
Logger::amf_n2().error("No existing gNG context with assoc_id"); Logger::amf_n2().error("No existing gNG context with assoc_id");
return false; return false;
......
src/amf-app/amf_n1.cpp
View file @ fcab3bd2
This diff is collapsed.
src/amf-app/amf_n11.cpp
View file @ fcab3bd2
...@@ -186,7 +186,7 @@ void amf_n11::handle_itti_message( ...@@ -186,7 +186,7 @@ void amf_n11::handle_itti_message(
nlohmann::json udsf_response; nlohmann::json udsf_response;
std::shared_ptr<nas_context> nc = std::shared_ptr<nas_context>(new nas_context()); 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 record_id_nas = "amf_ue_ngap_id=\'" + to_string(itti_msg.amf_ue_ngap_id) + "\'";
std::string udsf_url_nas = "http://192.168.199.201:7123/nudsf-dr/v1/amfdata/" + std::string("nas_context/records/") +record_id_nas ; std::string udsf_url_nas = "http://192.168.83.130:7123/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)){ 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 "); Logger::amf_n2().error("No existing pdu_session_context with assoc_id ");
return ; return ;
...@@ -202,7 +202,7 @@ void amf_n11::handle_itti_message( ...@@ -202,7 +202,7 @@ void amf_n11::handle_itti_message(
supi.c_str(), itti_msg.pdu_session_id); supi.c_str(), itti_msg.pdu_session_id);
std::string record_id = "RECORD_ID=\'" +supi + "\'"; std::string record_id = "RECORD_ID=\'" +supi + "\'";
std::string udsf_url = "http://192.168.199.201:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id; std::string udsf_url = "http://192.168.83.130:7123/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)){ 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 "); Logger::amf_n2().error("No existing pdu_session_context with assoc_id ");
return ; return ;
...@@ -287,7 +287,7 @@ void amf_n11::handle_itti_message(itti_smf_services_consumer& smf) { ...@@ -287,7 +287,7 @@ void amf_n11::handle_itti_message(itti_smf_services_consumer& smf) {
std::string record_id = "RECORD_ID=\'" +supi + "\'"; std::string record_id = "RECORD_ID=\'" +supi + "\'";
std::string udsf_url = "http://192.168.199.201:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id; std::string udsf_url = "http://192.168.83.130:7123/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) ){ 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 "); Logger::amf_n2().error("No existing pdu_session_context with assoc_id ");
psc = std::shared_ptr<pdu_session_context>(new pdu_session_context()); psc = std::shared_ptr<pdu_session_context>(new pdu_session_context());
...@@ -465,7 +465,7 @@ void amf_n11::handle_pdu_session_initial_request( ...@@ -465,7 +465,7 @@ void amf_n11::handle_pdu_session_initial_request(
//send udsf to storage us_ngap_context recordid=ran+ue_ngap_id //send udsf to storage us_ngap_context recordid=ran+ue_ngap_id
std::string record_id = "RECORD_ID=\'" +supi + "\'"; std::string record_id = "RECORD_ID=\'" +supi + "\'";
std::string udsf_put_url = "http://192.168.199.201:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ; std::string udsf_put_url = "http://192.168.83.130:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ;
nlohmann::json udsf_pdu_session_context; nlohmann::json udsf_pdu_session_context;
// nlohmann::json udsf_response; // nlohmann::json udsf_response;
udsf_pdu_session_context["meta"] ["tags"] = { udsf_pdu_session_context["meta"] ["tags"] = {
...@@ -560,7 +560,7 @@ void amf_n11::handle_itti_message( ...@@ -560,7 +560,7 @@ void amf_n11::handle_itti_message(
nlohmann::json udsf_response; nlohmann::json udsf_response;
std::string record_id = "RECORD_ID=\'" +itti_msg.supi + "\'"; std::string record_id = "RECORD_ID=\'" +itti_msg.supi + "\'";
std::string udsf_url = "http://192.168.199.201:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ; std::string udsf_url = "http://192.168.83.130:7123/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)){ 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 "); Logger::amf_n2().error("No existing pdu_session_context with assoc_id ");
} }
...@@ -672,7 +672,7 @@ void amf_n11::curl_http_client( ...@@ -672,7 +672,7 @@ void amf_n11::curl_http_client(
//***************************stateless //***************************stateless
nlohmann::json udsf_response; nlohmann::json udsf_response;
std::string record_id = "RECORD_ID=\'" +supi + "\'"; std::string record_id = "RECORD_ID=\'" +supi + "\'";
std::string udsf_url = "http://192.168.199.201:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id; std::string udsf_url = "http://192.168.83.130:7123/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)){ 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 "); Logger::amf_n2().error("No existing pdu_session_context with assoc_id ");
return; return;
...@@ -833,7 +833,7 @@ void amf_n11::curl_http_client( ...@@ -833,7 +833,7 @@ void amf_n11::curl_http_client(
std::string record_id = "RECORD_ID=\'" +supi + "\'"; std::string record_id = "RECORD_ID=\'" +supi + "\'";
std::string udsf_put_url = "http://192.168.199.201:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ; std::string udsf_put_url = "http://192.168.83.130:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ;
nlohmann::json udsf_put_pdu_session_context; nlohmann::json udsf_put_pdu_session_context;
udsf_put_pdu_session_context["meta"] ["tags"] = { udsf_put_pdu_session_context["meta"] ["tags"] = {
{"RECORD_ID",nlohmann::json::array({supi})}, {"RECORD_ID",nlohmann::json::array({supi})},
......
src/amf-app/amf_n2.cpp
View file @ fcab3bd2
This diff is collapsed.
src/ngap/ngap_app/ngap_message_callback.hpp
View file @ fcab3bd2
...@@ -395,7 +395,7 @@ std::shared_ptr<pdu_session_context> psc = std::shared_ptr<pdu_session_context>( ...@@ -395,7 +395,7 @@ std::shared_ptr<pdu_session_context> psc = std::shared_ptr<pdu_session_context>(
nlohmann::json udsf_response; nlohmann::json udsf_response;
std::string record_id = "RECORD_ID=\'" +supi + "\'"; std::string record_id = "RECORD_ID=\'" +supi + "\'";
std::string udsf_url = "http://192.168.199.201:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ; std::string udsf_url = "http://192.168.83.130:7123/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)){ 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 "); Logger::amf_n2().error("No existing pdu_session_context with assoc_id ");
return 0 ; return 0 ;
...@@ -419,7 +419,7 @@ std::shared_ptr<pdu_session_context> psc = std::shared_ptr<pdu_session_context>( ...@@ -419,7 +419,7 @@ std::shared_ptr<pdu_session_context> psc = std::shared_ptr<pdu_session_context>(
record_id = "RECORD_ID=\'" +supi + "\'"; record_id = "RECORD_ID=\'" +supi + "\'";
std::string udsf_put_url = "http://192.168.199.201:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id; std::string udsf_put_url = "http://192.168.83.130:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id;
nlohmann::json udsf_put_pdu_session_context; nlohmann::json udsf_put_pdu_session_context;
//nlohmann::json udsf_response; //nlohmann::json udsf_response;
udsf_put_pdu_session_context["meta"] ["tags"] = { udsf_put_pdu_session_context["meta"] ["tags"] = {
......
src/sbi/amf_server/impl/N1N2MessageCollectionDocumentApiImpl.cpp
View file @ fcab3bd2
...@@ -94,7 +94,7 @@ std::shared_ptr<pdu_session_context> psc = std::shared_ptr<pdu_session_context>( ...@@ -94,7 +94,7 @@ std::shared_ptr<pdu_session_context> psc = std::shared_ptr<pdu_session_context>(
nlohmann::json udsf_response; nlohmann::json udsf_response;
std::string record_id = "RECORD_ID=\'" +supi + "\'"; std::string record_id = "RECORD_ID=\'" +supi + "\'";
std::string udsf_url = "http://192.168.199.201:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ; std::string udsf_url = "http://192.168.83.130:7123/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)){ 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 "); Logger::amf_n2().error("No existing pdu_session_context with assoc_id ");
} }
...@@ -131,7 +131,7 @@ std::shared_ptr<pdu_session_context> psc = std::shared_ptr<pdu_session_context>( ...@@ -131,7 +131,7 @@ std::shared_ptr<pdu_session_context> psc = std::shared_ptr<pdu_session_context>(
record_id = "RECORD_ID=\'" +supi + "\'"; record_id = "RECORD_ID=\'" +supi + "\'";
std::string udsf_put_url = "http://192.168.199.201:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ; std::string udsf_put_url = "http://192.168.83.130:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ;
nlohmann::json udsf_put_pdu_session_context; nlohmann::json udsf_put_pdu_session_context;
//nlohmann::json udsf_response; //nlohmann::json udsf_response;
udsf_put_pdu_session_context["meta"] ["tags"] = { udsf_put_pdu_session_context["meta"] ["tags"] = {
......
src/sbi/amf_server/impl/TestSignallingApiImpl.cpp
View file @ fcab3bd2
...@@ -39,7 +39,7 @@ std::shared_ptr<pdu_session_context> psc = std::shared_ptr<pdu_session_context>( ...@@ -39,7 +39,7 @@ std::shared_ptr<pdu_session_context> psc = std::shared_ptr<pdu_session_context>(
nlohmann::json udsf_response; nlohmann::json udsf_response;
std::string record_id = "RECORD_ID=\'" +supi + "\'"; std::string record_id = "RECORD_ID=\'" +supi + "\'";
std::string udsf_url = "http://192.168.199.201:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id ; std::string udsf_url = "http://192.168.83.130:7123/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)){ 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()); Logger::amf_server().debug("udsf_response: %s", udsf_response.dump().c_str());
psc.get()->pdu_session_context_from_json(udsf_response); psc.get()->pdu_session_context_from_json(udsf_response);
...@@ -106,7 +106,7 @@ std::shared_ptr<pdu_session_context> psc = std::shared_ptr<pdu_session_context>( ...@@ -106,7 +106,7 @@ std::shared_ptr<pdu_session_context> psc = std::shared_ptr<pdu_session_context>(
nlohmann::json udsf_response; nlohmann::json udsf_response;
std::string record_id = "RECORD_ID=\'" +supi + "\'"; std::string record_id = "RECORD_ID=\'" +supi + "\'";
std::string udsf_url = "http://192.168.199.201:7123/nudsf-dr/v1/amfdata/" + std::string("pdu_session_context/records/") + record_id; std::string udsf_url = "http://192.168.83.130:7123/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)){ 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()); Logger::amf_server().debug("udsf_response: %s", udsf_response.dump().c_str());
psc.get()->pdu_session_context_from_json(udsf_response); psc.get()->pdu_session_context_from_json(udsf_response);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment