Remove PDU session status change

src/smf_app/smf_context.cpp

@@ -3112,111 +3112,6 @@ void smf_context::handle_ee_pdu_session_release(
   }
 }
 
-//------------------------------------------------------------------------------
-void smf_context::handle_pdu_session_status_change(
-    scid_t scid, const std::string& status, uint8_t http_version) {
-  Logger::smf_app().debug(
-      "Send request to N11 to triger PDU Session Status Change Notification, "
-      "SMF Context ID " SCID_FMT " ",
-      scid);
-
-  // get the smf context
-  std::shared_ptr<smf_context_ref> scf = {};
-
-  if (smf_app_inst->is_scid_2_smf_context(scid)) {
-    scf = smf_app_inst->scid_2_smf_context(scid);
-  } else {
-    Logger::smf_app().warn(
-        "Context associated with this id " SCID_FMT " does not exit!", scid);
-  }
-
-  supi_t supi                     = scf.get()->supi;
-  supi64_t supi64                 = smf_supi_to_u64(supi);
-  pdu_session_id_t pdu_session_id = scf.get()->pdu_session_id;
-
-  std::shared_ptr<smf_context> sc = {};
-
-  if (smf_app_inst->is_supi_2_smf_context(supi64)) {
-    sc = smf_app_inst->supi_2_smf_context(supi64);
-    Logger::smf_app().debug(
-        "Retrieve SMF context with SUPI " SUPI_64_FMT "", supi64);
-  } else {
-    Logger::smf_app().warn(
-        "Could not retrieve the corresponding SMF context with "
-        "Supi " SUPI_64_FMT "!",
-        supi64);
-  }
-
-  // get dnn context
-  std::shared_ptr<dnn_context> sd = {};
-
-  if (!sc.get()->find_dnn_context(scf.get()->nssai, scf.get()->dnn, sd)) {
-    if (nullptr == sd.get()) {
-      Logger::smf_app().warn(
-          "Could not retrieve the corresponding DNN context!");
-    }
-  }
-  // get smd_pdu_session
-  std::shared_ptr<smf_pdu_session> sp = {};
-  bool find_pdn = sd.get()->find_pdu_session(pdu_session_id, sp);
-
-  if (nullptr == sp.get()) {
-    Logger::smf_app().warn(
-        "Could not retrieve the corresponding SMF PDU Session context!");
-  }
-
-  Logger::smf_app().debug(
-      "Send request to N11 to triger PDU Session Status Change Notification "
-      "(Event "
-      "Exposure), SUPI " SUPI_64_FMT " , PDU Session ID %d, HTTP version  %d",
-      supi, pdu_session_id, http_version);
-
-  std::vector<std::shared_ptr<smf_subscription>> subscriptions = {};
-  smf_app_inst->get_ee_subscriptions(
-      smf_event_t::SMF_EVENT_PDU_SES_REL, subscriptions);
-
-  if (subscriptions.size() > 0) {
-    // Send request to N11 to trigger the notification to the subscribed event
-    Logger::smf_app().debug(
-        "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_SBI);
-
-    for (auto i : subscriptions) {
-      event_notification ev_notif = {};
-      ev_notif.set_supi(supi64);
-      ev_notif.set_pdu_session_id(pdu_session_id);
-      ev_notif.set_smf_event(smf_event_t::SMF_EVENT_PDU_SES_REL);
-      ev_notif.set_notif_uri(i.get()->notif_uri);
-      ev_notif.set_notif_id(i.get()->notif_id);
-      /*      // custom json e.g., for FlexCN
-            nlohmann::json cj = {};
-            if (sp.get() != nullptr) {
-              if (sp->ipv4) {
-                cj["ue_ipv4_addr"] = conv::toString(sp->ipv4_address);
-              }
-              cj["pdu_session_type"] = sp->pdu_session_type.toString();
-            }
-
-            ev_notif.set_custom_info(cj);
-      */
-      itti_msg->event_notifs.push_back(ev_notif);
-    }
-
-    itti_msg->http_version = http_version;
-
-    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_SBI",
-          itti_msg->get_msg_name());
-    }
-  } else {
-    Logger::smf_app().debug("No subscription available for this event");
-  }
-}
-
 //------------------------------------------------------------------------------
 void smf_context::handle_ue_ip_change(scid_t scid, uint8_t http_version) {
   Logger::smf_app().debug(
@@ -3511,12 +3406,6 @@ void smf_context::trigger_flexcn_event(scid_t scid, uint8_t http_version) {
   event_sub.ee_flexcn(scid, http_version);
 }
 
-//------------------------------------------------------------------------------
-void smf_context::trigger_pdu_session_status_change(
-    scid_t scid, const std::string& status, uint8_t http_version) {
-  event_sub.ee_pdu_session_status(scid, status, http_version);
-}
-
 //------------------------------------------------------------------------------
 void smf_context::update_qos_info(
     std::shared_ptr<smf_pdu_session>& sp,

src/smf_app/smf_context.hpp

@@ -568,20 +568,16 @@ class smf_context : public std::enable_shared_from_this<smf_context> {
         event_sub(),
         plmn() {
     supi_prefix = {};
-    // Subscribe to sm context status change
+
+    // Subscribe to SM Context Status change (to notify to AMF)
     sm_context_status_connection =
         event_sub.subscribe_sm_context_status(boost::bind(
             &smf_context::handle_sm_context_status_change, this, _1, _2, _3));
-    // Subscribe to pdu session release (event exposure)
+    // Subscribe to PDU Session Release (event exposure)
     ee_pdu_session_release_connection =
         event_sub.subscribe_ee_pdu_session_release(boost::bind(
             &smf_context::handle_ee_pdu_session_release, this, _1, _2, _3));
 
-    // Subscribe to sm context status change
-    pdu_session_status_connection =
-        event_sub.subscribe_ee_pdu_session_status_change(boost::bind(
-            &smf_context::handle_pdu_session_status_change, this, _1, _2, _3));
-
     // Subscribe to UE IP Change Event
     ee_ue_ip_change_connection = event_sub.subscribe_ee_ue_ip_change(
         boost::bind(&smf_context::handle_ue_ip_change, this, _1, _2));
@@ -600,8 +596,9 @@ class smf_context : public std::enable_shared_from_this<smf_context> {
       sm_context_status_connection.disconnect();
     if (ee_pdu_session_release_connection.connected())
       ee_pdu_session_release_connection.disconnect();
-    if (pdu_session_status_connection.connected())
-      pdu_session_status_connection.disconnect();
+    if (ee_ue_ip_change_connection.connected())
+      ee_ue_ip_change_connection.disconnect();
+    if (ee_flexcn.connected()) ee_flexcn.disconnect();
   }
 
   /*
@@ -1046,11 +1043,6 @@ class smf_context : public std::enable_shared_from_this<smf_context> {
   void handle_ee_pdu_session_release(
       supi64_t supi, pdu_session_id_t pdu_session_id, uint8_t http_version);
 
-  void handle_pdu_session_status_change(
-      scid_t scid, const std::string& status, uint8_t http_version);
-  void trigger_pdu_session_status_change(
-      scid_t scid, const std::string& status, uint8_t http_version);
-
   void trigger_ue_ip_change(scid_t scid, uint8_t http_version);
   void handle_ue_ip_change(scid_t scid, uint8_t http_version);
 
@@ -1106,7 +1098,6 @@ class smf_context : public std::enable_shared_from_this<smf_context> {
   // for Event Handling
   smf_event event_sub;
   bs2::connection sm_context_status_connection;
-  bs2::connection pdu_session_status_connection;
   bs2::connection ee_pdu_session_release_connection;
   bs2::connection ee_ue_ip_change_connection;
   bs2::connection ee_flexcn;

src/smf_app/smf_event.cpp

@@ -42,12 +42,6 @@ bs2::connection smf_event::subscribe_sm_context_status(
   return sm_context_status.connect(sig);
 }
 
-//------------------------------------------------------------------------------
-bs2::connection smf_event::subscribe_ee_pdu_session_status_change(
-    const ee_pdu_session_status_sig_t::slot_type& sig) {
-  return ee_pdu_session_status.connect(sig);
-}
-
 //------------------------------------------------------------------------------
 bs2::connection smf_event::subscribe_ee_pdu_session_release(
     const ee_pdu_session_release_sig_t::slot_type& sig) {

src/smf_app/smf_event.hpp

@@ -73,9 +73,6 @@ class smf_event {
   bs2::connection subscribe_ee_pdu_session_release(
       const ee_pdu_session_release_sig_t::slot_type& sig);
 
-  bs2::connection subscribe_ee_pdu_session_status_change(
-      const ee_pdu_session_status_sig_t::slot_type& sig);
-
   bs2::connection subscribe_ee_ue_ip_change(
       const ee_ue_ip_change_sig_t::slot_type& sig);
 
@@ -85,10 +82,8 @@ class smf_event {
  private:
   sm_context_status_sig_t
       sm_context_status;  // Signal for SM Context status update
-  ee_pdu_session_status_sig_t
-      ee_pdu_session_status;  // Signal for PDU Session status change
   ee_pdu_session_release_sig_t
-      ee_pdu_session_release;             // Signal for SM Context status update
+      ee_pdu_session_release;             // Signal for PDU Session Release
   ee_ue_ip_change_sig_t ee_ue_ip_change;  // Signal for UE IP Addr change
   ee_flexcn_sig_t ee_flexcn;              // Signal for FlexCN Event
 };

src/smf_app/smf_event_sig.hpp

@@ -44,13 +44,6 @@ typedef bs2::signal_type<
     void(scid_t, const std::string&, uint8_t),
     bs2::keywords::mutex_type<bs2::dummy_mutex>>::type sm_context_status_sig_t;
 
-// Signal for PDU session status change (for Event Exposure)
-// SCID, PDU Session Status, HTTP version
-typedef bs2::signal_type<
-    void(scid_t, const std::string&, uint8_t),
-    bs2::keywords::mutex_type<bs2::dummy_mutex>>::type
-    ee_pdu_session_status_sig_t;
-
 // Signal for Event exposure
 // PDU session Release, SUPI, PDU SessionID, HTTP version
 typedef bs2::signal_type<

src/smf_app/smf_procedure.cpp

@@ -1137,7 +1137,6 @@ void session_update_sm_context_procedure::handle_itti_msg(
       sps->set_upCnx_state(upCnx_state_e::UPCNX_STATE_ACTIVATED);
       // Trigger Event_exposure event
       scid_t scid = sc.get()->get_scid();
-      sc.get()->trigger_pdu_session_status_change(scid, "ACTIVATED", 1);
       sc.get()->trigger_ue_ip_change(scid, 1);
       sc.get()->trigger_flexcn_event(scid, 1);