Skip to content

Commit a2e4909

Browse files
unclejacksrampal
unclejack
authored and
srampal
committed
checks related fixes (#787)
* most packages: fix errors to pass checks Signed-off-by: Cristian Staretu <[email protected]> * Makefile: run checks on test as well Signed-off-by: Cristian Staretu <[email protected]>
1 parent 29869c7 commit a2e4909

38 files changed

+213
-215
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
DEFAULT_DOCKER_VERSION := 1.12.6
55
SHELL := /bin/bash
6-
EXCLUDE_DIRS := bin docs Godeps scripts test vagrant vendor install
6+
EXCLUDE_DIRS := bin docs Godeps scripts vagrant vendor install
77
PKG_DIRS := $(filter-out $(EXCLUDE_DIRS),$(subst /,,$(sort $(dir $(wildcard */)))))
88
TO_BUILD := ./netplugin/ ./netmaster/ ./netctl/netctl/ ./mgmtfn/k8splugin/contivk8s/ ./mgmtfn/mesosplugin/netcontiv/
99
HOST_GOBIN := `if [ -n "$$(go env GOBIN)" ]; then go env GOBIN; else dirname $$(which go); fi`

‎core/error.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ func Errorf(f string, args ...interface{}) *Error {
8383
return e
8484
}
8585

86-
// ErrIfKeyExists checks if the error message contains "Key not found".
86+
// ErrIfKeyExists checks if the error message contains "key not found".
8787
func ErrIfKeyExists(err error) error {
88-
if err == nil || strings.Contains(err.Error(), "Key not found") {
88+
if err == nil || strings.Contains(err.Error(), "key not found") {
8989
return nil
9090
}
9191

‎drivers/ovsd/ovsSwitch.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func NewOvsSwitch(bridgeName, netType, localIP, fwdMode string,
119119
datapath = "vrouter"
120120
default:
121121
log.Errorf("Invalid datapath mode")
122-
return nil, errors.New("Invalid forwarding mode. Expects 'bridge' or 'routing'")
122+
return nil, errors.New("invalid forwarding mode. Expects 'bridge' or 'routing'")
123123
}
124124
// Create an ofnet agent
125125
sw.ofnetAgent, err = ofnet.NewOfnetAgent(bridgeName, datapath, net.ParseIP(localIP),
@@ -140,7 +140,7 @@ func NewOvsSwitch(bridgeName, netType, localIP, fwdMode string,
140140
datapath = "vlrouter"
141141
default:
142142
log.Errorf("Invalid datapath mode")
143-
return nil, errors.New("Invalid forwarding mode. Expects 'bridge' or 'routing'")
143+
return nil, errors.New("invalid forwarding mode. Expects 'bridge' or 'routing'")
144144
}
145145
// Create an ofnet agent
146146
sw.ofnetAgent, err = ofnet.NewOfnetAgent(bridgeName, datapath, net.ParseIP(localIP),
@@ -1029,7 +1029,7 @@ func (sw *OvsSwitch) SvcProviderUpdate(svcName string, providers []string) {
10291029
// GetEndpointStats invokes ofnetAgent api
10301030
func (sw *OvsSwitch) GetEndpointStats() (map[string]*ofnet.OfnetEndpointStats, error) {
10311031
if sw.ofnetAgent == nil {
1032-
return nil, errors.New("No ofnet agent")
1032+
return nil, errors.New("no ofnet agent")
10331033
}
10341034

10351035
stats, err := sw.ofnetAgent.GetEndpointStats()
@@ -1046,23 +1046,23 @@ func (sw *OvsSwitch) GetEndpointStats() (map[string]*ofnet.OfnetEndpointStats, e
10461046
// InspectState ireturns ofnet state in json form
10471047
func (sw *OvsSwitch) InspectState() (interface{}, error) {
10481048
if sw.ofnetAgent == nil {
1049-
return nil, errors.New("No ofnet agent")
1049+
return nil, errors.New("no ofnet agent")
10501050
}
10511051
return sw.ofnetAgent.InspectState()
10521052
}
10531053

10541054
// InspectBgp returns ofnet state in json form
10551055
func (sw *OvsSwitch) InspectBgp() (interface{}, error) {
10561056
if sw.ofnetAgent == nil {
1057-
return nil, errors.New("No ofnet agent")
1057+
return nil, errors.New("no ofnet agent")
10581058
}
10591059
return sw.ofnetAgent.InspectBgp()
10601060
}
10611061

10621062
// GlobalConfigUpdate updates the global configs like arp-mode
10631063
func (sw *OvsSwitch) GlobalConfigUpdate(cfg ofnet.OfnetGlobalConfig) error {
10641064
if sw.ofnetAgent == nil {
1065-
return errors.New("No ofnet agent")
1065+
return errors.New("no ofnet agent")
10661066
}
10671067
return sw.ofnetAgent.GlobalConfigUpdate(cfg)
10681068
}

‎drivers/ovsd/ovsdbDriver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ func (d *OvsdbDriver) UpdatePolicingRate(intfName string, burst int, bandwidth i
565565

566566
condition := libovsdb.NewCondition("name", "==", intfName)
567567
if condition == nil {
568-
return errors.New("Error getting the new condition")
568+
return errors.New("error getting the new condition")
569569
}
570570
mutateOp := libovsdb.Operation{
571571
Op: "update",

‎mgmtfn/dockplugin/netDriver.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ func GetDockerNetworkName(nwID string) (string, string, string, error) {
581581
docker, err := dockerclient.NewClient("unix:///var/run/docker.sock", "", nil, nil)
582582
if err != nil {
583583
log.Errorf("Unable to connect to docker. Error %v", err)
584-
return "", "", "", errors.New("Unable to connect to docker")
584+
return "", "", "", errors.New("unable to connect to docker")
585585
}
586586

587587
nwIDFilter := filters.NewArgs()
@@ -594,9 +594,9 @@ func GetDockerNetworkName(nwID string) (string, string, string, error) {
594594

595595
if len(nwList) != 1 {
596596
if len(nwList) == 0 {
597-
err = errors.New("Network UUID not found")
597+
err = errors.New("network UUID not found")
598598
} else {
599-
err = errors.New("More than one network found with the same ID")
599+
err = errors.New("more than one network found with the same ID")
600600
}
601601
return "", "", "", err
602602
}
@@ -634,7 +634,7 @@ func GetDockerNetworkName(nwID string) (string, string, string, error) {
634634
}
635635
} else {
636636
log.Errorf("Invalid network name format for network %s", nw.Name)
637-
return "", "", "", errors.New("Invalid format")
637+
return "", "", "", errors.New("invalid format")
638638
}
639639

640640
return tenantName, netName, serviceName, nil

‎mgmtfn/k8splugin/contivk8s/clients/network.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (c *NWClient) AddPod(podInfo interface{}) (*cniapi.RspAddPod, error) {
8686
if err != nil {
8787
return nil, err
8888
}
89-
return &data, fmt.Errorf("Internal Server Error")
89+
return &data, fmt.Errorf("internal server error")
9090

9191
case r.StatusCode != int(200):
9292
log.Errorf("POST Status '%s' status code %d \n", r.Status, r.StatusCode)

‎mgmtfn/k8splugin/contivk8s/k8s_cni.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ var log *logger.Entry
4949
func getPodInfo(ppInfo *cniapi.CNIPodAttr) error {
5050
cniArgs := os.Getenv("CNI_ARGS")
5151
if cniArgs == "" {
52-
return fmt.Errorf("Error reading CNI_ARGS")
52+
return fmt.Errorf("error reading CNI_ARGS")
5353
}
5454

5555
// convert the cniArgs to json format
@@ -58,7 +58,7 @@ func getPodInfo(ppInfo *cniapi.CNIPodAttr) error {
5858
cniJSON := strings.Replace(cniTmp1, ";", "\",\"", -1)
5959
err := json.Unmarshal([]byte(cniJSON), ppInfo)
6060
if err != nil {
61-
return fmt.Errorf("Error parsing cni args: %s", err)
61+
return fmt.Errorf("error parsing cni args: %s", err)
6262
}
6363

6464
// nwNameSpace and ifname are passed as separate env vars

‎mgmtfn/k8splugin/contivk8s/k8s_cni_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func nsToPID(ns string) (int, error) {
4848
// Make sure ns is well formed
4949
ok := strings.HasPrefix(ns, "/proc/")
5050
if !ok {
51-
return -1, fmt.Errorf("Invalid nw name space: %v", ns)
51+
return -1, fmt.Errorf("invalid network namespace: %v", ns)
5252
}
5353

5454
elements := strings.Split(ns, "/")
@@ -86,7 +86,7 @@ func stubAddPod(r *http.Request) (interface{}, error) {
8686
}
8787
}
8888
logger.Errorf("Failed pod %v", pInfo)
89-
return resp, fmt.Errorf("Failed to add pod")
89+
return resp, fmt.Errorf("failed to add pod")
9090
}
9191

9292
// stubDeletePod is the handler for testing pod additions
@@ -112,7 +112,7 @@ func stubDeletePod(r *http.Request) (interface{}, error) {
112112
return resp, nil
113113
}
114114
logger.Errorf("Failed pod %v", pInfo)
115-
return resp, fmt.Errorf("Failed to delete pod")
115+
return resp, fmt.Errorf("failed to delete pod")
116116
}
117117

118118
// Simple Wrapper for http handlers

‎mgmtfn/k8splugin/driver.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func createEP(req *epSpec) (*epAttr, error) {
130130
netID := req.Network + "." + req.Tenant
131131
ep, err := netdGetEndpoint(netID + "-" + req.EndpointID)
132132
if err == nil {
133-
return nil, fmt.Errorf("EP %s already exists", req.EndpointID)
133+
return nil, fmt.Errorf("the EP %s already exists", req.EndpointID)
134134
}
135135

136136
// Build endpoint request
@@ -218,7 +218,7 @@ func nsToPID(ns string) (int, error) {
218218
// Make sure ns is well formed
219219
ok := strings.HasPrefix(ns, "/proc/")
220220
if !ok {
221-
return -1, fmt.Errorf("Invalid nw name space: %v", ns)
221+
return -1, fmt.Errorf("invalid nw name space: %v", ns)
222222
}
223223

224224
elements := strings.Split(ns, "/")

‎netmaster/daemon/daemon.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -586,13 +586,13 @@ func (d *MasterDaemon) getMasterInfo() (map[string]interface{}, error) {
586586
// get local ip
587587
localIP, err := GetLocalAddr()
588588
if err != nil {
589-
return nil, errors.New("Error getting local IP address")
589+
return nil, errors.New("error getting local IP address")
590590
}
591591

592592
// get current holder of master lock
593593
leader := leaderLock.GetHolder()
594594
if leader == "" {
595-
return nil, errors.New("Leader not found")
595+
return nil, errors.New("leader not found")
596596
}
597597

598598
// Get all netplugin services

‎netmaster/docknet/docknet.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func CreateDockNet(tenantName, networkName, serviceName string, nwCfg *mastercfg
135135
nwID = nw.ID
136136
} else if err == nil && nw.Driver != netDriverName {
137137
log.Errorf("Network name %s used by another driver %s", docknetName, nw.Driver)
138-
return errors.New("Network name used by another driver")
138+
return errors.New("network name used by another driver")
139139
} else if err != nil {
140140
// plugin options to be sent to docker
141141
netPluginOptions := make(map[string]string)
@@ -211,7 +211,7 @@ func DeleteDockNet(tenantName, networkName, serviceName string) error {
211211
docker, err := dockerclient.NewClient("unix:///var/run/docker.sock", "v1.23", nil, defaultHeaders)
212212
if err != nil {
213213
log.Errorf("Unable to connect to docker. Error %v", err)
214-
return errors.New("Unable to connect to docker")
214+
return errors.New("unable to connect to docker")
215215
}
216216

217217
// check whether the network is present in docker
@@ -235,7 +235,7 @@ func DeleteDockNet(tenantName, networkName, serviceName string) error {
235235
}
236236

237237
err = DeleteDockNetState(tenantName, networkName, serviceName)
238-
if docknetDeleted && strings.Contains(err.Error(), "Key not found") {
238+
if docknetDeleted && strings.Contains(err.Error(), "key not found") {
239239
// Ignore the error as docknet was already deleted
240240
err = nil
241241
}

‎netmaster/gstate/gstate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ func (gc *Cfg) AllocVXLAN(reqVxlan uint) (vxlan uint, localVLAN uint, err error)
212212
}
213213

214214
if reqVxlan != 0 && reqVxlan <= g.FreeVXLANsStart {
215-
return 0, 0, errors.New("Requested vxlan is out of range")
215+
return 0, 0, errors.New("requested vxlan is out of range")
216216
}
217217

218218
if (reqVxlan != 0) && (reqVxlan >= g.FreeVXLANsStart) {

‎netmaster/master/api.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func AllocAddressHandler(w http.ResponseWriter, r *http.Request, vars map[string
160160
readNet.StateDriver = stateDriver
161161
netList, err := readNet.ReadAll()
162162
if err != nil {
163-
if !strings.Contains(err.Error(), "Key not found") {
163+
if !strings.Contains(err.Error(), "key not found") {
164164
log.Errorf("error reading keys during host create. Error: %s", err)
165165
return nil, err
166166
}
@@ -232,7 +232,7 @@ func AllocAddressHandler(w http.ResponseWriter, r *http.Request, vars map[string
232232
return aresp, nil
233233
}
234234
log.Errorf("Could not find the network for: %s", allocReq.NetworkID)
235-
return nil, errors.New("Network not found")
235+
return nil, errors.New("network not found")
236236
}
237237

238238
// find the network from network id
@@ -443,7 +443,7 @@ func UpdateEndpointHandler(w http.ResponseWriter, r *http.Request, vars map[stri
443443
key := mastercfg.GetNwCfgKey(epUpdReq.Network, epUpdReq.Tenant)
444444
err := nwCfg.Read(key)
445445
if err != nil {
446-
if !strings.Contains(err.Error(), "Key not found") {
446+
if !strings.Contains(err.Error(), "key not found") {
447447
return nil, err
448448
}
449449
//If network is not found then networkname is epg
@@ -495,7 +495,7 @@ func UpdateEndpointHandler(w http.ResponseWriter, r *http.Request, vars map[stri
495495
providerID := getProviderID(provider)
496496
providerDbID := getProviderDbID(provider)
497497
if providerID == "" || providerDbID == "" {
498-
return nil, fmt.Errorf("Invalid ProviderID from providerInfo:{%v}", provider)
498+
return nil, fmt.Errorf("invalid ProviderID from providerInfo:{%v}", provider)
499499
}
500500

501501
//update provider db
@@ -541,7 +541,7 @@ func UpdateEndpointHandler(w http.ResponseWriter, r *http.Request, vars map[stri
541541

542542
providerDbID := epUpdReq.ContainerID
543543
if providerDbID == "" {
544-
return nil, fmt.Errorf("Invalid containerID in UpdateEndpointRequest:(nil)")
544+
return nil, fmt.Errorf("invalid containerID in UpdateEndpointRequest:(nil)")
545545
}
546546

547547
mastercfg.SvcMutex.Lock()
@@ -557,7 +557,7 @@ func UpdateEndpointHandler(w http.ResponseWriter, r *http.Request, vars map[stri
557557
providerID := getProviderID(provider)
558558
if providerID == "" {
559559
mastercfg.SvcMutex.Unlock()
560-
return nil, fmt.Errorf("Invalid ProviderID from providerInfo:{%v}", provider)
560+
return nil, fmt.Errorf("invalid ProviderID from providerInfo:{%v}", provider)
561561
}
562562
if service.Providers[providerID] != nil {
563563
delete(service.Providers, providerID)

‎netmaster/master/endpointGroup.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ func CreateEndpointGroup(tenantName, networkName, groupName, ipPool, cfgdTag str
151151
if aciMode {
152152
if epgCfg.PktTagType != "vlan" {
153153
log.Errorf("Network type must be VLAN for ACI mode")
154-
return errors.New("Network type must be VLAN for ACI mode")
154+
return errors.New("network type must be VLAN for ACI mode")
155155
}
156156

157157
pktTag, err := gCfg.AllocVLAN(0)
@@ -266,7 +266,7 @@ func UpdateEndpointGroup(bandwidth, groupName, tenantName string, Dscp, burst in
266266

267267
key := mastercfg.GetEndpointGroupKey(groupName, tenantName)
268268
if key == "" {
269-
return errors.New("Error finding endpointGroup key ")
269+
return errors.New("error finding endpointGroup key ")
270270
}
271271

272272
// Read etcd driver

‎netmaster/master/netmaster.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func CreateGlobal(stateDriver core.StateDriver, gc *intent.ConfigGlobal) error {
113113
case "default", "aci", "aci-opflex":
114114
// These values are acceptable.
115115
default:
116-
return errors.New("Invalid fabric mode")
116+
return errors.New("invalid fabric mode")
117117
}
118118
masterGc.NwInfraType = gc.NwInfraType
119119
}
@@ -207,7 +207,7 @@ func UpdateGlobal(stateDriver core.StateDriver, gc *intent.ConfigGlobal) error {
207207
case "default", "aci", "aci-opflex":
208208
// These values are acceptable.
209209
default:
210-
return errors.New("Invalid fabric mode")
210+
return errors.New("invalid fabric mode")
211211
}
212212
masterGc.NwInfraType = gc.NwInfraType
213213
}

‎netmaster/mastercfg/policyState.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ func (gp *EpgPolicy) createOfnetRule(rule *contivModel.Rule, dir string) (*ofnet
195195
net := contivModel.FindNetwork(netKey)
196196
if net == nil {
197197
log.Errorf("Network %s not found", netKey)
198-
return nil, errors.New("FromNetwork not found")
198+
return nil, errors.New("the FromNetwork key wasn't found")
199199
}
200200

201201
rule.FromIpAddress = net.Subnet
@@ -205,7 +205,7 @@ func (gp *EpgPolicy) createOfnetRule(rule *contivModel.Rule, dir string) (*ofnet
205205
net := contivModel.FindNetwork(netKey)
206206
if net == nil {
207207
log.Errorf("Network %s not found", netKey)
208-
return nil, errors.New("ToNetwork not found")
208+
return nil, errors.New("the ToNetwork key wasn't found")
209209
}
210210

211211
rule.ToIpAddress = net.Subnet

0 commit comments

Comments
 (0)