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

diff --git a/pkg/control/types.go b/pkg/control/types.go
index d12233c..00674c7 100644
--- a/pkg/control/types.go
+++ b/pkg/control/types.go
@@ -20,33 +20,106 @@
 package control
 
 import (
+	"bytes"
+	"fmt"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+	"strconv"
+	"strings"
 )
 
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
 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.Get()
+}
+
+func (endpoint *RmrEndpoint) GetAddr() string {
+	return endpoint.Addr
+}
+
+func (endpoint *RmrEndpoint) GetPort() uint16 {
+	return endpoint.Port
+}
+
+func (endpoint *RmrEndpoint) Get() string {
+	return endpoint.Addr + ":" + strconv.FormatUint(uint64(endpoint.Port), 10)
+}
+
+func (endpoint *RmrEndpoint) Set(src string) bool {
+	elems := strings.Split(src, ":")
+	if len(elems) == 2 {
+		srcAddr := elems[0]
+		srcPort, err := strconv.ParseUint(elems[1], 10, 16)
+		if err == nil {
+			endpoint.Addr = srcAddr
+			endpoint.Port = uint16(srcPort)
+			return true
+		}
+	}
+	return false
+}
+
+func NewRmrEndpoint(src string) *RmrEndpoint {
+	ep := &RmrEndpoint{}
+	if ep.Set(src) == false {
+		return nil
+	}
+	return ep
+}
+
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
 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()
 }