Code refactor for PduSessionResourceSetupResponse

src/ngap/ngapIEs/PDUSessionResourceFailedToSetupItemSURes.cpp

@@ -32,50 +32,46 @@ PDUSessionResourceFailedToSetupItemSURes::
     ~PDUSessionResourceFailedToSetupItemSURes() {}
 
 //------------------------------------------------------------------------------
-void PDUSessionResourceFailedToSetupItemSURes::
-    setPDUSessionResourceFailedToSetupItemSURes(
-        const PDUSessionID& m_pDUSessionID,
-        const OCTET_STRING_t& m_pDUSessionResourceSetupUnsuccessfulTransfer) {
-  pDUSessionID = m_pDUSessionID;
-  pDUSessionResourceSetupUnsuccessfulTransfer =
-      m_pDUSessionResourceSetupUnsuccessfulTransfer;
+void PDUSessionResourceFailedToSetupItemSURes::set(
+    const PDUSessionID& pdu_session_id,
+    const OCTET_STRING_t& pdu_session_resource_setup_unsuccessful_transfer) {
+  pdu_session_id_ = pdu_session_id;
+  pdu_session_resource_setup_unsuccessful_transfer_ =
+      pdu_session_resource_setup_unsuccessful_transfer;
 }
 
 //------------------------------------------------------------------------------
-void PDUSessionResourceFailedToSetupItemSURes::
-    getPDUSessionResourceFailedToSetupItemSURes(
-        PDUSessionID& m_pDUSessionID,
-        OCTET_STRING_t& m_pDUSessionResourceSetupUnsuccessfulTransfer) {
-  m_pDUSessionID = pDUSessionID;
-  m_pDUSessionResourceSetupUnsuccessfulTransfer =
-      pDUSessionResourceSetupUnsuccessfulTransfer;
+void PDUSessionResourceFailedToSetupItemSURes::get(
+    PDUSessionID& pdu_session_id,
+    OCTET_STRING_t& pdu_session_resource_setup_unsuccessful_transfer) {
+  pdu_session_id = pdu_session_id_;
+  pdu_session_resource_setup_unsuccessful_transfer =
+      pdu_session_resource_setup_unsuccessful_transfer_;
 }
 
 //------------------------------------------------------------------------------
-bool PDUSessionResourceFailedToSetupItemSURes::
-    encode2PDUSessionResourceFailedToSetupItemSURes(
-        Ngap_PDUSessionResourceFailedToSetupItemSURes_t*
-            pduSessionResourceFailedToSetupItemSURes) {
-  if (!pDUSessionID.encode(
-          pduSessionResourceFailedToSetupItemSURes->pDUSessionID))
+bool PDUSessionResourceFailedToSetupItemSURes::encode(
+    Ngap_PDUSessionResourceFailedToSetupItemSURes_t*
+        pdu_session_resource_failed_to_setup_item_su_res) {
+  if (!pdu_session_id_.encode(
+          pdu_session_resource_failed_to_setup_item_su_res->pDUSessionID))
     return false;
-  pduSessionResourceFailedToSetupItemSURes
+  pdu_session_resource_failed_to_setup_item_su_res
       ->pDUSessionResourceSetupUnsuccessfulTransfer =
-      pDUSessionResourceSetupUnsuccessfulTransfer;
+      pdu_session_resource_setup_unsuccessful_transfer_;
 
   return true;
 }
 
 //------------------------------------------------------------------------------
-bool PDUSessionResourceFailedToSetupItemSURes::
-    decodefromPDUSessionResourceFailedToSetupItemSURes(
-        Ngap_PDUSessionResourceFailedToSetupItemSURes_t*
-            pduSessionResourceFailedToSetupItemSURes) {
-  if (!pDUSessionID.decode(
-          pduSessionResourceFailedToSetupItemSURes->pDUSessionID))
+bool PDUSessionResourceFailedToSetupItemSURes::decode(
+    Ngap_PDUSessionResourceFailedToSetupItemSURes_t*
+        pdu_session_resource_failed_to_setup_item_su_res) {
+  if (!pdu_session_id_.decode(
+          pdu_session_resource_failed_to_setup_item_su_res->pDUSessionID))
     return false;
-  pDUSessionResourceSetupUnsuccessfulTransfer =
-      pduSessionResourceFailedToSetupItemSURes
+  pdu_session_resource_setup_unsuccessful_transfer_ =
+      pdu_session_resource_failed_to_setup_item_su_res
           ->pDUSessionResourceSetupUnsuccessfulTransfer;
 
   return true;

src/ngap/ngapIEs/PDUSessionResourceFailedToSetupItemSURes.hpp

@@ -35,23 +35,21 @@ class PDUSessionResourceFailedToSetupItemSURes {
   PDUSessionResourceFailedToSetupItemSURes();
   virtual ~PDUSessionResourceFailedToSetupItemSURes();
 
-  void setPDUSessionResourceFailedToSetupItemSURes(
-      const PDUSessionID& m_pDUSessionID,
-      const OCTET_STRING_t& m_pDUSessionResourceSetupUnsuccessfulTransfer);
-  void getPDUSessionResourceFailedToSetupItemSURes(
-      PDUSessionID& m_pDUSessionID,
-      OCTET_STRING_t& m_pDUSessionResourceSetupUnsuccessfulTransfer);
-
-  bool encode2PDUSessionResourceFailedToSetupItemSURes(
-      Ngap_PDUSessionResourceFailedToSetupItemSURes_t*
-          pduSessionResourceFailedToSetupItemSURes);
-  bool decodefromPDUSessionResourceFailedToSetupItemSURes(
-      Ngap_PDUSessionResourceFailedToSetupItemSURes_t*
-          pduSessionResourceFailedToSetupItemSURes);
+  void set(
+      const PDUSessionID& pdu_session_id,
+      const OCTET_STRING_t& pdu_session_resource_setup_unsuccessful_transfer);
+  void get(
+      PDUSessionID& pdu_session_id,
+      OCTET_STRING_t& pdu_session_resource_setup_unsuccessful_transfer);
+
+  bool encode(Ngap_PDUSessionResourceFailedToSetupItemSURes_t*
+                  pdu_session_resource_failed_to_setup_item_su_res);
+  bool decode(Ngap_PDUSessionResourceFailedToSetupItemSURes_t*
+                  pdu_session_resource_failed_to_setup_item_su_res);
 
  private:
-  PDUSessionID pDUSessionID;
-  OCTET_STRING_t pDUSessionResourceSetupUnsuccessfulTransfer;
+  PDUSessionID pdu_session_id_;
+  OCTET_STRING_t pdu_session_resource_setup_unsuccessful_transfer_;
 };
 
 }  // namespace ngap

src/ngap/ngapIEs/PDUSessionResourceFailedToSetupListSURes.cpp

@@ -32,33 +32,29 @@ PDUSessionResourceFailedToSetupListSURes::
     ~PDUSessionResourceFailedToSetupListSURes() {}
 
 //------------------------------------------------------------------------------
-void PDUSessionResourceFailedToSetupListSURes::
-    setPDUSessionResourceFailedToSetupListSURes(
-        const std::vector<PDUSessionResourceFailedToSetupItemSURes>& list) {
-  itemSUResList = list;
+void PDUSessionResourceFailedToSetupListSURes::set(
+    const std::vector<PDUSessionResourceFailedToSetupItemSURes>& list) {
+  item_list_ = list;
 }
 
 //------------------------------------------------------------------------------
-void PDUSessionResourceFailedToSetupListSURes::
-    getPDUSessionResourceFailedToSetupListSURes(
-        std::vector<PDUSessionResourceFailedToSetupItemSURes>& list) {
-  list = itemSUResList;
+void PDUSessionResourceFailedToSetupListSURes::get(
+    std::vector<PDUSessionResourceFailedToSetupItemSURes>& list) {
+  list = item_list_;
 }
 //------------------------------------------------------------------------------
-bool PDUSessionResourceFailedToSetupListSURes::
-    encode2PDUSessionResourceFailedToSetupListSURes(
-        Ngap_PDUSessionResourceFailedToSetupListSURes_t*
-            pduSessionResourceFailedToSetupListSURes) {
-  for (auto& item : itemSUResList) {
-    Ngap_PDUSessionResourceFailedToSetupItemSURes_t* failedToResponse =
+bool PDUSessionResourceFailedToSetupListSURes::encode(
+    Ngap_PDUSessionResourceFailedToSetupListSURes_t*
+        pdu_session_resource_failed_to_setup_list_su_res) {
+  for (auto& item : item_list_) {
+    Ngap_PDUSessionResourceFailedToSetupItemSURes_t* item_su_res =
         (Ngap_PDUSessionResourceFailedToSetupItemSURes_t*) calloc(
             1, sizeof(Ngap_PDUSessionResourceFailedToSetupItemSURes_t));
-    if (!failedToResponse) return false;
-    if (!item.encode2PDUSessionResourceFailedToSetupItemSURes(failedToResponse))
-      return false;
+    if (!item_su_res) return false;
+    if (!item.encode(item_su_res)) return false;
     if (ASN_SEQUENCE_ADD(
-            &pduSessionResourceFailedToSetupListSURes->list,
-            failedToResponse) != 0)
+            &pdu_session_resource_failed_to_setup_list_su_res->list,
+            item_su_res) != 0)
       return false;
   }
 
@@ -66,17 +62,16 @@ bool PDUSessionResourceFailedToSetupListSURes::
 }
 
 //------------------------------------------------------------------------------
-bool PDUSessionResourceFailedToSetupListSURes::
-    decodefromPDUSessionResourceFailedToSetupListSURes(
-        Ngap_PDUSessionResourceFailedToSetupListSURes_t*
-            pduSessionResourceFailedToSetupListSURes) {
-  for (int i = 0; i < pduSessionResourceFailedToSetupListSURes->list.count;
-       i++) {
+bool PDUSessionResourceFailedToSetupListSURes::decode(
+    Ngap_PDUSessionResourceFailedToSetupListSURes_t*
+        pdu_session_resource_failed_to_setup_list_su_res) {
+  for (int i = 0;
+       i < pdu_session_resource_failed_to_setup_list_su_res->list.count; i++) {
     PDUSessionResourceFailedToSetupItemSURes item = {};
-    if (!item.decodefromPDUSessionResourceFailedToSetupItemSURes(
-            pduSessionResourceFailedToSetupListSURes->list.array[i]))
+    if (!item.decode(
+            pdu_session_resource_failed_to_setup_list_su_res->list.array[i]))
       return false;
-    itemSUResList.push_back(item);
+    item_list_.push_back(item);
   }
 
   return true;

src/ngap/ngapIEs/PDUSessionResourceFailedToSetupListSURes.hpp

@@ -36,20 +36,16 @@ class PDUSessionResourceFailedToSetupListSURes {
   PDUSessionResourceFailedToSetupListSURes();
   virtual ~PDUSessionResourceFailedToSetupListSURes();
 
-  void setPDUSessionResourceFailedToSetupListSURes(
-      const std::vector<PDUSessionResourceFailedToSetupItemSURes>& item);
-  void getPDUSessionResourceFailedToSetupListSURes(
-      std::vector<PDUSessionResourceFailedToSetupItemSURes>& item);
-
-  bool encode2PDUSessionResourceFailedToSetupListSURes(
-      Ngap_PDUSessionResourceFailedToSetupListSURes_t*
-          pduSessionResourceFailedToSetupListSURes);
-  bool decodefromPDUSessionResourceFailedToSetupListSURes(
-      Ngap_PDUSessionResourceFailedToSetupListSURes_t*
-          pduSessionResourceFailedToSetupListSURes);
+  void set(const std::vector<PDUSessionResourceFailedToSetupItemSURes>& item);
+  void get(std::vector<PDUSessionResourceFailedToSetupItemSURes>& item);
+
+  bool encode(Ngap_PDUSessionResourceFailedToSetupListSURes_t*
+                  pdu_session_resource_failed_to_setup_list_su_res);
+  bool decode(Ngap_PDUSessionResourceFailedToSetupListSURes_t*
+                  pdu_session_resource_failed_to_setup_list_su_res);
 
  private:
-  std::vector<PDUSessionResourceFailedToSetupItemSURes> itemSUResList;
+  std::vector<PDUSessionResourceFailedToSetupItemSURes> item_list_;
 };
 
 }  // namespace ngap

src/ngap/ngapIEs/PDUSessionResourceSetupItemSURes.cpp

@@ -30,43 +30,47 @@ PDUSessionResourceSetupItemSURes::PDUSessionResourceSetupItemSURes() {}
 PDUSessionResourceSetupItemSURes::~PDUSessionResourceSetupItemSURes() {}
 
 //------------------------------------------------------------------------------
-void PDUSessionResourceSetupItemSURes::setPDUSessionResourceSetupItemSURes(
-    const PDUSessionID& m_pDUSessionID,
-    const OCTET_STRING_t& m_pDUSessionResourceSetupResponseTransfer) {
-  pDUSessionID = m_pDUSessionID;
-  pDUSessionResourceSetupResponseTransfer =
-      m_pDUSessionResourceSetupResponseTransfer;
+void PDUSessionResourceSetupItemSURes::set(
+    const PDUSessionID& pdu_session_id,
+    const OCTET_STRING_t& pdu_session_resource_setup_response_transfer) {
+  pdu_session_id_ = pdu_session_id;
+  pdu_session_resource_setup_response_transfer_ =
+      pdu_session_resource_setup_response_transfer;
 }
 
 //------------------------------------------------------------------------------
-void PDUSessionResourceSetupItemSURes::getPDUSessionResourceSetupItemSURes(
-    PDUSessionID& m_pDUSessionID,
-    OCTET_STRING_t& m_pDUSessionResourceSetupResponseTransfer) {
-  m_pDUSessionID = pDUSessionID;
-  m_pDUSessionResourceSetupResponseTransfer =
-      pDUSessionResourceSetupResponseTransfer;
+void PDUSessionResourceSetupItemSURes::get(
+    PDUSessionID& pdu_session_id,
+    OCTET_STRING_t& pdu_session_resource_setup_response_transfer) {
+  pdu_session_id = pdu_session_id_;
+  pdu_session_resource_setup_response_transfer =
+      pdu_session_resource_setup_response_transfer_;
 }
 
 //------------------------------------------------------------------------------
-bool PDUSessionResourceSetupItemSURes::encode2PDUSessionResourceSetupItemSURes(
-    Ngap_PDUSessionResourceSetupItemSURes_t* pduSessionResourceSetupItemSURes) {
-  if (!pDUSessionID.encode(pduSessionResourceSetupItemSURes->pDUSessionID))
+bool PDUSessionResourceSetupItemSURes::encode(
+    Ngap_PDUSessionResourceSetupItemSURes_t*
+        pdu_session_resource_setup_item_su_res) {
+  if (!pdu_session_id_.encode(
+          pdu_session_resource_setup_item_su_res->pDUSessionID))
     return false;
-  pduSessionResourceSetupItemSURes->pDUSessionResourceSetupResponseTransfer =
-      pDUSessionResourceSetupResponseTransfer;
+  pdu_session_resource_setup_item_su_res
+      ->pDUSessionResourceSetupResponseTransfer =
+      pdu_session_resource_setup_response_transfer_;
 
   return true;
 }
 
 //------------------------------------------------------------------------------
-bool PDUSessionResourceSetupItemSURes::
-    decodefromPDUSessionResourceSetupItemSURes(
-        Ngap_PDUSessionResourceSetupItemSURes_t*
-            pduSessionResourceSetupItemSURes) {
-  if (!pDUSessionID.decode(pduSessionResourceSetupItemSURes->pDUSessionID))
+bool PDUSessionResourceSetupItemSURes::decode(
+    Ngap_PDUSessionResourceSetupItemSURes_t*
+        pdu_session_resource_setup_item_su_res) {
+  if (!pdu_session_id_.decode(
+          pdu_session_resource_setup_item_su_res->pDUSessionID))
     return false;
-  pDUSessionResourceSetupResponseTransfer =
-      pduSessionResourceSetupItemSURes->pDUSessionResourceSetupResponseTransfer;
+  pdu_session_resource_setup_response_transfer_ =
+      pdu_session_resource_setup_item_su_res
+          ->pDUSessionResourceSetupResponseTransfer;
 
   return true;
 }

src/ngap/ngapIEs/PDUSessionResourceSetupItemSURes.hpp

@@ -35,23 +35,21 @@ class PDUSessionResourceSetupItemSURes {
   PDUSessionResourceSetupItemSURes();
   virtual ~PDUSessionResourceSetupItemSURes();
 
-  void setPDUSessionResourceSetupItemSURes(
-      const PDUSessionID& m_pDUSessionID,
-      const OCTET_STRING_t& m_pDUSessionResourceSetupResponseTransfer);
-  void getPDUSessionResourceSetupItemSURes(
-      PDUSessionID& m_pDUSessionID,
-      OCTET_STRING_t& m_pDUSessionResourceSetupResponseTransfer);
-
-  bool encode2PDUSessionResourceSetupItemSURes(
-      Ngap_PDUSessionResourceSetupItemSURes_t*
-          pduSessionResourceSetupItemSURes);
-  bool decodefromPDUSessionResourceSetupItemSURes(
-      Ngap_PDUSessionResourceSetupItemSURes_t*
-          pduSessionResourceSetupItemSURes);
+  void set(
+      const PDUSessionID& pdu_session_id,
+      const OCTET_STRING_t& pdu_session_resource_setup_response_transfer);
+  void get(
+      PDUSessionID& pdu_session_id,
+      OCTET_STRING_t& pdu_session_resource_setup_response_transfer);
+
+  bool encode(Ngap_PDUSessionResourceSetupItemSURes_t*
+                  pdu_session_resource_setup_item_su_res);
+  bool decode(Ngap_PDUSessionResourceSetupItemSURes_t*
+                  pdu_session_resource_setup_item_su_res);
 
  private:
-  PDUSessionID pDUSessionID;                               // Mandatory
-  OCTET_STRING_t pDUSessionResourceSetupResponseTransfer;  // Mandatory
+  PDUSessionID pdu_session_id_;                                  // Mandatory
+  OCTET_STRING_t pdu_session_resource_setup_response_transfer_;  // Mandatory
 };
 
 }  // namespace ngap

src/ngap/ngapIEs/PDUSessionResourceSetupListSUReq.cpp

@@ -30,27 +30,29 @@ PDUSessionResourceSetupListSUReq::PDUSessionResourceSetupListSUReq() {}
 PDUSessionResourceSetupListSUReq::~PDUSessionResourceSetupListSUReq() {}
 
 //------------------------------------------------------------------------------
-void PDUSessionResourceSetupListSUReq::setPDUSessionResourceSetupListSUReq(
+void PDUSessionResourceSetupListSUReq::set(
     const std::vector<PDUSessionResourceSetupItemSUReq>& list) {
-  itemSUReqList = list;
+  item_list_ = list;
 }
 
 //------------------------------------------------------------------------------
-void PDUSessionResourceSetupListSUReq::getPDUSessionResourceSetupListSUReq(
+void PDUSessionResourceSetupListSUReq::get(
     std::vector<PDUSessionResourceSetupItemSUReq>& list) {
-  list = itemSUReqList;
+  list = item_list_;
 }
 
 //------------------------------------------------------------------------------
-bool PDUSessionResourceSetupListSUReq::encode2PDUSessionResourceSetupListSUReq(
-    Ngap_PDUSessionResourceSetupListSUReq_t* pduSessionResourceSetupListSUReq) {
-  for (auto& item : itemSUReqList) {
+bool PDUSessionResourceSetupListSUReq::encode(
+    Ngap_PDUSessionResourceSetupListSUReq_t*
+        pdu_session_resource_setup_list_su_req) {
+  for (auto& item : item_list_) {
     Ngap_PDUSessionResourceSetupItemSUReq_t* request =
         (Ngap_PDUSessionResourceSetupItemSUReq_t*) calloc(
             1, sizeof(Ngap_PDUSessionResourceSetupItemSUReq_t));
     if (!request) return false;
     if (!item.encode(request)) return false;
-    if (ASN_SEQUENCE_ADD(&pduSessionResourceSetupListSUReq->list, request) != 0)
+    if (ASN_SEQUENCE_ADD(
+            &pdu_session_resource_setup_list_su_req->list, request) != 0)
       return false;
   }
 
@@ -58,15 +60,14 @@ bool PDUSessionResourceSetupListSUReq::encode2PDUSessionResourceSetupListSUReq(
 }
 
 //------------------------------------------------------------------------------
-bool PDUSessionResourceSetupListSUReq::
-    decodefromPDUSessionResourceSetupListSUReq(
-        Ngap_PDUSessionResourceSetupListSUReq_t*
-            pduSessionResourceSetupListSUReq) {
-  for (int i = 0; i < pduSessionResourceSetupListSUReq->list.count; i++) {
+bool PDUSessionResourceSetupListSUReq::decode(
+    Ngap_PDUSessionResourceSetupListSUReq_t*
+        pdu_session_resource_setup_list_su_req) {
+  for (int i = 0; i < pdu_session_resource_setup_list_su_req->list.count; i++) {
     PDUSessionResourceSetupItemSUReq item = {};
-    if (!item.decode(pduSessionResourceSetupListSUReq->list.array[i]))
+    if (!item.decode(pdu_session_resource_setup_list_su_req->list.array[i]))
       return false;
-    itemSUReqList.push_back(item);
+    item_list_.push_back(item);
   }
 
   return true;

src/ngap/ngapIEs/PDUSessionResourceSetupListSUReq.hpp

@@ -36,20 +36,16 @@ class PDUSessionResourceSetupListSUReq {
   PDUSessionResourceSetupListSUReq();
   virtual ~PDUSessionResourceSetupListSUReq();
 
-  void setPDUSessionResourceSetupListSUReq(
-      const std::vector<PDUSessionResourceSetupItemSUReq>& itemSUReqList);
-  void getPDUSessionResourceSetupListSUReq(
-      std::vector<PDUSessionResourceSetupItemSUReq>& list);
-
-  bool encode2PDUSessionResourceSetupListSUReq(
-      Ngap_PDUSessionResourceSetupListSUReq_t*
-          pduSessionResourceSetupListSUReq);
-  bool decodefromPDUSessionResourceSetupListSUReq(
-      Ngap_PDUSessionResourceSetupListSUReq_t*
-          pduSessionResourceSetupListSUReq);
+  void set(const std::vector<PDUSessionResourceSetupItemSUReq>& list);
+  void get(std::vector<PDUSessionResourceSetupItemSUReq>& list);
+
+  bool encode(Ngap_PDUSessionResourceSetupListSUReq_t*
+                  pdu_session_resource_setup_list_su_req);
+  bool decode(Ngap_PDUSessionResourceSetupListSUReq_t*
+                  pdu_session_resource_setup_list_su_req);
 
  private:
-  std::vector<PDUSessionResourceSetupItemSUReq> itemSUReqList;
+  std::vector<PDUSessionResourceSetupItemSUReq> item_list_;
 };
 
 }  // namespace ngap

src/ngap/ngapIEs/PDUSessionResourceSetupListSURes.cpp

@@ -30,28 +30,29 @@ PDUSessionResourceSetupListSURes::PDUSessionResourceSetupListSURes() {}
 PDUSessionResourceSetupListSURes::~PDUSessionResourceSetupListSURes() {}
 
 //------------------------------------------------------------------------------
-void PDUSessionResourceSetupListSURes::setPDUSessionResourceSetupListSURes(
+void PDUSessionResourceSetupListSURes::set(
     const std::vector<PDUSessionResourceSetupItemSURes>& list) {
-  itemSUResList = list;
+  item_list_ = list;
 }
 
 //------------------------------------------------------------------------------
-void PDUSessionResourceSetupListSURes::getPDUSessionResourceSetupListSURes(
+void PDUSessionResourceSetupListSURes::get(
     std::vector<PDUSessionResourceSetupItemSURes>& list) {
-  list = itemSUResList;
+  list = item_list_;
 }
 
 //------------------------------------------------------------------------------
-bool PDUSessionResourceSetupListSURes::encode2PDUSessionResourceSetupListSURes(
-    Ngap_PDUSessionResourceSetupListSURes_t* pduSessionResourceSetupListSURes) {
-  for (auto& item : itemSUResList) {
+bool PDUSessionResourceSetupListSURes::encode(
+    Ngap_PDUSessionResourceSetupListSURes_t*
+        pdu_session_resource_setup_list_su_res) {
+  for (auto& item : item_list_) {
     Ngap_PDUSessionResourceSetupItemSURes_t* response =
         (Ngap_PDUSessionResourceSetupItemSURes_t*) calloc(
             1, sizeof(Ngap_PDUSessionResourceSetupItemSURes_t));
     if (!response) return false;
-    if (!item.encode2PDUSessionResourceSetupItemSURes(response)) return false;
-    if (ASN_SEQUENCE_ADD(&pduSessionResourceSetupListSURes->list, response) !=
-        0)
+    if (!item.encode(response)) return false;
+    if (ASN_SEQUENCE_ADD(
+            &pdu_session_resource_setup_list_su_res->list, response) != 0)
       return false;
   }
 
@@ -59,16 +60,14 @@ bool PDUSessionResourceSetupListSURes::encode2PDUSessionResourceSetupListSURes(
 }
 
 //------------------------------------------------------------------------------
-bool PDUSessionResourceSetupListSURes::
-    decodefromPDUSessionResourceSetupListSURes(
-        Ngap_PDUSessionResourceSetupListSURes_t*
-            pduSessionResourceSetupListSURes) {
-  for (int i = 0; i < pduSessionResourceSetupListSURes->list.count; i++) {
+bool PDUSessionResourceSetupListSURes::decode(
+    Ngap_PDUSessionResourceSetupListSURes_t*
+        pdu_session_resource_setup_list_su_res) {
+  for (int i = 0; i < pdu_session_resource_setup_list_su_res->list.count; i++) {
     PDUSessionResourceSetupItemSURes item = {};
-    if (!item.decodefromPDUSessionResourceSetupItemSURes(
-            pduSessionResourceSetupListSURes->list.array[i]))
+    if (!item.decode(pdu_session_resource_setup_list_su_res->list.array[i]))
       return false;
-    itemSUResList.push_back(item);
+    item_list_.push_back(item);
   }
 
   return true;

src/ngap/ngapIEs/PDUSessionResourceSetupListSURes.hpp

@@ -36,20 +36,16 @@ class PDUSessionResourceSetupListSURes {
   PDUSessionResourceSetupListSURes();
   virtual ~PDUSessionResourceSetupListSURes();
 
-  void setPDUSessionResourceSetupListSURes(
-      const std::vector<PDUSessionResourceSetupItemSURes>& list);
-  void getPDUSessionResourceSetupListSURes(
-      std::vector<PDUSessionResourceSetupItemSURes>& list);
-
-  bool encode2PDUSessionResourceSetupListSURes(
-      Ngap_PDUSessionResourceSetupListSURes_t*
-          pduSessionResourceSetupListSURes);
-  bool decodefromPDUSessionResourceSetupListSURes(
-      Ngap_PDUSessionResourceSetupListSURes_t*
-          pduSessionResourceSetupListSURes);
+  void set(const std::vector<PDUSessionResourceSetupItemSURes>& list);
+  void get(std::vector<PDUSessionResourceSetupItemSURes>& list);
+
+  bool encode(Ngap_PDUSessionResourceSetupListSURes_t*
+                  pdu_session_resource_setup_list_su_res);
+  bool decode(Ngap_PDUSessionResourceSetupListSURes_t*
+                  pdu_session_resource_setup_list_su_res);
 
  private:
-  std::vector<PDUSessionResourceSetupItemSURes> itemSUResList;
+  std::vector<PDUSessionResourceSetupItemSURes> item_list_;
 };
 
 }  // namespace ngap

src/ngap/ngapMsgs/PduSessionResourceSetupRequest.cpp

@@ -228,8 +228,7 @@ void PduSessionResourceSetupRequestMsg::setPduSessionResourceSetupRequestList(
     itemSUReqList.push_back(itemSUReq);
   }
 
-  pduSessionResourceSetupRequestList.setPDUSessionResourceSetupListSUReq(
-      itemSUReqList);
+  pduSessionResourceSetupRequestList.set(itemSUReqList);
 
   Ngap_PDUSessionResourceSetupRequestIEs_t* ie =
       (Ngap_PDUSessionResourceSetupRequestIEs_t*) calloc(
@@ -239,9 +238,8 @@ void PduSessionResourceSetupRequestMsg::setPduSessionResourceSetupRequestList(
   ie->value.present =
       Ngap_PDUSessionResourceSetupRequestIEs__value_PR_PDUSessionResourceSetupListSUReq;
 
-  int ret = pduSessionResourceSetupRequestList
-                .encode2PDUSessionResourceSetupListSUReq(
-                    &ie->value.choice.PDUSessionResourceSetupListSUReq);
+  int ret = pduSessionResourceSetupRequestList.encode(
+      &ie->value.choice.PDUSessionResourceSetupListSUReq);
   if (!ret) {
     Logger::ngap().error(
         "Encode NGAP PDUSessionResourceSetupListSUReq IE error");
@@ -260,8 +258,7 @@ void PduSessionResourceSetupRequestMsg::setPduSessionResourceSetupRequestList(
 bool PduSessionResourceSetupRequestMsg::getPduSessionResourceSetupRequestList(
     std::vector<PDUSessionResourceSetupRequestItem_t>& list) {
   std::vector<PDUSessionResourceSetupItemSUReq> itemSUReqList;
-  pduSessionResourceSetupRequestList.getPDUSessionResourceSetupListSUReq(
-      itemSUReqList);
+  pduSessionResourceSetupRequestList.get(itemSUReqList);
 
   for (auto& item : itemSUReqList) {
     PDUSessionResourceSetupRequestItem_t request = {};
@@ -391,11 +388,9 @@ bool PduSessionResourceSetupRequestMsg::decodeFromPdu(
             pduSessionResourceSetupRequestIEs->protocolIEs.list.array[i]
                     ->value.present ==
                 Ngap_PDUSessionResourceSetupRequestIEs__value_PR_PDUSessionResourceSetupListSUReq) {
-          if (!pduSessionResourceSetupRequestList
-                   .decodefromPDUSessionResourceSetupListSUReq(
-                       &pduSessionResourceSetupRequestIEs->protocolIEs.list
-                            .array[i]
-                            ->value.choice.PDUSessionResourceSetupListSUReq)) {
+          if (!pduSessionResourceSetupRequestList.decode(
+                  &pduSessionResourceSetupRequestIEs->protocolIEs.list.array[i]
+                       ->value.choice.PDUSessionResourceSetupListSUReq)) {
             Logger::ngap().error(
                 "Decoded NGAP PDUSessionResourceSetupListSUReq IE error");
             return false;

src/ngap/ngapMsgs/PduSessionResourceSetupResponse.hpp

@@ -56,9 +56,9 @@ class PduSessionResourceSetupResponseMsg : public NgapUEMessage {
 
  private:
   Ngap_PDUSessionResourceSetupResponse_t* pduSessionResourceSetupResponseIEs;
-  PDUSessionResourceSetupListSURes*
+  std::optional<PDUSessionResourceSetupListSURes>
       pduSessionResourceSetupResponseList;  // Optional
-  PDUSessionResourceFailedToSetupListSURes*
+  std::optional<PDUSessionResourceFailedToSetupListSURes>
       pduSessionResourceFailedToSetupResponseList;  // Optional
 };