X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pkg%2Fcontrol%2Ftypes.go;h=e7403498422d6160a7c54e3cf6c81a68ea77a837;hb=31797b49985822f1d402501f16ab2794838bebba;hp=00674c71023de37ba3e11dc118b9a0508727c64a;hpb=114fa2c930c5a24078b6ceba68254b2f209c5916;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/types.go b/pkg/control/types.go index 00674c7..e740349 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,32 @@ 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) 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 { @@ -120,6 +136,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() }