VOL-2624 - fix SCA issues
Change-Id: I3a5e0aafc5b6bd6c6e865675a3481db289a7d772
diff --git a/pkg/flows/flow_utils.go b/pkg/flows/flow_utils.go
index b9981e6..4de929f 100644
--- a/pkg/flows/flow_utils.go
+++ b/pkg/flows/flow_utils.go
@@ -689,7 +689,10 @@
}
var flowString = fmt.Sprintf("%d%d%d%d%s%s", flow.TableId, flow.Priority, flow.Flags, flow.Cookie, flow.Match.String(), instructionString.String())
h := md5.New()
- h.Write([]byte(flowString))
+ if _, err := h.Write([]byte(flowString)); err != nil {
+ logger.Errorw("hash-flow-status", log.Fields{"error": err})
+ return 0
+ }
hash := big.NewInt(0)
hash.SetBytes(h.Sum(nil))
return hash.Uint64()
@@ -745,7 +748,7 @@
meter.Stats.DurationSec = 0
meter.Stats.DurationNsec = 0
// band stats init
- for _, _ = range meterMod.Bands {
+ for range meterMod.Bands {
band := &ofp.OfpMeterBandStats{}
band.PacketBandCount = 0
band.ByteBandCount = 0
diff --git a/pkg/flows/flow_utils_test.go b/pkg/flows/flow_utils_test.go
index fc2ff27..5219cf3 100644
--- a/pkg/flows/flow_utils_test.go
+++ b/pkg/flows/flow_utils_test.go
@@ -45,8 +45,7 @@
allFlows = fg.ListFlows()
assert.Equal(t, 0, len(allFlows))
- var fa *FlowArgs
- fa = &FlowArgs{
+ fa := &FlowArgs{
KV: OfpFlowModArgs{"priority": 500},
MatchFields: []*ofp.OfpOxmOfbField{
InPort(1),
@@ -322,8 +321,7 @@
assert.Equal(t, 0, len(val.ListFlows()))
assert.Equal(t, 0, len(val.ListGroups()))
- var fa *FlowArgs
- fa = &FlowArgs{
+ fa := &FlowArgs{
KV: OfpFlowModArgs{"priority": 500},
MatchFields: []*ofp.OfpOxmOfbField{
InPort(2),
@@ -705,5 +703,5 @@
mcastIp := uint32(4001431809) //238.129.1.1
expectedMacInBytes := []byte{1, 0, 94, 1, 1, 1} //01:00:5e:01:01:01
macInBytes := ConvertToMulticastMacBytes(mcastIp)
- assert.True(t, bytes.Compare(macInBytes, expectedMacInBytes) == 0)
+ assert.True(t, bytes.Equal(macInBytes, expectedMacInBytes))
}