X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Ftypes.go;h=22c44b3fd11877114f94fd74d9b0fe9057f5326c;hb=refs%2Fchanges%2F97%2F2197%2F6;hp=d12233c08107a0fa69daf03579331419d8942f14;hpb=e00186861608731e2390055a0e1b1cf455670508;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/types.go b/pkg/control/types.go
index d12233c..22c44b3 100644
--- a/pkg/control/types.go
+++ b/pkg/control/types.go
@@ -20,33 +20,71 @@
 package control
 
 import (
+	"bytes"
+	"fmt"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+	"strconv"
 )
 
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
 type RmrDatagram struct {
 	MessageType    int
 	SubscriptionId uint16
 	Payload        []byte
 }
 
-type subRouteInfo struct {
-	Command  Action
-	Address  string
-	Port     uint16
-	SubID    uint16
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+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
 
-type Transaction_key struct {
-	SubID      uint16
-	trans_type Action
+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
 }
 
-type Transaction struct {
-//	Xapp_address          string
-	Xapp_instance_address string
-	Xapp_port             uint16
-	Ric_sub_req           []byte
-	Mbuf                  *xapp.RMRMbuf
+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()
 }