E2AP and E2SM-RC version upgrade to E2aP v.2.0 and E2SM-RC to v1.0.1

[ric-app/rc.git] / control / rcTypes.go

diff --git a/control/rcTypes.go b/control/rcTypes.go
index 0204451..e558d02 100644 (file)
--- a/control/rcTypes.go
+++ b/control/rcTypes.go
@@ -1,9 +1,10 @@
 package control\r
 \r
 import (\r
-       "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"\r
-       rc "gerrit.o-ran-sc.org/r/ric-app/rc/protocol/grpc/ricmsgcommrpc/rc"\r
        "sync"\r
+\r
+       rc "gerrit.o-ran-sc.org/r/ric-app/rc/protocol/grpc/ricmsgcommrpc/rc"\r
+       "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"\r
 )\r
 \r
 const MAX_CONTROL_REQ_ATTEMPTS = 2\r
@@ -22,10 +23,10 @@ const GRPC_SUCCESS = 0
 const GRPC_ERROR = -1\r
 \r
 type Control struct {\r
-       eventRicControlReqTimePeriod int32                //maximum time for the RIC Subscription Request event creation procedure in the E2 Node\r
+       eventRicControlReqTimePeriod int32                //maximum time for the RIC Control Request creation procedure in the E2 Node\r
        rcChan                       chan *xapp.RMRParams //channel for receiving rmr message\r
-       eventRicControlReqExpiredMap map[int]bool //map for recording the RIC Subscription Request event creation procedure is expired or not\r
-       eventRicControlReqExpiredMu  *sync.Mutex  //mutex for eventCreateExpiredMap\r
+       eventRicControlReqExpiredMap map[int]bool         //map for recording the RIC Control Request event creation procedure is expired or not\r
+       eventRicControlReqExpiredMu  *sync.Mutex          //mutex for eventCreateExpiredMap\r
        ricRequestInstanceID         int\r
 }\r
 \r
@@ -33,3 +34,58 @@ type RicHoControlMsg struct {
        RicControlGrpcReqPtr *rc.RicControlGrpcReq\r
 }\r
 \r
+\r
+type UEid struct {\r
+        amf_UE_NGAP_Id   int64\r
+        pLMNIdentitybuf  string\r
+        aMFRegionIDbuf   string\r
+        aMFSetIDbuf      string\r
+        aMFPointerbuf    string\r
+        F1AP_id         []int64\r
+        E1AP_id         []int64\r
+}\r
+\r
+type ValueInt int64\r
+\r
+type valueReal float64\r
+\r
+type Null int32\r
+\r
+type PrintableString OctetString\r
+\r
+type OctetString struct {\r
+        Buf  []byte\r
+        Size int\r
+}\r
+\r
+type BitString struct {\r
+        Buf        []byte\r
+        Size       int\r
+        BitsUnused int\r
+}\r
+\r
+type ControlAckMsg struct {\r
+        RequestID             int32\r
+        InstanceId            int32\r
+        FuncID                int32\r
+        CallProcessID         []byte\r
+        CallProcessIDLength   int32\r
+        ControlOutcome        []byte\r
+        ControlOutcomeLength  int32\r
+}\r
+\r
+type ControlOutcomeFormat1ItemType struct {\r
+       RanParameterID     int64\r
+       RANParameterValueType int\r
+       RANParameterValue interface{}\r
+}\r
+\r
+type ControlOutcomeFormat1 struct {\r
+       ControlOutcomeFormat1Item      []ControlOutcomeFormat1ItemType\r
+        ControlOutcomeFormat1ItemCount int\r
+}\r
+\r
+type ControlOutcomeMsg struct {\r
+        ControlOutcomeType  int32\r
+        ControlOutcome      interface{}\r
+}\r