Fix invalid static checks

- Many source files are not compiant with staticcheck reports
- This commit make the code compliant to the static check and linter
- Some of the lines were commented only when they implement an ovs
feature which is not used yet, otherwise it is removed.

Fix formating

Author: Franck Rupin

ovs/flow.go

@@ -34,7 +34,6 @@ var (
 	errInvalidActions        = errors.New("invalid actions for Flow")
 	errNoActions             = errors.New("no actions defined for Flow")
 	errNotEnoughElements     = errors.New("not enough elements for valid Flow")
-	errPriorityNotFirst      = errors.New("priority field is not first in Flow")
 	errInvalidLearnedActions = errors.New("invalid actions for LearnedFlow")
 )
 
@@ -216,9 +215,9 @@ func (f *LearnedFlow) MarshalText() ([]byte, error) {
 
 	// A learned flow can have a limited set of actions, namely `load` and `output:field`.
 	for _, a := range f.Actions {
-		switch a.(type) {
+		switch a := a.(type) {
 		case *loadSetFieldAction:
-			if a.(*loadSetFieldAction).typ != actionLoad {
+			if a.typ != actionLoad {
 				return nil, errInvalidLearnedActions
 			}
 		case *outputFieldAction:

ovs/match.go

@@ -26,11 +26,6 @@ import (
 const (
 	source      = "src"
 	destination = "dst"
-
-	sourceHardwareAddr = "sha"
-	targetHardwareAddr = "tha"
-	sourceProtocolAddr = "spa"
-	targetProtocolAddr = "tpa"
 )
 
 // Constants of full Match names.

ovs/openflow.go

@@ -309,7 +309,7 @@ var (
 
 	// dumpAggregatePrefix is a sentinel value returned at the beginning of
 	// the output from "ovs-ofctl dump-aggregate"
-	dumpAggregatePrefix = []byte("NXST_AGGREGATE reply")
+	//dumpAggregatePrefix = []byte("NXST_AGGREGATE reply")
 )
 
 // dumpPorts calls 'ovs-ofctl dump-ports' with the specified arguments and

ovs/proto_trace.go

@@ -41,8 +41,6 @@ var (
 	ctResumeFromRegexp    = regexp.MustCompile(`Resuming from table`)
 	ctResumeWithRegexp    = regexp.MustCompile(`resume conntrack with`)
 	tunNative             = regexp.MustCompile(`native tunnel`)
-
-	pushVLANPattern = `push_vlan(vid=[0-9]+,pcp=[0-9]+)`
 )
 
 const (

ovsnl/internal/ovsh/const.go

@@ -119,7 +119,7 @@ const (
 )
 
 // ovsDatapathCmd as declared in ovsh/openvswitch.h:54
-type ovsDatapathCmd int32
+//type ovsDatapathCmd int32
 
 // ovsDatapathCmd enumeration from ovsh/openvswitch.h:54
 const (
@@ -131,7 +131,7 @@ const (
 )
 
 // ovsDatapathAttr as declared in ovsh/openvswitch.h:81
-type ovsDatapathAttr int32
+//type ovsDatapathAttr int32
 
 // ovsDatapathAttr enumeration from ovsh/openvswitch.h:81
 const (
@@ -146,7 +146,7 @@ const (
 )
 
 // ovsPacketCmd as declared in ovsh/openvswitch.h:134
-type ovsPacketCmd int32
+//type ovsPacketCmd int32
 
 // ovsPacketCmd enumeration from ovsh/openvswitch.h:134
 const (
@@ -157,7 +157,7 @@ const (
 )
 
 // ovsPacketAttr as declared in ovsh/openvswitch.h:177
-type ovsPacketAttr int32
+//type ovsPacketAttr int32
 
 // ovsPacketAttr enumeration from ovsh/openvswitch.h:177
 const (
@@ -176,7 +176,7 @@ const (
 )
 
 // ovsVportCmd as declared in ovsh/openvswitch.h:202
-type ovsVportCmd int32
+//type ovsVportCmd int32
 
 // ovsVportCmd enumeration from ovsh/openvswitch.h:202
 const (
@@ -188,7 +188,7 @@ const (
 )
 
 // ovsVportType as declared in ovsh/openvswitch.h:210
-type ovsVportType int32
+//type ovsVportType int32
 
 // ovsVportType enumeration from ovsh/openvswitch.h:210
 const (
@@ -202,7 +202,7 @@ const (
 )
 
 // ovsVportAttr as declared in ovsh/openvswitch.h:251
-type ovsVportAttr int32
+//type ovsVportAttr int32
 
 // ovsVportAttr enumeration from ovsh/openvswitch.h:251
 const (
@@ -240,7 +240,7 @@ const (
 )
 
 // ovsFlowCmd as declared in ovsh/openvswitch.h:294
-type ovsFlowCmd int32
+//type ovsFlowCmd int32
 
 // ovsFlowCmd enumeration from ovsh/openvswitch.h:294
 const (
@@ -252,7 +252,7 @@ const (
 )
 
 // ovsKeyAttr as declared in ovsh/openvswitch.h:307
-type ovsKeyAttr int32
+//type ovsKeyAttr int32
 
 // ovsKeyAttr enumeration from ovsh/openvswitch.h:307
 const (
@@ -289,7 +289,7 @@ const (
 )
 
 // ovsTunnelKeyAttr as declared in ovsh/openvswitch.h:349
-type ovsTunnelKeyAttr int32
+//type ovsTunnelKeyAttr int32
 
 // ovsTunnelKeyAttr enumeration from ovsh/openvswitch.h:349
 const (
@@ -313,7 +313,7 @@ const (
 )
 
 // ovsFragType as declared in ovsh/openvswitch.h:381
-type ovsFragType int32
+//type ovsFragType int32
 
 // ovsFragType enumeration from ovsh/openvswitch.h:381
 const (
@@ -324,7 +324,7 @@ const (
 )
 
 // ovsNshKeyAttr as declared in ovsh/openvswitch.h:499
-type ovsNshKeyAttr int32
+//type ovsNshKeyAttr int32
 
 // ovsNshKeyAttr enumeration from ovsh/openvswitch.h:499
 const (
@@ -336,7 +336,7 @@ const (
 )
 
 // ovsFlowAttr as declared in ovsh/openvswitch.h:565
-type ovsFlowAttr int32
+//type ovsFlowAttr int32
 
 // ovsFlowAttr enumeration from ovsh/openvswitch.h:565
 const (
@@ -356,7 +356,7 @@ const (
 )
 
 // ovsSampleAttr as declared in ovsh/openvswitch.h:606
-type ovsSampleAttr int32
+//type ovsSampleAttr int32
 
 // ovsSampleAttr enumeration from ovsh/openvswitch.h:606
 const (
@@ -367,7 +367,7 @@ const (
 )
 
 // ovsUserspaceAttr as declared in ovsh/openvswitch.h:640
-type ovsUserspaceAttr int32
+//type ovsUserspaceAttr int32
 
 // ovsUserspaceAttr enumeration from ovsh/openvswitch.h:640
 const (
@@ -380,15 +380,15 @@ const (
 )
 
 // ovsHashAlg as declared in ovsh/openvswitch.h:692
-type ovsHashAlg int32
+//type ovsHashAlg int32
 
 // ovsHashAlg enumeration from ovsh/openvswitch.h:692
 const (
 	HashAlgL4 = iota
 )
 
 // ovsCtAttr as declared in ovsh/openvswitch.h:738
-type ovsCtAttr int32
+//type ovsCtAttr int32
 
 // ovsCtAttr enumeration from ovsh/openvswitch.h:738
 const (
@@ -405,7 +405,7 @@ const (
 )
 
 // ovsNatAttr as declared in ovsh/openvswitch.h:776
-type ovsNatAttr int32
+//type ovsNatAttr int32
 
 // ovsNatAttr enumeration from ovsh/openvswitch.h:776
 const (
@@ -423,7 +423,7 @@ const (
 )
 
 // ovsActionAttr as declared in ovsh/openvswitch.h:852
-type ovsActionAttr int32
+//type ovsActionAttr int32
 
 // ovsActionAttr enumeration from ovsh/openvswitch.h:852
 const (
@@ -451,7 +451,7 @@ const (
 )
 
 // ovsMeterCmd as declared in ovsh/openvswitch.h:894
-type ovsMeterCmd int32
+//type ovsMeterCmd int32
 
 // ovsMeterCmd enumeration from ovsh/openvswitch.h:894
 const (
@@ -463,7 +463,7 @@ const (
 )
 
 // ovsMeterAttr as declared in ovsh/openvswitch.h:902
-type ovsMeterAttr int32
+//type ovsMeterAttr int32
 
 // ovsMeterAttr enumeration from ovsh/openvswitch.h:902
 const (
@@ -481,7 +481,7 @@ const (
 )
 
 // ovsBandAttr as declared in ovsh/openvswitch.h:921
-type ovsBandAttr int32
+//type ovsBandAttr int32
 
 // ovsBandAttr enumeration from ovsh/openvswitch.h:921
 const (
@@ -494,7 +494,7 @@ const (
 )
 
 // ovsMeterBandType as declared in ovsh/openvswitch.h:932
-type ovsMeterBandType int32
+//type ovsMeterBandType int32
 
 // ovsMeterBandType enumeration from ovsh/openvswitch.h:932
 const (

ovsnl/internal/ovsh/struct.go

@@ -22,32 +22,32 @@ type Header struct {
 }
 
 type DPStats struct {
-	Hit	uint64
-	Missed	uint64
-	Lost	uint64
-	Flows	uint64
+	Hit    uint64
+	Missed uint64
+	Lost   uint64
+	Flows  uint64
 }
 
 type DPMegaflowStats struct {
-	Mask_hit	uint64
-	Masks		uint32
-	Pad0		uint32
-	Pad1		uint64
-	Pad2		uint64
+	Mask_hit uint64
+	Masks    uint32
+	Pad0     uint32
+	Pad1     uint64
+	Pad2     uint64
 }
 
 type VportStats struct {
-	Rx_packets	uint64
-	Tx_packets	uint64
-	Rx_bytes	uint64
-	Tx_bytes	uint64
-	Rx_errors	uint64
-	Tx_errors	uint64
-	Rx_dropped	uint64
-	Tx_dropped	uint64
+	Rx_packets uint64
+	Tx_packets uint64
+	Rx_bytes   uint64
+	Tx_bytes   uint64
+	Rx_errors  uint64
+	Tx_errors  uint64
+	Rx_dropped uint64
+	Tx_dropped uint64
 }
 
 type FlowStats struct {
-	Packets	uint64
-	Bytes	uint64
+	Packets uint64
+	Bytes   uint64
 }