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"
)
//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------
-type RmrDatagram struct {
- MessageType int
- SubscriptionId uint16
- Payload []byte
+type RequestId struct {
+ e2ap.RequestId
+}
+
+func (rid *RequestId) String() string {
+ return "reqid(" + rid.RequestId.String() + ")"
}
//-----------------------------------------------------------------------------
}
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 {
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 {
}
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 {
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
}
}
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]
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
}
}
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
}
}
}
return ep
}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type Action int
-
-func (act Action) String() string {
- actions := [...]string{
- "CREATE",
- "UPDATE",
- "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()
-}