[VOL-4183] Multi UNI
voltha-lib-go version changed
Unused constant removed
Before sending trap flows to OLT device, rw-core sets the correct meterId to flow.
Change-Id: Id16afc685161dee560b62cc6c045c44f0bc4a427
diff --git a/rw_core/flowdecomposition/flow_decomposer.go b/rw_core/flowdecomposition/flow_decomposer.go
index dfd0771..ab04891 100644
--- a/rw_core/flowdecomposition/flow_decomposer.go
+++ b/rw_core/flowdecomposition/flow_decomposer.go
@@ -22,8 +22,8 @@
"github.com/gogo/protobuf/proto"
"github.com/opencord/voltha-go/rw_core/route"
- fu "github.com/opencord/voltha-lib-go/v4/pkg/flows"
- "github.com/opencord/voltha-lib-go/v4/pkg/log"
+ fu "github.com/opencord/voltha-lib-go/v5/pkg/flows"
+ "github.com/opencord/voltha-lib-go/v5/pkg/log"
ofp "github.com/opencord/voltha-protos/v4/go/openflow_13"
"github.com/opencord/voltha-protos/v4/go/voltha"
"google.golang.org/grpc/codes"
@@ -155,8 +155,15 @@
}
for inputPort := range inPorts {
// Upstream flow on parent (olt) device
+ // Olt meters for upstream trap flows are carried on writeMetadata for Multi UNI
+ oltMeterId := fu.GetMeterIdFromWriteMetadata(ctx, flow)
+ if oltMeterId == 0 {
+ oltMeterId = meterID
+ } else {
+ fu.SetMeterIdToFlow(flow, oltMeterId)
+ }
faParent := &fu.FlowArgs{
- KV: fu.OfpFlowModArgs{"priority": uint64(flow.Priority), "cookie": flow.Cookie, "meter_id": uint64(meterID), "write_metadata": metadataFromwriteMetadata},
+ KV: fu.OfpFlowModArgs{"priority": uint64(flow.Priority), "cookie": flow.Cookie, "meter_id": uint64(oltMeterId), "write_metadata": metadataFromwriteMetadata},
MatchFields: []*ofp.OfpOxmOfbField{
fu.InPort(egressHop.Ingress),
fu.TunnelId(uint64(inputPort)),