X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Ftypes.go;h=08bcda4360c2878d3d39939da73b7357a3738044;hb=7348625b9ef03d41dd5a0ca0f6c508376259717e;hp=d0c7fb8948487fd6f7bb2c04e21bd090c372ac4e;hpb=422d018f94aedd9f4c001176b5ff06c786de28eb;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/types.go b/pkg/control/types.go
index d0c7fb8..08bcda4 100644
--- a/pkg/control/types.go
+++ b/pkg/control/types.go
@@ -20,158 +20,16 @@
 package control
 
 import (
-	"bytes"
-	"fmt"
-	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
-	"strconv"
-	"strings"
+	"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 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
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type RmrEndpointList struct {
-	Endpoints []RmrEndpoint
-}
-
-func (eplist *RmrEndpointList) String() string {
-	valuesText := []string{}
-	for i := range eplist.Endpoints {
-		ep := eplist.Endpoints[i]
-		text := ep.String()
-		valuesText = append(valuesText, text)
-	}
-	return strings.Join(valuesText, ",")
-}
-
-func (eplist *RmrEndpointList) Size() int {
-	return len(eplist.Endpoints)
-}
-
-func (eplist *RmrEndpointList) AddEndpoint(ep *RmrEndpoint) bool {
-	for i := range eplist.Endpoints {
-		if (eplist.Endpoints[i].Addr == ep.Addr) && (eplist.Endpoints[i].Port == ep.Port) {
-			return false
-		}
-	}
-	eplist.Endpoints = append(eplist.Endpoints, *ep)
-	return true
-}
-
-func (eplist *RmrEndpointList) DelEndpoint(ep *RmrEndpoint) bool {
-	for i := range eplist.Endpoints {
-		if (eplist.Endpoints[i].Addr == ep.Addr) && (eplist.Endpoints[i].Port == ep.Port) {
-			eplist.Endpoints[i] = eplist.Endpoints[len(eplist.Endpoints)-1]
-			eplist.Endpoints[len(eplist.Endpoints)-1] = RmrEndpoint{"", 0}
-			eplist.Endpoints = eplist.Endpoints[:len(eplist.Endpoints)-1]
-			return true
-		}
-	}
-	return false
-}
-
-func (eplist *RmrEndpointList) DelEndpoints(otheplist *RmrEndpointList) bool {
-	var retval bool = false
-	for i := range otheplist.Endpoints {
-		if eplist.DelEndpoint(&eplist.Endpoints[i]) {
-			retval = true
-		}
-	}
-	return retval
-}
-
-func (eplist *RmrEndpointList) HasEndpoint(ep *RmrEndpoint) bool {
-	for i := range eplist.Endpoints {
-		if (eplist.Endpoints[i].Addr == ep.Addr) && (eplist.Endpoints[i].Port == ep.Port) {
-			return true
-		}
-	}
-	return false
-}
-
-func NewRmrEndpoint(src string) *RmrEndpoint {
-	ep := &RmrEndpoint{}
-	if ep.Set(src) == false {
-		return nil
-	}
-	return ep
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-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, "params(Src=%s Mtype=%s(%d) SubId=%v Xid=%s Meid=%s)", params.Src, xapp.RicMessageTypeToName[params.Mtype], params.Mtype, params.SubId, params.Xid, params.Meid.RanName)
-	return b.String()
+func (rid *RequestId) String() string {
+	return "reqid(" + rid.RequestId.String() + ")"
 }