X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pkg%2Fcontrol%2Ftypes.go;h=164e80167ba8216d3722131a8cf5c06d7a3f83c8;hb=refs%2Fchanges%2F27%2F2327%2F2;hp=00674c71023de37ba3e11dc118b9a0508727c64a;hpb=8b979ab74153ad8c120743e0f6d868baedcb3b32;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/types.go b/pkg/control/types.go
index 00674c7..164e801 100644
--- a/pkg/control/types.go
+++ b/pkg/control/types.go
@@ -36,16 +36,6 @@ type RmrDatagram struct {
 	Payload        []byte
 }
 
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type SubRouteInfo struct {
-	Command Action
-	Address string
-	Port    uint16
-	SubID   uint16
-}
-
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
@@ -84,6 +74,68 @@ func (endpoint *RmrEndpoint) Set(src string) bool {
 	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 {
@@ -100,7 +152,7 @@ type Action int
 func (act Action) String() string {
 	actions := [...]string{
 		"CREATE",
-		"MERGE",
+		"UPDATE",
 		"NONE",
 		"DELETE",
 	}
@@ -120,6 +172,6 @@ type RMRParams struct {
 
 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)
+	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()
 }