Replace N11/N10 by SBI

src/api-server/impl/IndividualSMContextApiImpl.cpp

@@ -80,7 +80,7 @@ void IndividualSMContextApiImpl::release_sm_context(
   // Handle the itti_n11_release_sm_context_request message in smf_app
   std::shared_ptr<itti_n11_release_sm_context_request> itti_msg =
       std::make_shared<itti_n11_release_sm_context_request>(
-          TASK_SMF_N11, TASK_SMF_APP, promise_id, smContextRef);
+          TASK_SMF_SBI, TASK_SMF_APP, promise_id, smContextRef);
   itti_msg->req          = sm_context_req_msg;
   itti_msg->http_version = 1;
   m_smf_app->handle_pdu_session_release_sm_context_request(itti_msg);
@@ -133,7 +133,7 @@ void IndividualSMContextApiImpl::update_sm_context(
   // Handle the itti_n11_update_sm_context_request message in smf_app
   std::shared_ptr<itti_n11_update_sm_context_request> itti_msg =
       std::make_shared<itti_n11_update_sm_context_request>(
-          TASK_SMF_N11, TASK_SMF_APP, promise_id, smContextRef);
+          TASK_SMF_SBI, TASK_SMF_APP, promise_id, smContextRef);
   itti_msg->req          = sm_context_req_msg;
   itti_msg->http_version = 1;
   m_smf_app->handle_pdu_session_update_sm_context_request(itti_msg);

src/api-server/impl/NFStatusNotifyApiImpl.cpp

@@ -65,7 +65,7 @@ void NFStatusNotifyApiImpl::receive_nf_status_notification(
 
   // Handle the message in smf_app
   std::shared_ptr<itti_sbi_notification_data> itti_msg =
-      std::make_shared<itti_sbi_notification_data>(TASK_SMF_N11, TASK_SMF_APP);
+      std::make_shared<itti_sbi_notification_data>(TASK_SMF_SBI, TASK_SMF_APP);
   itti_msg->notification_msg = notification_msg;
   itti_msg->http_version     = 1;
 

src/api-server/impl/SMContextsCollectionApiImpl.cpp

@@ -92,7 +92,7 @@ void SMContextsCollectionApiImpl::post_sm_contexts(
   // Handle the pdu_session_create_sm_context_request message in smf_app
   std::shared_ptr<itti_n11_create_sm_context_request> itti_msg =
       std::make_shared<itti_n11_create_sm_context_request>(
-          TASK_SMF_N11, TASK_SMF_APP, promise_id);
+          TASK_SMF_SBI, TASK_SMF_APP, promise_id);
   itti_msg->req          = sm_context_req_msg;
   itti_msg->http_version = 1;
   m_smf_app->handle_pdu_session_create_sm_context_request(itti_msg);

src/api-server/impl/SubscriptionsCollectionApiImpl.cpp

@@ -74,7 +74,7 @@ void SubscriptionsCollectionApiImpl::create_individual_subcription(
   // Handle the message in smf_app
   std::shared_ptr<itti_sbi_event_exposure_request> itti_msg =
       std::make_shared<itti_sbi_event_exposure_request>(
-          TASK_SMF_N11, TASK_SMF_APP);
+          TASK_SMF_SBI, TASK_SMF_APP);
   itti_msg->event_exposure = event_exposure;
   itti_msg->http_version   = 1;
 

src/api-server/smf-http2-server.cpp

@@ -345,7 +345,7 @@ void smf_http2_server::create_sm_contexts_handler(
   // Handle the pdu_session_create_sm_context_request message in smf_app
   std::shared_ptr<itti_n11_create_sm_context_request> itti_msg =
       std::make_shared<itti_n11_create_sm_context_request>(
-          TASK_SMF_N11, TASK_SMF_APP, promise_id);
+          TASK_SMF_SBI, TASK_SMF_APP, promise_id);
   itti_msg->req          = sm_context_req_msg;
   itti_msg->http_version = 2;
   m_smf_app->handle_pdu_session_create_sm_context_request(itti_msg);
@@ -410,7 +410,7 @@ void smf_http2_server::update_sm_context_handler(
   // Handle the itti_n11_update_sm_context_request message in smf_app
   std::shared_ptr<itti_n11_update_sm_context_request> itti_msg =
       std::make_shared<itti_n11_update_sm_context_request>(
-          TASK_SMF_N11, TASK_SMF_APP, promise_id, smf_ref);
+          TASK_SMF_SBI, TASK_SMF_APP, promise_id, smf_ref);
   itti_msg->req          = sm_context_req_msg;
   itti_msg->http_version = 2;
   m_smf_app->handle_pdu_session_update_sm_context_request(itti_msg);
@@ -495,7 +495,7 @@ void smf_http2_server::release_sm_context_handler(
       "request from AMF.");
   std::shared_ptr<itti_n11_release_sm_context_request> itti_msg =
       std::make_shared<itti_n11_release_sm_context_request>(
-          TASK_SMF_N11, TASK_SMF_APP, promise_id, smf_ref);
+          TASK_SMF_SBI, TASK_SMF_APP, promise_id, smf_ref);
   itti_msg->req          = sm_context_req_msg;
   itti_msg->scid         = smf_ref;
   itti_msg->http_version = 2;

