Generalized unittest stubs so frame can be used also in other apps

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

diff --git a/pkg/control/types.go b/pkg/control/types.go
index 00674c7..ab62153 100644 (file)
--- 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,20 +28,12 @@ import (
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
-type RmrDatagram struct {
-       MessageType    int
-       SubscriptionId uint16
-       Payload        []byte
+type RequestId struct {
+       e2ap.RequestId
 }
 
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type SubRouteInfo struct {
-       Command Action
-       Address string
-       Port    uint16
-       SubID   uint16
+func (rid *RequestId) String() string {
+       return "reqid(" + rid.RequestId.String() + ")"
 }
 
 //-----------------------------------------------------------------------------
@@ -55,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 {
@@ -66,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 {
@@ -84,42 +78,71 @@ func (endpoint *RmrEndpoint) Set(src string) bool {
        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",
+type RmrEndpointList struct {
+       Endpoints []RmrEndpoint
+}
+
+func (eplist *RmrEndpointList) String() string {
+       tmpList := eplist.Endpoints
+       valuesText := []string{}
+       for i := range tmpList {
+               valuesText = append(valuesText, tmpList[i].String())
        }
+       return strings.Join(valuesText, ",")
+}
+
+func (eplist *RmrEndpointList) Size() int {
+       return len(eplist.Endpoints)
+}
 
-       if act < CREATE || act > DELETE {
-               return "UNKNOWN"
+func (eplist *RmrEndpointList) AddEndpoint(ep *RmrEndpoint) bool {
+       for i := range eplist.Endpoints {
+               if eplist.Endpoints[i].Equal(ep) {
+                       return false
+               }
        }
-       return actions[act]
+       eplist.Endpoints = append(eplist.Endpoints, *ep)
+       return true
 }
 
-//-----------------------------------------------------------------------------
-// To add own method for rmrparams
-//-----------------------------------------------------------------------------
-type RMRParams struct {
-       *xapp.RMRParams
+func (eplist *RmrEndpointList) DelEndpoint(ep *RmrEndpoint) bool {
+       for i := range eplist.Endpoints {
+               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]
+                       return true
+               }
+       }
+       return false
+}
+
+func (eplist *RmrEndpointList) DelEndpoints(otheplist *RmrEndpointList) bool {
+       var retval bool = false
+       for i := range otheplist.Endpoints {
+               if eplist.DelEndpoint(&otheplist.Endpoints[i]) {
+                       retval = true
+               }
+       }
+       return retval
 }
 
-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()
+func (eplist *RmrEndpointList) HasEndpoint(ep *RmrEndpoint) bool {
+       for i := range eplist.Endpoints {
+               if eplist.Endpoints[i].Equal(ep) {
+                       return true
+               }
+       }
+       return false
+}
+
+func NewRmrEndpoint(src string) *RmrEndpoint {
+       ep := &RmrEndpoint{}
+       if ep.Set(src) == false {
+               return nil
+       }
+       return ep
 }