Addressed review comments

Signed-off-by: Rashmi <[email protected]>

Author: rsarwad

lte/gateway/c/core/oai/include/s1ap_types.hpp

@@ -65,7 +65,8 @@ enum mme_s1_enb_state_s {
   S1AP_SHUTDOWN   /// The S1 state is being torn down due to sctp shutdown.
 };
 
-// Map- Key:uint64_t, Data: pointer to protobuf object, UeDescription
+// Map- Key:comp_s1ap_id of uint64_t, Data: pointer to protobuf object,
+// UeDescription
 typedef magma::proto_map_s<uint64_t, magma::lte::oai::UeDescription*>
     map_uint64_ue_description_t;
 

lte/gateway/c/core/oai/tasks/s1ap/s1ap_state.cpp

@@ -155,7 +155,8 @@ void put_s1ap_ue_state(imsi64_t imsi64) {
     oai::UeDescription* ue_ctxt = s1ap_state_get_ue_imsi(imsi64);
     if (ue_ctxt) {
       auto imsi_str = S1apStateManager::getInstance().get_imsi_str(imsi64);
-      S1apStateManager::getInstance().write_ue_state_to_db(ue_ctxt, imsi_str);
+      S1apStateManager::getInstance().s1ap_write_ue_state_to_db(ue_ctxt,
+                                                                imsi_str);
     }
   }
 }

lte/gateway/c/core/oai/tasks/s1ap/s1ap_state_manager.cpp

@@ -167,7 +167,7 @@ status_code_e S1apStateManager::read_ue_state_from_db() {
       return RETURNerror;
     }
 
-    S1apStateConverter::proto_to_ue(ue_proto, ue_context);
+    ue_context->MergeFrom(ue_proto);
 
     proto_map_rc_t rc =
         state_ue_map.insert(ue_context->comp_s1ap_id(), ue_context);
@@ -240,5 +240,28 @@ map_uint64_ue_description_t* S1apStateManager::get_s1ap_ue_state() {
   return &state_ue_map;
 }
 
+void S1apStateManager::s1ap_write_ue_state_to_db(
+    const oai::UeDescription* ue_context, const std::string& imsi_str) {
+  AssertFatal(
+      is_initialized,
+      "StateManager init() function should be called to initialize state");
+
+  std::string proto_str;
+  redis_client->serialize(*ue_context, proto_str);
+  std::size_t new_hash = std::hash<std::string>{}(proto_str);
+  if (new_hash != this->ue_state_hash[imsi_str]) {
+    std::string key = IMSI_PREFIX + imsi_str + ":" + task_name;
+    if (redis_client->write_proto_str(key, proto_str,
+                                      ue_state_version[imsi_str]) != RETURNok) {
+      OAILOG_ERROR(log_task, "Failed to write UE state to db for IMSI %s",
+                   imsi_str.c_str());
+      return;
+    }
+    this->ue_state_version[imsi_str]++;
+    this->ue_state_hash[imsi_str] = new_hash;
+    OAILOG_DEBUG(log_task, "Finished writing UE state for IMSI %s",
+                 imsi_str.c_str());
+  }
+}
 }  // namespace lte
 }  // namespace magma

lte/gateway/c/core/oai/tasks/s1ap/s1ap_state_manager.hpp

@@ -99,6 +99,8 @@ class S1apStateManager
    */
   s1ap_imsi_map_t* get_s1ap_imsi_map();
   map_uint64_ue_description_t* get_s1ap_ue_state();
+  void s1ap_write_ue_state_to_db(const oai::UeDescription* ue_context,
+                                 const std::string& imsi_str);
 
  private:
   S1apStateManager();