Some cleaning and bug fixes

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

diff --git a/pkg/control/types.go b/pkg/control/types.go
index d0c7fb8..4d318e0 100644 (file)
--- a/pkg/control/types.go
+++ b/pkg/control/types.go
@@ -22,6 +22,7 @@ package control
 import (
        "bytes"
        "fmt"
+       "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
        "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
        "strconv"
        "strings"
@@ -30,10 +31,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 +48,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 +67,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,11 +89,10 @@ type RmrEndpointList struct {
 }
 
 func (eplist *RmrEndpointList) String() 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, ",")
 }
@@ -97,7 +103,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 +113,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 +126,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 +135,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
                }
        }
@@ -144,25 +150,6 @@ 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
 //-----------------------------------------------------------------------------