cniovs: Add missing error check for ovs-vsctl add-port

moduspwnens · moduspwnens · commit 8b29f4a2f31e · 2019-07-30T13:55:04.000-04:00
Before this change, when attempting to run ovs-vsctl, any errors were
swallowed and not returned.

Signed-off-by: Benn Linger &lt;benn@bennlinger.com&gt;
diff --git a/cniovs/cniovs/cniovs.go b/cniovs/cniovs/cniovs.go
@@ -178,10 +178,14 @@ func addLocalDeviceVhost(conf *usrsptypes.NetConf, args *skel.CmdArgs, data *ovs
 	if vhostName, err := createVhostPort(sockDir, sockRef); err == nil {
 		if vhostPortMac, err := getVhostPortMac(vhostName); err == nil {
 			data.VhostMac = vhostPortMac
+		} else {
+			return err
 		}
 
 		data.Vhostname = vhostName
 		data.IfMac = generateRandomMacAddress()
+	} else {
+		return err
 	}
 
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -178,10 +178,14 @@ func addLocalDeviceVhost(conf usrsptypes.NetConf, args skel.CmdArgs, data *ovs`
`178`	`178`	`if vhostName, err := createVhostPort(sockDir, sockRef); err == nil {`
`179`	`179`	`if vhostPortMac, err := getVhostPortMac(vhostName); err == nil {`
`180`	`180`	`data.VhostMac = vhostPortMac`
	`181`	`+ } else {`
	`182`	`+ return err`
`181`	`183`	`}`
`182`	`184`
`183`	`185`	`data.Vhostname = vhostName`
`184`	`186`	`data.IfMac = generateRandomMacAddress()`
	`187`	`+ } else {`
	`188`	`+ return err`
`185`	`189`	`}`
`186`	`190`
`187`	`191`	`return nil`