[VOL-5567] Update protos
Change-Id: Ib4ec57241aab48d918fc33448020c876882d5abc
Signed-off-by: Abhay Kumar <abhay.kumar@radisys.com>
diff --git a/pkg/flows/flow_utils.go b/pkg/flows/flow_utils.go
index 8a6333f..7b65b4e 100755
--- a/pkg/flows/flow_utils.go
+++ b/pkg/flows/flow_utils.go
@@ -27,9 +27,10 @@
"sync"
"github.com/cevaris/ordered_map"
- "github.com/golang/protobuf/proto"
"github.com/opencord/voltha-lib-go/v7/pkg/log"
ofp "github.com/opencord/voltha-protos/v5/go/openflow_13"
+ "google.golang.org/protobuf/encoding/prototext"
+ "google.golang.org/protobuf/proto"
)
var (
@@ -1019,7 +1020,7 @@
bandStats = append(bandStats, band)
}
meter.Stats.BandStats = bandStats
- logger.Debugw(ctx, "Allocated meter entry", log.Fields{"meter": *meter})
+ logger.Debugw(ctx, "Allocated meter entry", log.Fields{"meter": meter})
return meter
}
@@ -1040,8 +1041,8 @@
func MkOxmFields(matchFields []ofp.OfpOxmField) []*ofp.OfpOxmField {
oxmFields := make([]*ofp.OfpOxmField, 0)
- for _, matchField := range matchFields {
- oxmField := ofp.OfpOxmField{OxmClass: ofp.OfpOxmClass_OFPXMC_OPENFLOW_BASIC, Field: matchField.Field}
+ for i := range matchFields {
+ oxmField := ofp.OfpOxmField{OxmClass: ofp.OfpOxmClass_OFPXMC_OPENFLOW_BASIC, Field: matchFields[i].Field}
oxmFields = append(oxmFields, &oxmField)
}
return oxmFields
@@ -1278,7 +1279,7 @@
for kv, ok := iter(); ok; kv, ok = iter() {
if protoMsg, isMsg := kv.Value.(*ofp.OfpFlowStats); isMsg {
buffer.WriteString("\nFlow:\n")
- buffer.WriteString(proto.MarshalTextString(protoMsg))
+ buffer.WriteString(prototext.Format(protoMsg))
buffer.WriteString("\n")
}
}
@@ -1286,7 +1287,7 @@
for kv, ok := iter(); ok; kv, ok = iter() {
if protoMsg, isMsg := kv.Value.(*ofp.OfpGroupEntry); isMsg {
buffer.WriteString("\nGroup:\n")
- buffer.WriteString(proto.MarshalTextString(protoMsg))
+ buffer.WriteString(prototext.Format(protoMsg))
buffer.WriteString("\n")
}
}
diff --git a/pkg/flows/flow_utils_test.go b/pkg/flows/flow_utils_test.go
index 9704600..dcd6b25 100644
--- a/pkg/flows/flow_utils_test.go
+++ b/pkg/flows/flow_utils_test.go
@@ -256,12 +256,12 @@
fg.AddGroup(group)
str = fg.String()
- assert.True(t, strings.Contains(str, "id: 11819684229970388353"))
- assert.True(t, strings.Contains(str, "group_id: 10"))
- assert.True(t, strings.Contains(str, "oxm_class: OFPXMC_OPENFLOW_BASIC"))
- assert.True(t, strings.Contains(str, "type: OFPXMT_OFB_VLAN_VID"))
- assert.True(t, strings.Contains(str, "vlan_vid: 4096"))
- assert.True(t, strings.Contains(str, "buckets:"))
+ assert.True(t, strings.Contains(str, "id: 11819684229970388353"))
+ assert.True(t, strings.Contains(str, "group_id: 10"))
+ assert.True(t, strings.Contains(str, "oxm_class: OFPXMC_OPENFLOW_BASIC"))
+ assert.True(t, strings.Contains(str, "type: OFPXMT_OFB_VLAN_VID"))
+ assert.True(t, strings.Contains(str, "vlan_vid: 4096"))
+ assert.True(t, strings.Contains(str, "buckets: {"))
}
func TestFlowsAndGroups_AddFrom(t *testing.T) {