Use 3gpp_29.518 for AMF

src/amf-app/amf_msg.hpp

@@ -30,7 +30,7 @@
 #define FILE_AMF_MSG_HPP_SEEN
 
 #include "amf.hpp"
-#include "3gpp_29.508.h"
+#include "3gpp_29.518.h"
 #include "pistache/http.h"
 #include "amf_profile.hpp"
 
@@ -188,4 +188,4 @@ class data_notification_msg {
 };
 }  // namespace amf
 
-#endif
\ No newline at end of file
+#endif

src/amf-app/amf_subscription.hpp

@@ -33,7 +33,7 @@
 #include <utility>
 #include <vector>
 
-#include "3gpp_29.508.h"
+#include "3gpp_29.518.h"
 #include "amf.hpp"
 #include "itti.hpp"
 

src/common/3gpp_29.508.h → src/common/3gpp_29.518.h

@@ -19,30 +19,40 @@
  *      contact@openairinterface.org
  */
 
-#ifndef FILE_3GPP_29_508_SMF_SEEN
-#define FILE_3GPP_29_508_SMF_SEEN
+#ifndef FILE_3GPP_29_518_SEEN
+#define FILE_3GPP_29_518_SEEN
 
 #include "amf.hpp"
 
 typedef enum amf_event_e {
-  SMF_EVENT_AC_TY_CH    = 1,
-  SMF_EVENT_UP_PATH_CH  = 2,
-  SMF_EVENT_PDU_SES_REL = 3,
-  SMF_EVENT_PLMN_CH     = 4,
-  SMF_EVENT_UE_IP_CH    = 5,
-  SMF_EVENT_DDDS        = 6,
-  AMF_EVENT_REACH_ST    = 7
+  LOCATION_REPORT              = 1,
+  PRESENCE_IN_AOI_REPORT       = 2,
+  TIMEZONE_REPORT              = 3,
+  ACCESS_TYPE_REPORT           = 4,
+  REGISTRATION_STATE_REPORT    = 5,
+  CONNECTIVITY_STATE_REPORT    = 6,
+  REACHABILITY_REPORT          = 7,
+  COMMUNICATION_FAILURE_REPORT = 8,
+  UES_IN_AREA_REPORT           = 9,
+  SUBSCRIPTION_ID_CHANGE       = 10,
+  SUBSCRIPTION_ID_ADDITION     = 11,
+  LOSS_OF_CONNECTIVITY         = 12
 } amf_event_t;
 
 static const std::vector<std::string> amf_event_e2str = {
     "AMF_EVENT_UNKNOWN",
-    "Access Type Change",
-    "UP Path Change",
-    "PDU Session Release",
-    "PLMN Change",
-    "UE IP address change",
-    "Downlink data delivery status",
-    "UE Reachability Status Change"};
+    "LOCATION_REPORT",
+    "PRESENCE_IN_AOI_REPORT",
+    "TIMEZONE_REPORT",
+    "ACCESS_TYPE_REPORT",
+    "REGISTRATION_STATE_REPORT",
+    "CONNECTIVITY_STATE_REPORT",
+    "REACHABILITY_REPORT",
+    "COMMUNICATION_FAILURE_REPORT",
+    "UES_IN_AREA_REPORT",
+    "SUBSCRIPTION_ID_CHANGE",
+    "SUBSCRIPTION_ID_ADDITION",
+    "LOSS_OF_CONNECTIVITY"};
 
 enum class notification_method_e {
   PERIODIC           = 1,
@@ -54,15 +64,12 @@ static const std::vector<std::string> notification_method_e2str = {
     "NOTIFICATION_METHOD_UNKNOWN", "PERIODIC", "ONE_TIME",
     "ON_EVENT_DETECTION"};
 
-enum class dnai_change_type_e { EARLY = 1, EARLY_LATE = 2, LATE = 3 };
-enum class ddd_status_e { BUFFERED = 1, TRANSMITTED = 2, DISCARDED = 3 };
-
 typedef struct event_subscription_s {
   amf_event_t amf_event;
-  dnai_change_type_e dnai_change_type;
-  // DddTrafficDescriptor
-  std::vector<ddd_status_e> ddd_status;
+  // immediateFlag:
+  // areaList:
+  // locationFilterList:
+  // refId:
 
 } event_subscription_t;
-
 #endif

src/sbi/amf_server/impl/SubscriptionsCollectionApiImpl.cpp

 /**
  * Namf_EventExposure
- * Session Management Event Exposure Service. © 2019, 3GPP Organizational
+ * Session Management Event Exposure Service. � 2019, 3GPP Organizational
  * Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.
  *
  * The version of the OpenAPI document: 1.1.0.alpha-1
@@ -36,7 +36,7 @@
 
 #include "logger.hpp"
 #include "amf_msg.hpp"
-#include "3gpp_29.508.h"
+#include "3gpp_29.518.h"
 #include "itti_msg_sbi.hpp"
 #include "amf_config.hpp"
 #include "3gpp_conversions.hpp"

src/utils/3gpp_conversions.cpp

@@ -93,7 +93,7 @@ void xgpp_conv::amf_event_exposure_notification_from_openapi(
 
   // EventSubscription: TODO
   event_subscription_t event_subscription = {};
-  event_subscription.amf_event            = amf_event_t::AMF_EVENT_REACH_ST;
+  event_subscription.amf_event            = amf_event_t::REACHABILITY_REPORT;
   std::vector<event_subscription_t> event_subscriptions = {};
   event_subscriptions.push_back(event_subscription);
   // eem.set_event_subs(event_subscriptions);
@@ -104,4 +104,4 @@ void xgpp_conv::amf_event_exposure_notification_from_openapi(
   // getDnaiChgType
   // event_subscriptions.push_back(event_subscription);
   //}
-}
\ No newline at end of file
+}