Commit ff529b87 authored by Tien-Thinh Nguyen's avatar Tien-Thinh Nguyen

Code cleanup

parent 57e2e0e0
...@@ -142,17 +142,7 @@ void event_notification::set_subs_change_notify_correlation_id( ...@@ -142,17 +142,7 @@ void event_notification::set_subs_change_notify_correlation_id(
std::string event_notification::get_subs_change_notify_correlation_id() const { std::string event_notification::get_subs_change_notify_correlation_id() const {
return m_subs_change_notify_correlation_id; return m_subs_change_notify_correlation_id;
} }
/*
//-----------------------------------------------------------------------------
void event_notification::add_report(const amf_event_report_t& report) {
m_report_list.push_back(report);
}
//-----------------------------------------------------------------------------
std::vector<amf_event_report_t> event_notification::get_reports() const {
return m_report_list;
}
*/
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void event_notification::add_report( void event_notification::add_report(
const oai::amf::model::AmfEventReport& report) { const oai::amf::model::AmfEventReport& report) {
......
...@@ -89,8 +89,6 @@ class event_notification { ...@@ -89,8 +89,6 @@ class event_notification {
std::string get_notify_correlation_id() const; std::string get_notify_correlation_id() const;
void set_subs_change_notify_correlation_id(std::string const& value); void set_subs_change_notify_correlation_id(std::string const& value);
std::string get_subs_change_notify_correlation_id() const; std::string get_subs_change_notify_correlation_id() const;
// void add_report(const amf_event_report_t& report);
// std::vector<amf_event_report_t> get_reports() const;
void add_report(const oai::amf::model::AmfEventReport& report); void add_report(const oai::amf::model::AmfEventReport& report);
void get_reports(std::vector<oai::amf::model::AmfEventReport>& reports) const; void get_reports(std::vector<oai::amf::model::AmfEventReport>& reports) const;
...@@ -100,9 +98,8 @@ class event_notification { ...@@ -100,9 +98,8 @@ class event_notification {
std::string std::string
m_subs_change_notify_correlation_id; // SubsChangeNotifyCorrelationId; m_subs_change_notify_correlation_id; // SubsChangeNotifyCorrelationId;
bool m_subs_change_notify_correlation_id_is_set; bool m_subs_change_notify_correlation_id_is_set;
// std::vector<amf_event_report_t> m_report_list; // Report List
std::vector<oai::amf::model::AmfEventReport> std::vector<oai::amf::model::AmfEventReport>
m_event_report_list; // Report List with Pistache template m_event_report_list; // Report List
bool m_report_list_is_set; bool m_report_list_is_set;
}; };
......
...@@ -3114,18 +3114,6 @@ void amf_n1::handle_ue_reachability_status_change( ...@@ -3114,18 +3114,6 @@ void amf_n1::handle_ue_reachability_status_change(
ev_notif.set_notify_correlation_id(i.get()->notify_correlation_id); ev_notif.set_notify_correlation_id(i.get()->notify_correlation_id);
// ev_notif.set_subs_change_notify_correlation_id(i.get()->notify_uri); // ev_notif.set_subs_change_notify_correlation_id(i.get()->notify_uri);
/* amf_event_report_t report = {};
// TODO
report.m_type = REACHABILITY_REPORT;
report.m_reachability_is_set = true;
if (status == CM_CONNECTED)
report.m_reachability = REACHABLE;
else
report.m_reachability = UNREACHABLE;
report.m_supi_is_set = true;
report.m_supi = supi;
ev_notif.add_report(report);
*/
oai::amf::model::AmfEventReport event_report = {}; oai::amf::model::AmfEventReport event_report = {};
oai::amf::model::AmfEventType amf_event_type = {}; oai::amf::model::AmfEventType amf_event_type = {};
amf_event_type.set_value("REACHABILITY_REPORT"); amf_event_type.set_value("REACHABILITY_REPORT");
...@@ -3182,15 +3170,6 @@ void amf_n1::handle_ue_registration_state_change( ...@@ -3182,15 +3170,6 @@ void amf_n1::handle_ue_registration_state_change(
event_notification ev_notif = {}; event_notification ev_notif = {};
ev_notif.set_notify_correlation_id(i.get()->notify_correlation_id); ev_notif.set_notify_correlation_id(i.get()->notify_correlation_id);
// ev_notif.set_subs_change_notify_correlation_id(i.get()->notify_uri); // ev_notif.set_subs_change_notify_correlation_id(i.get()->notify_uri);
/*
amf_event_report_t report = {};
// TODO
report.m_type = REGISTRATION_STATE_REPORT;
// report. = true;
// report.m_ = UNREACHABLE;
report.m_supi_is_set = true;
report.m_supi = supi;
ev_notif.add_report(report);*/
oai::amf::model::AmfEventReport event_report = {}; oai::amf::model::AmfEventReport event_report = {};
oai::amf::model::AmfEventType amf_event_type = {}; oai::amf::model::AmfEventType amf_event_type = {};
......
...@@ -75,6 +75,7 @@ typedef struct amf_event_s { ...@@ -75,6 +75,7 @@ typedef struct amf_event_s {
} amf_event_t; } amf_event_t;
/*
typedef struct amf_event_state_s { typedef struct amf_event_state_s {
bool m_active; bool m_active;
int32_t m_remain_reports; int32_t m_remain_reports;
...@@ -88,22 +89,8 @@ typedef enum ue_reachability_e { ...@@ -88,22 +89,8 @@ typedef enum ue_reachability_e {
REACHABLE = 2, REACHABLE = 2,
REGULATORY_ONLY = 3 REGULATORY_ONLY = 3
} ue_reachability_t; } ue_reachability_t;
/*
typedef struct amf_event_report_s {
amf_event_type_t m_type; // Mandatory
amf_event_state_t m_state; // Mandatory
std::string m_TimeStamp; // Mandatory
ue_reachability_t m_reachability;
bool m_reachability_is_set;
std::string m_supi;
bool m_supi_is_set;
std::string m_subscription_id;
bool m_subscription_id_is_set;
bool m_any_ue;
bool m_any_ue_is_set;
} amf_event_report_t;
*/ */
enum n1_n2_message_transfer_cause_e { enum n1_n2_message_transfer_cause_e {
ATTEMPTING_TO_REACH_UE = 1, ATTEMPTING_TO_REACH_UE = 1,
N1_N2_TRANSFER_INITIATED = 2, N1_N2_TRANSFER_INITIATED = 2,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment