VOL-4217: Update to latest version of protos and voltha-lib-go for
voltha-2.9 release. Tested with BAL3.10
Change-Id: Ibdc5978a1f2df713965a27ce26d0e22c1ffa366a
diff --git a/core/tt_workflow.go b/core/tt_workflow.go
index 783dfe6..455a58b 100644
--- a/core/tt_workflow.go
+++ b/core/tt_workflow.go
@@ -22,9 +22,9 @@
"sync/atomic"
"github.com/opencord/openolt-scale-tester/config"
- "github.com/opencord/voltha-lib-go/v4/pkg/log"
- oop "github.com/opencord/voltha-protos/v4/go/openolt"
- tp_pb "github.com/opencord/voltha-protos/v4/go/tech_profile"
+ "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ oop "github.com/opencord/voltha-protos/v5/go/openolt"
+ tp_pb "github.com/opencord/voltha-protos/v5/go/tech_profile"
"golang.org/x/net/context"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
@@ -198,8 +198,7 @@
func AddTtFlow(subs *Subscriber, flowType string, direction string, flowID uint64,
allocID uint32, gemID uint32, pcp uint32, replicateFlow bool, symmetricFlowID uint64,
pbitToGem map[uint32]uint32) error {
- logger.Infow(nil, "add-flow", log.Fields{"WorkFlow": subs.TestConfig.WorkflowName, "FlowType": flowType,
- "direction": direction, "flowID": flowID})
+
var err error
flowClassifier, actionInfo := FormatTtClassfierAction(flowType, direction, subs)
@@ -215,6 +214,8 @@
SymmetricFlowId: symmetricFlowID,
ReplicateFlow: replicateFlow, PbitToGemport: pbitToGem}
+ logger.Infow(nil, "adding-flow", log.Fields{"flow": flow})
+
_, err = subs.OpenOltClient.FlowAdd(context.Background(), &flow)
st, _ := status.FromError(err)
@@ -337,9 +338,9 @@
pbitToGem := make(map[uint32]uint32)
var pcp uint32
- var allocID = subs.TpInstance[subs.TestConfig.TpIDList[0]].UsScheduler.AllocID
+ var allocID = subs.TpInstance[subs.TestConfig.TpIDList[0]].UsScheduler.AllocId
for _, gem := range subs.TpInstance[subs.TestConfig.TpIDList[0]].UpstreamGemPortAttributeList {
- gemPortIDs = append(gemPortIDs, gem.GemportID)
+ gemPortIDs = append(gemPortIDs, gem.GemportId)
}
for idx, gemID := range gemPortIDs {
@@ -386,9 +387,9 @@
pbitToGem := make(map[uint32]uint32)
var pcp uint32
- var allocID = subs.TpInstance[subs.TestConfig.TpIDList[0]].UsScheduler.AllocID
+ var allocID = subs.TpInstance[subs.TestConfig.TpIDList[0]].UsScheduler.AllocId
for _, gem := range subs.TpInstance[subs.TestConfig.TpIDList[0]].UpstreamGemPortAttributeList {
- gemPortIDs = append(gemPortIDs, gem.GemportID)
+ gemPortIDs = append(gemPortIDs, gem.GemportId)
}
for idx, gemID := range gemPortIDs {
@@ -445,9 +446,9 @@
pbitToGem := make(map[uint32]uint32)
var pcp uint32
- var allocID = subs.TpInstance[subs.TestConfig.TpIDList[0]].UsScheduler.AllocID
+ var allocID = subs.TpInstance[subs.TestConfig.TpIDList[0]].UsScheduler.AllocId
for _, gem := range subs.TpInstance[subs.TestConfig.TpIDList[0]].UpstreamGemPortAttributeList {
- gemPortIDs = append(gemPortIDs, gem.GemportID)
+ gemPortIDs = append(gemPortIDs, gem.GemportId)
}
for idx, gemID := range gemPortIDs {
@@ -513,9 +514,9 @@
var gemPortIDs []uint32
var pcp uint32
- var allocID = subs.TpInstance[subs.TestConfig.TpIDList[0]].UsScheduler.AllocID
+ var allocID = subs.TpInstance[subs.TestConfig.TpIDList[0]].UsScheduler.AllocId
for _, gem := range subs.TpInstance[subs.TestConfig.TpIDList[0]].UpstreamGemPortAttributeList {
- gemPortIDs = append(gemPortIDs, gem.GemportID)
+ gemPortIDs = append(gemPortIDs, gem.GemportId)
}
for idx, gemID := range gemPortIDs {