X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_e2ap_mgr.h;h=1ed73514f892c7126291d4341c03eb6d6b3dcf32;hb=e96cb439cd4a7a6f55e3fab7caed978e38bd62b4;hp=a4d05f9ca37131c9df54bc6e67a61111fd3d23f4;hpb=203a75d30fe226a5496af4a0bc50ea0671e32df3;p=o-du%2Fl2.git

diff --git a/src/du_app/du_e2ap_mgr.h b/src/du_app/du_e2ap_mgr.h
index a4d05f9ca..1ed73514f 100644
--- a/src/du_app/du_e2ap_mgr.h
+++ b/src/du_app/du_e2ap_mgr.h
@@ -41,21 +41,6 @@
 #define STRING_SIZE_150_BYTES 150
 #define STRING_SIZE_1000_BYTES 1000
 
-#define SHORT_NAME "ORAN-E2SM-KPM"
-#define SERVICE_MODEL_OID  "1.3.6.1.4.1.53148.1.2.2.2"
-#define DESCRIPTION "KPM Monitor"
-#define NUM_OF_EVENT_TRIGGER_STYLE_SUPPORTED 1
-#define EVENT_TRIGGER_STYLE_NAME "Periodic Report"
-#define EVENT_TRIGGER_STYLE_TYPE 1
-#define EVENT_TRIGGER_STYLE_FORMAT_TYPE 1
-#define NUM_OF_RIC_REPORT_STYLE_SUPPORTED 1
-#define REPORT_STYLE_NAME "E2 Node Measurement"
-#define REPORT_STYLE_TYPE 1
-#define REPORT_ACTION_FORMAT_TYPE 1
-#define MEASUREMENT_TYPE_NAME (char*[]) {"RRU.PrbTotDl", "RRU.PrbTotUl"}
-#define RIC_INDICATION_HEADER_FORMAT 1
-#define RIC_INDICATION_MESSAGE_FORMAT 1
-
 /* O-RAN.WG3.E2AP-R003-v03.00 : Section 9.2.26 */
 typedef enum
 {
@@ -400,8 +385,7 @@ typedef struct
    RicRequestId           requestId;
    uint16_t               ranFuncId;
    EventTriggerDefinition eventTriggerDefinition;
-   uint8_t                numOfActions;
-   ActionInfo             actionSequence[MAX_RIC_ACTION];  
+   CmLListCp              actionSequence; 
    CmTimer                ricSubsReportTimer;
    ConfigType             action;
    E2FailureCause         failureCause; /* Used only when a subscription is required to be deleted */
@@ -423,6 +407,26 @@ typedef struct pendingSubsRspInfo
    RejectedAction  rejectedActionList[MAX_RIC_ACTION];
 }PendingSubsRspInfo;
 
+typedef struct actionStatus
+{
+   uint8_t         numOfAcceptedActions;
+   uint8_t         acceptedActionList[MAX_RIC_ACTION];
+   uint8_t         numOfRejectedActions;
+   RejectedAction  rejectedActionList[MAX_RIC_ACTION];
+}ActionStatus;
+
+typedef struct pendingSubsModRspInfo 
+{
+   RicRequestId requestId;
+   uint16_t     ranFuncId;
+   bool         addActionCompleted;
+   ActionStatus addActionStatus;
+   bool         modActionCompleted;
+   ActionStatus modActionStatus;
+   bool         removeActionCompleted;
+   ActionStatus removeActionStatus;
+}PendingSubsModRspInfo;
+
 typedef struct
 {
    /* O-RAN.WG3.E2SM-KPM-R003-v03.00 : Section 8.2.2.1 */
@@ -439,6 +443,8 @@ typedef struct
    CmLListCp        subscriptionList;
    uint8_t          numPendingSubsRsp;
    PendingSubsRspInfo pendingSubsRspInfo[MAX_PENDING_SUBSCRIPTION_RSP];
+   uint8_t            numPendingSubsModRsp;
+   PendingSubsModRspInfo pendingSubsModRspInfo[MAX_PENDING_SUBSCRIPTION_RSP];
 }RanFunction;
 
 /* O-RAN.WG3.E2AP-R003-v03.00 : Section 9.2.26-9.2.27 */
@@ -495,8 +501,22 @@ typedef struct
    E2TimersInfo     e2TimersInfo;
 }E2apDb;
 
+typedef struct e2ConnectionItem
+{
+   uint32_t    ipV4Addr;
+   AssocUsage  usage;
+}E2ConnectionItem;
+
+typedef struct e2ConnectionList
+{
+   uint8_t numOfE2ConnectionSetup;
+   E2ConnectionItem setupE2Connection[MAX_TNL_ASSOCIATION];
+   uint8_t numOfE2ConnectionFailedToSetup;
+   E2ConnectionItem failedToSetupE2Connection[MAX_TNL_ASSOCIATION];
+}E2ConnectionList;
+
 uint8_t assignTransactionId();
-ActionInfo *fetchActionInfoFromActionId(uint8_t actionId, RicSubscription *ricSubscriptionInfo);
+ActionInfo *fetchActionInfoFromActionId(uint8_t actionId, RicSubscription *ricSubscriptionInfo, CmLList ** actionNode, ConfigType configType);
 RicSubscription *fetchSubsInfoFromRicReqId(RicRequestId ricReqId, RanFunction *ranFuncDb, CmLList **ricSubscriptionNode);
 RanFunction *fetchRanFuncFromRanFuncId(uint16_t ranFuncId);
 uint8_t fetchSubsInfoFromSubsId(uint64_t subscriptionId, RanFunction **ranFuncDb, CmLList **ricSubscriptionNode, \
@@ -516,8 +536,16 @@ uint8_t fillE2NodeComponentRspInfo(InterfaceType interfaceType, uint64_t compone
 void deleteRicSubscriptionList(CmLListCp *subscriptionList);
 void deleteRicSubscriptionNode(CmLList *ricSubscriptionInfo);
 void deleteMeasurementInfoList(CmLListCp *measInfoList);
-void deleteActionSequence(ActionInfo *action);
+void deleteActionSequence(CmLList *action);
 void deleteMeasuredValueList(CmLListCp *measuredValueList);
+void removeE2NodeInformation();
+void encodeSubscriptionId(uint64_t *subscriptionId, uint16_t ranFuncId, RicRequestId ricReqId);
+uint8_t e2ProcStatsDeleteRsp(MacStatsDeleteRsp *statsDeleteRsp);
+uint8_t fillRicSubsInMacStatsModificationReq(MacStatsModificationReq *macStatsModReq, RicSubscription* ricSubscriptionInfo);
+uint8_t e2ProcActionDeleteRsp(MacStatsDeleteRsp *statsDeleteRsp);
+uint8_t e2ProcStatsModificationRsp(MacStatsModificationRsp *statsModificationRsp);
+uint8_t duProcPendingSubsModRsp(RicSubscription *ricSubscriptionInfo, PendingSubsModRspInfo *pendingSubsModRsp);
+
 /**********************************************************************
   End of file
  **********************************************************************/