src/common/logger.cpp

@@ -63,8 +63,7 @@ void Logger::_init(
   m_smf_n1         = new _Logger("smf_n1 ", m_sinks, ss.str().c_str());
   m_smf_n2         = new _Logger("smf_n2 ", m_sinks, ss.str().c_str());
   m_smf_n4         = new _Logger("smf_n4 ", m_sinks, ss.str().c_str());
-  m_smf_n10        = new _Logger("smf_n10", m_sinks, ss.str().c_str());
-  m_smf_n11        = new _Logger("smf_n11", m_sinks, ss.str().c_str());
+  m_smf_sbi        = new _Logger("smf_sbi", m_sinks, ss.str().c_str());
   m_smf_api_server = new _Logger("sbi_srv", m_sinks, ss.str().c_str());
 }
 

src/common/logger.hpp

@@ -86,8 +86,7 @@ class Logger {
   static _Logger& smf_n1() { return *singleton().m_smf_n1; }
   static _Logger& smf_n2() { return *singleton().m_smf_n2; }
   static _Logger& smf_n4() { return *singleton().m_smf_n4; }
-  static _Logger& smf_n10() { return *singleton().m_smf_n10; }
-  static _Logger& smf_n11() { return *singleton().m_smf_n11; }
+  static _Logger& smf_sbi() { return *singleton().m_smf_sbi; }
   static _Logger& smf_api_server() { return *singleton().m_smf_api_server; }
 
  private:
@@ -116,8 +115,7 @@ class Logger {
   _Logger* m_smf_n1;
   _Logger* m_smf_n2;
   _Logger* m_smf_n4;
-  _Logger* m_smf_n10;
-  _Logger* m_smf_n11;
+  _Logger* m_smf_sbi;
   _Logger* m_smf_api_server;
 };
 

src/itti/itti_msg.hpp

@@ -36,8 +36,7 @@ typedef enum {
   TASK_ASYNC_SHELL_CMD,
   TASK_SMF_APP,
   TASK_SMF_N4,
-  TASK_SMF_N10,
-  TASK_SMF_N11,
+  TASK_SMF_SBI,
   TASK_MAX,
   TASK_NONE,
   TASK_ALL = 255

src/smf_app/CMakeLists.txt

@@ -55,7 +55,7 @@ add_library (SMF STATIC
   smf_pco.cpp
   smf_procedure.cpp
   smf_n4.cpp
-  smf_n11.cpp
+  smf_sbi.cpp
   smf_event.cpp
   smf_profile.cpp
   smf_subscription.cpp

src/smf_app/smf_app.cpp

@@ -56,7 +56,7 @@
 #include "smf.h"
 #include "smf_event.hpp"
 #include "smf_n1.hpp"
-#include "smf_n11.hpp"
+#include "smf_sbi.hpp"
 #include "smf_n4.hpp"
 #include "smf_paa_dynamic.hpp"
 #include "string.hpp"
@@ -72,7 +72,7 @@ extern util::async_shell_cmd* async_shell_cmd_inst;
 extern smf_app* smf_app_inst;
 extern smf_config smf_cfg;
 smf_n4* smf_n4_inst   = nullptr;
-smf_n11* smf_n11_inst = nullptr;
+smf_sbi* smf_sbi_inst = nullptr;
 extern itti_mw* itti_inst;
 
 void smf_app_task(void*);
@@ -327,7 +327,7 @@ smf_app::smf_app(const std::string& config_file)
 
   try {
     smf_n4_inst  = new smf_n4();
-    smf_n11_inst = new smf_n11();
+    smf_sbi_inst = new smf_sbi();
   } catch (std::exception& e) {
     Logger::smf_app().error("Cannot create SMF_APP: %s", e.what());
     throw;
@@ -923,7 +923,7 @@ void smf_app::handle_pdu_session_create_sm_context_request(
     if (not use_local_configuration_subscription_data(dnn_selection_mode)) {
       Logger::smf_app().debug(
           "Retrieve Session Management Subscription data from the UDM");
-      if (smf_n11_inst->get_sm_data(supi64, dnn, snssai, subscription)) {
+      if (smf_sbi_inst->get_sm_data(supi64, dnn, snssai, subscription)) {
         // update dnn_context with subscription info
         sc.get()->insert_dnn_subscription(snssai, subscription);
       } else {
@@ -1175,7 +1175,7 @@ void smf_app::trigger_pdu_session_modification(
 
   std::shared_ptr<itti_nx_trigger_pdu_session_modification> itti_msg =
       std::make_shared<itti_nx_trigger_pdu_session_modification>(
-          TASK_SMF_APP, TASK_SMF_N11);
+          TASK_SMF_APP, TASK_SMF_SBI);
   itti_msg->http_version = http_version;
 
   // step 1. collect the necessary information
@@ -1552,7 +1552,7 @@ void smf_app::timer_nrf_heartbeat_timeout(
 
   std::shared_ptr<itti_n11_update_nf_instance_request> itti_msg =
       std::make_shared<itti_n11_update_nf_instance_request>(
-          TASK_SMF_APP, TASK_SMF_N11);
+          TASK_SMF_APP, TASK_SMF_SBI);
 
   oai::smf_server::model::PatchItem patch_item = {};
   //{"op":"replace","path":"/nfStatus", "value": "REGISTERED"}
@@ -1565,7 +1565,7 @@ void smf_app::timer_nrf_heartbeat_timeout(
   int ret = itti_inst->send_msg(itti_msg);
   if (RETURNok != ret) {
     Logger::smf_app().error(
-        "Could not send ITTI message %s to task TASK_SMF_N11",
+        "Could not send ITTI message %s to task TASK_SMF_SBI",
         itti_msg->get_msg_name());
   } else {
     Logger::smf_app().debug(
@@ -1716,7 +1716,7 @@ void smf_app::trigger_create_context_error_response(
 
   std::shared_ptr<itti_n11_create_sm_context_response> itti_msg =
       std::make_shared<itti_n11_create_sm_context_response>(
-          TASK_SMF_N11, TASK_SMF_APP, promise_id);
+          TASK_SMF_SBI, TASK_SMF_APP, promise_id);
   pdu_session_create_sm_context_response sm_context_response = {};
   nlohmann::json json_data                                   = {};
   to_json(json_data, sm_context);
@@ -1746,7 +1746,7 @@ void smf_app::trigger_update_context_error_response(
 
   std::shared_ptr<itti_n11_update_sm_context_response> itti_msg =
       std::make_shared<itti_n11_update_sm_context_response>(
-          TASK_SMF_N11, TASK_SMF_APP, promise_id);
+          TASK_SMF_SBI, TASK_SMF_APP, promise_id);
   pdu_session_update_sm_context_response sm_context_response = {};
   nlohmann::json json_data                                   = {};
   to_json(json_data, smContextUpdateError);
@@ -1776,7 +1776,7 @@ void smf_app::trigger_update_context_error_response(
 
   std::shared_ptr<itti_n11_update_sm_context_response> itti_msg =
       std::make_shared<itti_n11_update_sm_context_response>(
-          TASK_SMF_N11, TASK_SMF_APP, promise_id);
+          TASK_SMF_SBI, TASK_SMF_APP, promise_id);
   pdu_session_update_sm_context_response sm_context_response = {};
   nlohmann::json json_data                                   = {};
   to_json(json_data, smContextUpdateError);
@@ -1802,7 +1802,7 @@ void smf_app::trigger_http_response(
     case N11_SESSION_RELEASE_SM_CONTEXT_RESPONSE: {
       std::shared_ptr<itti_n11_release_sm_context_response> itti_msg =
           std::make_shared<itti_n11_release_sm_context_response>(
-              TASK_SMF_N11, TASK_SMF_APP, promise_id);
+              TASK_SMF_SBI, TASK_SMF_APP, promise_id);
       pdu_session_release_sm_context_response sm_context_response = {};
       sm_context_response.set_http_code(http_code);
       itti_msg->res = sm_context_response;
@@ -1817,7 +1817,7 @@ void smf_app::trigger_http_response(
     case N11_SESSION_CREATE_SM_CONTEXT_RESPONSE: {
       std::shared_ptr<itti_n11_create_sm_context_response> itti_msg =
           std::make_shared<itti_n11_create_sm_context_response>(
-              TASK_SMF_N11, TASK_SMF_APP, promise_id);
+              TASK_SMF_SBI, TASK_SMF_APP, promise_id);
       pdu_session_create_sm_context_response sm_context_response = {};
       sm_context_response.set_http_code(http_code);
       itti_msg->res = sm_context_response;
@@ -1832,7 +1832,7 @@ void smf_app::trigger_http_response(
     case N11_SESSION_UPDATE_SM_CONTEXT_RESPONSE: {
       std::shared_ptr<itti_n11_update_sm_context_response> itti_msg =
           std::make_shared<itti_n11_update_sm_context_response>(
-              TASK_SMF_N11, TASK_SMF_APP, promise_id);
+              TASK_SMF_SBI, TASK_SMF_APP, promise_id);
       pdu_session_update_sm_context_response sm_context_response = {};
       sm_context_response.set_http_code(http_code);
       itti_msg->res = sm_context_response;
@@ -1989,12 +1989,12 @@ void smf_app::trigger_nf_registration_request() {
 
   std::shared_ptr<itti_n11_register_nf_instance_request> itti_msg =
       std::make_shared<itti_n11_register_nf_instance_request>(
-          TASK_SMF_APP, TASK_SMF_N11);
+          TASK_SMF_APP, TASK_SMF_SBI);
   itti_msg->profile = nf_instance_profile;
   int ret           = itti_inst->send_msg(itti_msg);
   if (RETURNok != ret) {
     Logger::smf_app().error(
-        "Could not send ITTI message %s to task TASK_SMF_N11",
+        "Could not send ITTI message %s to task TASK_SMF_SBI",
         itti_msg->get_msg_name());
   }
 }
@@ -2006,12 +2006,12 @@ void smf_app::trigger_nf_deregistration() {
 
   std::shared_ptr<itti_n11_deregister_nf_instance> itti_msg =
       std::make_shared<itti_n11_deregister_nf_instance>(
-          TASK_SMF_APP, TASK_SMF_N11);
+          TASK_SMF_APP, TASK_SMF_SBI);
   itti_msg->smf_instance_id = smf_instance_id;
   int ret                   = itti_inst->send_msg(itti_msg);
   if (RETURNok != ret) {
     Logger::smf_app().error(
-        "Could not send ITTI message %s to task TASK_SMF_N11",
+        "Could not send ITTI message %s to task TASK_SMF_SBI",
         itti_msg->get_msg_name());
   }
 }
@@ -2024,7 +2024,7 @@ void smf_app::trigger_upf_status_notification_subscribe() {
 
   std::shared_ptr<itti_n11_subscribe_upf_status_notify> itti_msg =
       std::make_shared<itti_n11_subscribe_upf_status_notify>(
-          TASK_SMF_APP, TASK_SMF_N11);
+          TASK_SMF_APP, TASK_SMF_SBI);
 
   nlohmann::json json_data = {};
   // TODO: remove hardcoded values
@@ -2049,7 +2049,7 @@ void smf_app::trigger_upf_status_notification_subscribe() {
   int ret             = itti_inst->send_msg(itti_msg);
   if (RETURNok != ret) {
     Logger::smf_app().error(
-        "Could not send ITTI message %s to task TASK_SMF_N11",
+        "Could not send ITTI message %s to task TASK_SMF_SBI",
         itti_msg->get_msg_name());
   }
 }

src/smf_app/smf_context.cpp

@@ -42,7 +42,7 @@
 #include "smf_config.hpp"
 #include "smf_event.hpp"
 #include "smf_n1.hpp"
-#include "smf_n11.hpp"
+#include "smf_sbi.hpp"
 #include "smf_n2.hpp"
 #include "smf_paa_dynamic.hpp"
 #include "smf_pfcp_association.hpp"
@@ -836,7 +836,7 @@ void smf_context::handle_itti_msg(
             session_report_msg.set_json_data(json_data);
 
             itti_n11_session_report_request* itti_n11 =
-                new itti_n11_session_report_request(TASK_SMF_APP, TASK_SMF_N11);
+                new itti_n11_session_report_request(TASK_SMF_APP, TASK_SMF_SBI);
             itti_n11->http_version = 1;  // use HTTPv1 for the moment
             std::shared_ptr<itti_n11_session_report_request> itti_n11_report =
                 std::shared_ptr<itti_n11_session_report_request>(itti_n11);
@@ -844,13 +844,13 @@ void smf_context::handle_itti_msg(
             // send ITTI message to N11 interface to trigger N1N2MessageTransfer
             // towards AMFs
             Logger::smf_app().info(
-                "Sending ITTI message %s to task TASK_SMF_N11",
+                "Sending ITTI message %s to task TASK_SMF_SBI",
                 itti_n11_report->get_msg_name());
 
             ret = itti_inst->send_msg(itti_n11_report);
             if (RETURNok != ret) {
               Logger::smf_app().error(
-                  "Could not send ITTI message %s to task TASK_SMF_N11",
+                  "Could not send ITTI message %s to task TASK_SMF_SBI",
                   itti_n11_report->get_msg_name());
             }
           }
@@ -1260,7 +1260,7 @@ void smf_context::handle_pdu_session_create_sm_context_request(
   // receiving the response from UPF
   itti_n11_create_sm_context_response* sm_context_resp =
       new itti_n11_create_sm_context_response(
-          TASK_SMF_APP, TASK_SMF_N11, smreq->pid);
+          TASK_SMF_APP, TASK_SMF_SBI, smreq->pid);
   std::shared_ptr<itti_n11_create_sm_context_response> sm_context_resp_pending =
       std::shared_ptr<itti_n11_create_sm_context_response>(sm_context_resp);
 
@@ -1476,7 +1476,7 @@ void smf_context::handle_pdu_session_create_sm_context_request(
         "Send ITTI msg to SMF APP to trigger the response of Server");
     std::shared_ptr<itti_n11_create_sm_context_response> itti_msg =
         std::make_shared<itti_n11_create_sm_context_response>(
-            TASK_SMF_N11, TASK_SMF_APP, smreq->pid);
+            TASK_SMF_SBI, TASK_SMF_APP, smreq->pid);
 
     pdu_session_create_sm_context_response sm_context_response = {};
     std::string smContextRef = std::to_string(smreq->scid);
@@ -1595,12 +1595,12 @@ void smf_context::handle_pdu_session_create_sm_context_request(
 
     // send ITTI message to N11 to trigger N1N2MessageTransfer towards AMFs
     Logger::smf_app().info(
-        "Sending ITTI message %s to task TASK_SMF_N11",
+        "Sending ITTI message %s to task TASK_SMF_SBI",
         sm_context_resp_pending->get_msg_name());
     int ret = itti_inst->send_msg(sm_context_resp_pending);
     if (RETURNok != ret) {
       Logger::smf_app().error(
-          "Could not send ITTI message %s to task TASK_SMF_N11",
+          "Could not send ITTI message %s to task TASK_SMF_SBI",
           sm_context_resp_pending->get_msg_name());
     }
   }
@@ -2297,7 +2297,7 @@ void smf_context::handle_pdu_session_update_sm_context_request(
   // when receiving the response from UPF
   itti_n11_update_sm_context_response* n11_sm_context_resp =
       new itti_n11_update_sm_context_response(
-          TASK_SMF_N11, TASK_SMF_APP, smreq->pid);
+          TASK_SMF_SBI, TASK_SMF_APP, smreq->pid);
   std::shared_ptr<itti_n11_update_sm_context_response> sm_context_resp_pending =
       std::shared_ptr<itti_n11_update_sm_context_response>(n11_sm_context_resp);
 
@@ -2623,7 +2623,7 @@ void smf_context::handle_pdu_session_update_sm_context_request(
     int ret = itti_inst->send_msg(sm_context_resp_pending);
     if (RETURNok != ret) {
       Logger::smf_app().error(
-          "Could not send ITTI message %s to task TASK_SMF_N11",
+          "Could not send ITTI message %s to task TASK_SMF_SBI",
           sm_context_resp_pending->get_msg_name());
     }
   }
@@ -2666,7 +2666,7 @@ void smf_context::handle_pdu_session_release_sm_context_request(
 
   itti_n11_release_sm_context_response* n11_sm_context_resp =
       new itti_n11_release_sm_context_response(
-          TASK_SMF_N11, TASK_SMF_APP, smreq->pid);
+          TASK_SMF_SBI, TASK_SMF_APP, smreq->pid);
 
   std::shared_ptr<itti_n11_release_sm_context_response>
       sm_context_resp_pending =
@@ -2781,7 +2781,7 @@ void smf_context::handle_pdu_session_modification_network_requested(
       fmt::format(
           NAMF_COMMUNICATION_N1N2_MESSAGE_TRANSFER_URL, supi_str.c_str());
   itti_msg->msg.set_amf_url(url);
-  Logger::smf_n11().debug(
+  Logger::smf_app().debug(
       "N1N2MessageTransfer will be sent to AMF with URL: %s", url.c_str());
 
   // Fill the json part
@@ -2811,12 +2811,12 @@ void smf_context::handle_pdu_session_modification_network_requested(
   // Step 3. Send ITTI message to N11 interface to trigger N1N2MessageTransfer
   // towards AMFs
   Logger::smf_app().info(
-      "Sending ITTI message %s to task TASK_SMF_N11", itti_msg->get_msg_name());
+      "Sending ITTI message %s to task TASK_SMF_SBI", itti_msg->get_msg_name());
 
   int ret = itti_inst->send_msg(itti_msg);
   if (RETURNok != ret) {
     Logger::smf_app().error(
-        "Could not send ITTI message %s to task TASK_SMF_N11",
+        "Could not send ITTI message %s to task TASK_SMF_SBI",
         itti_msg->get_msg_name());
   }
 }
@@ -2970,7 +2970,7 @@ void smf_context::handle_sm_context_status_change(
       "Send ITTI msg to SMF N11 to trigger the status notification");
   std::shared_ptr<itti_n11_notify_sm_context_status> itti_msg =
       std::make_shared<itti_n11_notify_sm_context_status>(
-          TASK_SMF_APP, TASK_SMF_N11);
+          TASK_SMF_APP, TASK_SMF_SBI);
   itti_msg->scid              = scid;
   itti_msg->sm_context_status = status;
   itti_msg->amf_status_uri    = scf.get()->amf_status_uri;
@@ -2979,7 +2979,7 @@ void smf_context::handle_sm_context_status_change(
   int ret = itti_inst->send_msg(itti_msg);
   if (RETURNok != ret) {
     Logger::smf_app().error(
-        "Could not send ITTI message %s to task TASK_SMF_N11",
+        "Could not send ITTI message %s to task TASK_SMF_SBI",
         itti_msg->get_msg_name());
   }
 }
@@ -3002,7 +3002,7 @@ void smf_context::handle_ee_pdu_session_release(
         "Send ITTI msg to SMF N11 to trigger the event notification");
     std::shared_ptr<itti_n11_notify_subscribed_event> itti_msg =
         std::make_shared<itti_n11_notify_subscribed_event>(
-            TASK_SMF_APP, TASK_SMF_N11);
+            TASK_SMF_APP, TASK_SMF_SBI);
 
     for (auto i : subscriptions) {
       event_notification ev_notif = {};
@@ -3020,7 +3020,7 @@ void smf_context::handle_ee_pdu_session_release(
     int ret = itti_inst->send_msg(itti_msg);
     if (RETURNok != ret) {
       Logger::smf_app().error(
-          "Could not send ITTI message %s to task TASK_SMF_N11",
+          "Could not send ITTI message %s to task TASK_SMF_SBI",
           itti_msg->get_msg_name());
     }
   } else {

src/smf_app/smf_procedure.cpp

@@ -44,7 +44,7 @@
 #include "smf_config.hpp"
 #include "smf_context.hpp"
 #include "smf_n1.hpp"
-#include "smf_n11.hpp"
+#include "smf_sbi.hpp"
 #include "smf_n2.hpp"
 #include "smf_pfcp_association.hpp"
 #include "ProblemDetails.h"
@@ -443,7 +443,7 @@ void session_create_sm_context_procedure::handle_itti_msg(
       fmt::format(
           NAMF_COMMUNICATION_N1N2_MESSAGE_TRANSFER_URL, supi_str.c_str());
   n11_triggered_pending->res.set_amf_url(url);
-  Logger::smf_n11().debug(
+  Logger::smf_app().debug(
       "N1N2MessageTransfer will be sent to AMF with URL: %s", url.c_str());
 
   // Fill the json part
@@ -495,7 +495,7 @@ void session_create_sm_context_procedure::handle_itti_msg(
   int ret = itti_inst->send_msg(n11_triggered_pending);
   if (RETURNok != ret) {
     Logger::smf_app().error(
-        "Could not send ITTI message %s to task TASK_SMF_N11",
+        "Could not send ITTI message %s to task TASK_SMF_SBI",
         n11_triggered_pending->get_msg_name());
   }
 }

src/smf_app/smf_n11.hpp → src/smf_app/smf_sbi.hpp

@@ -19,15 +19,15 @@
  *      contact@openairinterface.org
  */
 
-/*! \file smf_n11.hpp
+/*! \file smf_sbi.hpp
  \author  Lionel GAUTHIER, Tien-Thinh NGUYEN
  \company Eurecom
  \date 2019
  \email: lionel.gauthier@eurecom.fr, tien-thinh.nguyen@eurecom.fr
  */
 
-#ifndef FILE_SMF_N11_HPP_SEEN
-#define FILE_SMF_N11_HPP_SEEN
+#ifndef FILE_SMF_SBI_HPP_SEEN
+#define FILE_SMF_SBI_HPP_SEEN
 
 #include <map>
 #include <thread>
@@ -39,17 +39,17 @@
 
 namespace smf {
 
-#define TASK_SMF_N11_TIMEOUT_NRF_HEARTBEAT_REQUEST 1
+#define TASK_SMF_SBI_TIMEOUT_NRF_HEARTBEAT_REQUEST 1
 
-class smf_n11 {
+class smf_sbi {
  private:
   std::thread::id thread_id;
   std::thread thread;
 
  public:
-  smf_n11();
-  smf_n11(smf_n11 const&) = delete;
-  void operator=(smf_n11 const&) = delete;
+  smf_sbi();
+  smf_sbi(smf_sbi const&) = delete;
+  void operator=(smf_sbi const&) = delete;
 
   /*
    * Send N1N2 Message Transfer Request to AMF
@@ -164,4 +164,4 @@ class smf_n11 {
   void subscribe_sm_data();
 };
 }  // namespace smf
-#endif /* FILE_SMF_N11_HPP_SEEN */
+#endif /* FILE_SMF_SBI_HPP_SEEN */