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

diff --git a/pkg/control/types.go b/pkg/control/types.go
index d0c7fb8..5408f48 100644
--- a/pkg/control/types.go
+++ b/pkg/control/types.go
@@ -20,9 +20,7 @@
 package control
 
 import (
-	"bytes"
-	"fmt"
-	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+	"gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
 	"strconv"
 	"strings"
 )
@@ -30,10 +28,12 @@ import (
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
-type RmrDatagram struct {
-	MessageType    int
-	SubscriptionId uint16
-	Payload        []byte
+type RequestId struct {
+	e2ap.RequestId
+}
+
+func (rid *RequestId) String() string {
+	return "reqid(" + rid.RequestId.String() + ")"
 }
 
 //-----------------------------------------------------------------------------
@@ -45,7 +45,15 @@ type RmrEndpoint struct {
 }
 
 func (endpoint RmrEndpoint) String() string {
-	return endpoint.Get()
+	return endpoint.Addr + ":" + strconv.FormatUint(uint64(endpoint.Port), 10)
+}
+
+func (endpoint *RmrEndpoint) Equal(ep *RmrEndpoint) bool {
+	if (endpoint.Addr == ep.Addr) &&
+		(endpoint.Port == ep.Port) {
+		return true
+	}
+	return false
 }
 
 func (endpoint *RmrEndpoint) GetAddr() string {
@@ -56,10 +64,6 @@ 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 {
@@ -82,13 +86,17 @@ type RmrEndpointList struct {
 }
 
 func (eplist *RmrEndpointList) String() string {
+	valuesText := eplist.StringList()
+	return strings.Join(valuesText, ",")
+}
+
+func (eplist *RmrEndpointList) StringList() []string {
+	tmpList := eplist.Endpoints
 	valuesText := []string{}
-	for i := range eplist.Endpoints {
-		ep := eplist.Endpoints[i]
-		text := ep.String()
-		valuesText = append(valuesText, text)
+	for i := range tmpList {
+		valuesText = append(valuesText, tmpList[i].String())
 	}
-	return strings.Join(valuesText, ",")
+	return valuesText
 }
 
 func (eplist *RmrEndpointList) Size() int {
@@ -97,7 +105,7 @@ func (eplist *RmrEndpointList) Size() int {
 
 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) {
+		if eplist.Endpoints[i].Equal(ep) {
 			return false
 		}
 	}
@@ -107,7 +115,7 @@ func (eplist *RmrEndpointList) AddEndpoint(ep *RmrEndpoint) bool {
 
 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) {
+		if eplist.Endpoints[i].Equal(ep) {
 			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]
@@ -120,7 +128,7 @@ func (eplist *RmrEndpointList) DelEndpoint(ep *RmrEndpoint) bool {
 func (eplist *RmrEndpointList) DelEndpoints(otheplist *RmrEndpointList) bool {
 	var retval bool = false
 	for i := range otheplist.Endpoints {
-		if eplist.DelEndpoint(&eplist.Endpoints[i]) {
+		if eplist.DelEndpoint(&otheplist.Endpoints[i]) {
 			retval = true
 		}
 	}
@@ -129,7 +137,7 @@ func (eplist *RmrEndpointList) DelEndpoints(otheplist *RmrEndpointList) bool {
 
 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) {
+		if eplist.Endpoints[i].Equal(ep) {
 			return true
 		}
 	}
@@ -143,35 +151,3 @@ func NewRmrEndpoint(src string) *RmrEndpoint {
 	}
 	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()
-}