Merge remote-tracking branch 'origin/event_exposure_quick_fix' into amf_event_report_fix

.vscode/settings.json

+{
+    "files.associations": {
+        "deque": "cpp",
+        "string": "cpp",
+        "vector": "cpp"
+    }
+}
\ No newline at end of file

src/amf-app/amf_n1.cpp

@@ -3118,12 +3118,13 @@ void amf_n1::ue_initiate_de_registration_handle(
   event_sub.ue_loss_of_connectivity(
       supi, DEREGISTERED, 1, ran_ue_ngap_id, amf_ue_ngap_id);
 
+  // TODO: put once this scenario is implemented
   // Trigger UE Loss of Connectivity Status Notify
-  Logger::amf_n1().debug(
-      "Signal the UE Loss of Connectivity Event notification for SUPI %s",
-      supi.c_str());
-  event_sub.ue_loss_of_connectivity(
-      supi, PURGED, 1, ran_ue_ngap_id, amf_ue_ngap_id);
+  // Logger::amf_n1().debug(
+  //     "Signal the UE Loss of Connectivity Event notification for SUPI %s",
+  //     supi.c_str());
+  // event_sub.ue_loss_of_connectivity(supi, PURGED, 1, ran_ue_ngap_id,
+  // amf_ue_ngap_id);
 
   if (nc->is_stacs_available) {
     stacs.update_5gmm_state(nc->imsi, "5GMM-DEREGISTERED");

src/amf-app/amf_sbi.cpp

@@ -560,7 +560,7 @@ void amf_sbi::handle_itti_message(itti_sbi_notify_subscribed_event& itti_msg) {
     i.get_reports(event_reports);
     for (auto r : event_reports) {
       report["type"]            = r.getType().get_value();
-      report["state"]["active"] = true;
+      report["state"]["active"] = true;  // as boolean
       if (r.supiIsSet()) {
         report["supi"] = r.getSupi();
       }
@@ -592,8 +592,9 @@ void amf_sbi::handle_itti_message(itti_sbi_notify_subscribed_event& itti_msg) {
 
       // Timestamp
       std::time_t time_epoch_ntp = std::time(nullptr);
-      uint64_t tv_ntp            = time_epoch_ntp; // + SECONDS_SINCE_FIRST_EPOCH;
-      report["timeStamp"]        = tv_ntp;
+      uint64_t tv_ntp =
+          time_epoch_ntp;            // not needed: + SECONDS_SINCE_FIRST_EPOCH;
+      report["timeStamp"] = tv_ntp;  // don't convert to string, leave as int64
       report_lists.push_back(report);
     }
 

src/sbi/amf_server/model/AmfEventReport.cpp

@@ -19,7 +19,7 @@
 namespace oai::amf::model {
 
 AmfEventReport::AmfEventReport() {
-  m_TimeStamp                = "";
+  m_TimeStamp                = 0;
   m_SubscriptionId           = "";
   m_SubscriptionIdIsSet      = false;
   m_AnyUe                    = false;
@@ -412,10 +412,10 @@ AmfEventState AmfEventReport::getState() const {
 void AmfEventReport::setState(AmfEventState const& value) {
   m_State = value;
 }
-std::string AmfEventReport::getTimeStamp() const {
+uint64_t AmfEventReport::getTimeStamp() const {
   return m_TimeStamp;
 }
-void AmfEventReport::setTimeStamp(std::string const& value) {
+void AmfEventReport::setTimeStamp(uint64_t const& value) {
   m_TimeStamp = value;
 }
 std::string AmfEventReport::getSubscriptionId() const {

src/sbi/amf_server/model/AmfEventReport.h

@@ -75,8 +75,8 @@ class AmfEventReport {
   /// <summary>
   ///
   /// </summary>
-  std::string getTimeStamp() const;
-  void setTimeStamp(std::string const& value);
+  uint64_t getTimeStamp() const;
+  void setTimeStamp(uint64_t const& value);
   /// <summary>
   ///
   /// </summary>
@@ -222,7 +222,7 @@ class AmfEventReport {
 
   AmfEventState m_State;
 
-  std::string m_TimeStamp;
+  uint64_t m_TimeStamp;
 
   std::string m_SubscriptionId;
   bool m_SubscriptionIdIsSet;