Code cleanup/Update with AMF EventExposure

src/amf-app/amf_app.cpp

@@ -34,7 +34,7 @@
 #include <iostream>
 #include <stdexcept>
 
-#include "3gpp_conversions.hpp"
+//#include "3gpp_conversions.hpp"
 #include "DLNASTransport.hpp"
 #include "amf_config.hpp"
 #include "amf_n1.hpp"

src/amf-app/amf_event.cpp

@@ -28,16 +28,10 @@
  */
 
 #include "amf_event.hpp"
-#include "itti.hpp"
 #include "amf_app.hpp"
-#include "smf_subscription.hpp"
-
-using namespace amf;
-extern amf::amf_app* amf_app_inst;
-extern itti_mw* itti_inst;
 
 //------------------------------------------------------------------------------
 bs2::connection amf_event::subscribe_ue_reachability_status(
     const ue_reachability_status_sig_t::slot_type& sig) {
-  return sm_context_status.connect(sig);
+  return ue_reachability_status.connect(sig);
 }

src/amf-app/amf_event.hpp

@@ -62,6 +62,6 @@ class amf_event {
 
  private:
   ue_reachability_status_sig_t
-      ue_reachability_status;  // Signal for SM Context status update
+      ue_reachability_status;  // Signal for UE Reachability Report
 };
 }  // namespace amf

src/amf-app/amf_event_sig.hpp

@@ -32,16 +32,16 @@
 
 #include <boost/signals2.hpp>
 #include <string>
-#include "3gpp_24.007.h"
 
 namespace bs2 = boost::signals2;
 
 namespace amf {
 
-// Signal for UE Reachability status
-// SCID, HTTP version
+// Signal for UE Reachability Report
+// SUPI, HTTP version
 typedef bs2::signal_type<
-    void(scid_t, uint8_t), bs2::keywords::mutex_type<bs2::dummy_mutex>>::type
+    void(std::string, uint8_t),
+    bs2::keywords::mutex_type<bs2::dummy_mutex>>::type
     ue_reachability_status_sig_t;
 
 }  // namespace amf

src/amf-app/amf_msg.hpp

@@ -54,42 +54,25 @@ class event_exposure_msg {
   void set_event_subs(std::vector<event_subscription_t> const& value);
 
  private:
-  supi_t m_supi;
+  supi_t m_supi;  // Supi
   bool m_supi_is_set;
   std::string m_supi_prefix;
 
   std::string m_sub_id;  // m_SubId;
   bool m_sub_id_is_set;
-  std::string m_notif_uri;                         // m_NotifUri;
-  std::string m_notif_id;                          // m_NotifId;
-  std::vector<event_subscription_t> m_event_subs;  // m_EventSubs;
-
-  // NotificationMethod m_NotifMethod;
-  // bool m_NotifMethodIsSet;
-  // int32_t m_MaxReportNbr;
-  // bool m_MaxReportNbrIsSet;
-  // std::string m_Expiry;
-  // bool m_ExpiryIsSet;
-  // int32_t m_RepPeriod;
-  // bool m_RepPeriodIsSet;
-  // Guami m_Guami;
-  // bool m_GuamiIsSet;
-  // std::string m_ServiveName;
-  // bool m_ServiveNameIsSet;
-  // std::vector<std::string> m_AltNotifIpv4Addrs;
-  // bool m_AltNotifIpv4AddrsIsSet;
-  // std::vector<Ipv6Addr> m_AltNotifIpv6Addrs;
-  // bool m_AltNotifIpv6AddrsIsSet;
-  // bool m_AnyUeInd;
-  // bool m_AnyUeIndIsSet;
-  // std::string m_Gpsi;
-  // bool m_GpsiIsSet;
-  // std::string m_GroupId;
-  // bool m_GroupIdIsSet;
-  // bool m_ImmeRep;
-  // bool m_ImmeRepIsSet;
-  // std::string m_SupportedFeatures;
-  // bool m_SupportedFeaturesIsSet;
+
+  std::string m_notif_uri;  // eventNotifyUri
+
+  std::string m_notif_id;                          // notifyCorrelationId
+  std::vector<event_subscription_t> m_event_subs;  // eventList
+  //  nfId:
+  //  subsChangeNotifyUri:
+  //  subsChangeNotifyCorrelationId:
+  //  groupId:
+  //  gpsi:
+  //  pei:
+  //  anyUE:
+  //  options: AmfEventMode
 };
 
 class event_notification {

src/amf-app/amf_subscription.hpp

@@ -27,15 +27,8 @@
  \email: shivam.gandhi@kcl.ac.uk
  */
 
-#include <map>
-#include <memory>
-#include <shared_mutex>
-#include <utility>
-#include <vector>
-
 #include "3gpp_29.518.h"
 #include "amf.hpp"
-#include "itti.hpp"
 
 namespace amf {