SVC address support for rmr stubs.

[ric-plt/submgr.git] / pkg / control / types.go

diff --git a/pkg/control/types.go b/pkg/control/types.go
index 22c44b3..08bcda4 100644 (file)
--- a/pkg/control/types.go
+++ b/pkg/control/types.go
@@ -20,71 +20,16 @@
 package control
 
 import (
-       "bytes"
-       "fmt"
-       "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
-       "strconv"
+       "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
 )
 
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
-type RmrDatagram struct {
-       MessageType    int
-       SubscriptionId uint16
-       Payload        []byte
+type RequestId struct {
+       e2ap.RequestId
 }
 
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type SubRouteInfo struct {
-       Command Action
-       Address string
-       Port    uint16
-       SubID   uint16
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type RmrEndpoint struct {
-       Addr string // xapp addr
-       Port uint16 // xapp port
-}
-
-func (endpoint RmrEndpoint) String() string {
-       return endpoint.Addr + ":" + strconv.FormatUint(uint64(endpoint.Port), 10)
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type Action int
-
-func (act Action) String() string {
-       actions := [...]string{
-               "CREATE",
-               "MERGE",
-               "NONE",
-               "DELETE",
-       }
-
-       if act < CREATE || act > DELETE {
-               return "UNKNOWN"
-       }
-       return actions[act]
-}
-
-//-----------------------------------------------------------------------------
-// To add own method for rmrparams
-//-----------------------------------------------------------------------------
-type RMRParams struct {
-       *xapp.RMRParams
-}
-
-func (params *RMRParams) String() string {
-       var b bytes.Buffer
-       fmt.Fprintf(&b, "Src: %s, Mtype: %s(%d), SubId: %v, Xid: %s, Meid: %v", params.Src, xapp.RicMessageTypeToName[params.Mtype], params.Mtype, params.SubId, params.Xid, params.Meid)
-       return b.String()
+func (rid *RequestId) String() string {
+       return "reqid(" + rid.RequestId.String() + ")"
 }