X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapptweaks%2Frmrparams.go;h=d4e9479b13d90a6a6fca247f08d68e0b26fd775a;hb=ad41feaeb9dde8ccd6b8b508eb3df8df5d207134;hp=1b4046604c00c48e881af1a7120422dfd536b374;hpb=5f8ffa07163f52d65092d63f5d173149cd5c46ad;p=ric-plt%2Fsubmgr.git diff --git a/pkg/xapptweaks/rmrparams.go b/pkg/xapptweaks/rmrparams.go index 1b40466..d4e9479 100644 --- a/pkg/xapptweaks/rmrparams.go +++ b/pkg/xapptweaks/rmrparams.go @@ -21,10 +21,47 @@ package xapptweaks import ( "bytes" + "crypto/md5" "fmt" "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" ) +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +type RMRMeid struct { + *xapp.RMRMeid +} + +func (meid *RMRMeid) String() string { + if meid.RMRMeid == nil { + return "meid()" + } + str := "meid(" + pad := "" + if len(meid.PlmnID) > 0 { + str += pad + "PlmnID=" + meid.PlmnID + pad = " " + } + if len(meid.EnbID) > 0 { + str += pad + "EnbID=" + meid.EnbID + pad = " " + } + if len(meid.RanName) > 0 { + str += pad + "RanName=" + meid.RanName + pad = " " + } + str += ")" + return str +} + +func NewMeid(meid *xapp.RMRMeid) *RMRMeid { + if meid != nil { + return &RMRMeid{meid} + } + return &RMRMeid{&xapp.RMRMeid{}} +} + //----------------------------------------------------------------------------- // //----------------------------------------------------------------------------- @@ -34,7 +71,7 @@ type RMRParams struct { func (params *RMRParams) String() string { var b bytes.Buffer - fmt.Fprintf(&b, "params(Src=%s Mtype=%d SubId=%d Xid=%s Meid=%s)", params.Src, params.Mtype, params.SubId, params.Xid, params.Meid.RanName) + fmt.Fprintf(&b, "params(Src=%s Mtype=%d SubId=%d Xid=%s Meid=%s Paylens=%d/%d Paymd5=%x)", params.Src, params.Mtype, params.SubId, params.Xid, (&RMRMeid{params.Meid}).String(), params.PayloadLen, len(params.Payload), md5.Sum(params.Payload)) return b.String() }