Skip to content

Commit

Permalink
mark query multiple reports
Browse files Browse the repository at this point in the history
  • Loading branch information
Roy-Hu committed Mar 23, 2023
1 parent 3b2d386 commit f500bc6
Showing 1 changed file with 45 additions and 45 deletions.
90 changes: 45 additions & 45 deletions internal/forwarder/gtp5g.go
Original file line number Diff line number Diff line change
Expand Up @@ -1491,51 +1491,51 @@ func (g *Gtp5g) queryURR(lSeid uint64, urrid uint32, ps bool) ([]report.USARepor
return usars, err
}

func (g *Gtp5g) queryMultiURR(lSeidUrridsMap map[uint64][]uint32, ps bool) (map[uint64][]report.USAReport, error) {
var oids []gtp5gnl.OID
for seid, urrIds := range lSeidUrridsMap {
for _, urrId := range urrIds {
oids = append(oids, gtp5gnl.OID{seid, uint64(urrId)})
}
}

c := g.client
if ps {
c = g.psClient
}
rs, err := gtp5gnl.GetMultiReportsOID(c, g.link.link, oids)
if err != nil {
return nil, errors.Wrapf(err, "queryMultiURR")
}

if rs == nil {
return nil, nil
}

usars := make(map[uint64][]report.USAReport)
for _, r := range rs {
usar := report.USAReport{
URRID: r.URRID,
QueryUrrRef: r.QueryUrrRef,
StartTime: r.StartTime,
EndTime: r.EndTime,
}

usar.VolumMeasure = report.VolumeMeasure{
TotalVolume: r.VolMeasurement.TotalVolume,
UplinkVolume: r.VolMeasurement.UplinkVolume,
DownlinkVolume: r.VolMeasurement.DownlinkVolume,
TotalPktNum: r.VolMeasurement.TotalPktNum,
UplinkPktNum: r.VolMeasurement.UplinkPktNum,
DownlinkPktNum: r.VolMeasurement.DownlinkPktNum,
}
usars[r.SEID] = append(usars[r.SEID], usar)
}

g.log.Tracef("queryMultiURR: %+v", usars)

return usars, err
}
// func (g *Gtp5g) queryMultiURR(lSeidUrridsMap map[uint64][]uint32, ps bool) (map[uint64][]report.USAReport, error) {
// var oids []gtp5gnl.OID
// for seid, urrIds := range lSeidUrridsMap {
// for _, urrId := range urrIds {
// oids = append(oids, gtp5gnl.OID{seid, uint64(urrId)})
// }
// }

// c := g.client
// if ps {
// c = g.psClient
// }
// rs, err := gtp5gnl.GetMultiReportsOID(c, g.link.link, oids)
// if err != nil {
// return nil, errors.Wrapf(err, "queryMultiURR")
// }

// if rs == nil {
// return nil, nil
// }

// usars := make(map[uint64][]report.USAReport)
// for _, r := range rs {
// usar := report.USAReport{
// URRID: r.URRID,
// QueryUrrRef: r.QueryUrrRef,
// StartTime: r.StartTime,
// EndTime: r.EndTime,
// }

// usar.VolumMeasure = report.VolumeMeasure{
// TotalVolume: r.VolMeasurement.TotalVolume,
// UplinkVolume: r.VolMeasurement.UplinkVolume,
// DownlinkVolume: r.VolMeasurement.DownlinkVolume,
// TotalPktNum: r.VolMeasurement.TotalPktNum,
// UplinkPktNum: r.VolMeasurement.UplinkPktNum,
// DownlinkPktNum: r.VolMeasurement.DownlinkPktNum,
// }
// usars[r.SEID] = append(usars[r.SEID], usar)
// }

// g.log.Tracef("queryMultiURR: %+v", usars)

// return usars, err
// }

func (g *Gtp5g) HandleReport(handler report.Handler) {
g.bsnl.Handle(handler)
Expand Down

0 comments on commit f500bc6

Please sign in to comment.