make sure execPlugin execute regardless of ipam return

Signed-off-by: Sunyanan Choochotkaew <sunyanan.choochotkaew1@ibm.com>

Author: sunya-ch

cni/plugins/main/multi-nic/multi-nic.go

@@ -181,7 +181,7 @@ func cmdDel(args *skel.CmdArgs) error {
 	}
 
 	n, deviceType, err := loadConf(args)
-	if err != nil {
+	if err != nil && n == nil {
 		utils.Logger.Debug(fmt.Sprintf("fail to load conf: %v", err))
 		return nil
 	}
@@ -192,7 +192,6 @@ func cmdDel(args *skel.CmdArgs) error {
 		err = ipam.ExecDel(n.IPAM.Type, injectedStdIn)
 		if err != nil {
 			utils.Logger.Debug(fmt.Sprintf("Failed ipam.ExecDel %s: %v", err, string(injectedStdIn)))
-			return nil
 		}
 	}
 
@@ -201,14 +200,14 @@ func cmdDel(args *skel.CmdArgs) error {
 	if n.NetConf.RawPrevResult != nil {
 		if err = version.ParsePrevResult(&n.NetConf); err != nil {
 			utils.Logger.Debug(fmt.Sprintf("could not parse prevResult: %v", err))
-			return nil
-		}
-		result, err = current.NewResultFromResult(n.NetConf.PrevResult)
-		if err != nil {
-			utils.Logger.Debug(fmt.Sprintf("could not convert result to current version: %v", err))
-			return nil
+		} else {
+			result, err = current.NewResultFromResult(n.NetConf.PrevResult)
+			if err != nil {
+				utils.Logger.Debug(fmt.Sprintf("could not convert result to current version: %v", err))
+			}
 		}
-	} else {
+	}
+	if result == nil {
 		result = &current.Result{CNIVersion: current.ImplementedSpecVersion}
 	}
 
@@ -224,7 +223,6 @@ func cmdDel(args *skel.CmdArgs) error {
 	}
 	if err != nil {
 		utils.Logger.Debug(fmt.Sprintf("Fail loading %v: %v", string(args.StdinData), err))
-		return nil
 	}
 	if len(confBytesArray) == 0 {
 		utils.Logger.Debug(fmt.Sprintf("zero config on cmdDel: %v (%d)", string(args.StdinData), len(n.Masters)))
@@ -237,7 +235,6 @@ func cmdDel(args *skel.CmdArgs) error {
 		_, err := execPlugin(deviceType, command, confBytes, args, ifName, false)
 		if err != nil {
 			utils.Logger.Debug(fmt.Sprintf("Fail execPlugin %v: %v", string(confBytes), err))
-			return nil
 		}
 	}
 	return nil
@@ -249,7 +246,7 @@ func cmdCheck(args *skel.CmdArgs) error {
 	}
 
 	n, deviceType, err := loadConf(args)
-	if err != nil {
+	if err != nil && n == nil {
 		utils.Logger.Debug(fmt.Sprintf("fail to load conf: %v", err))
 		return nil
 	}
@@ -259,14 +256,14 @@ func cmdCheck(args *skel.CmdArgs) error {
 	if n.NetConf.RawPrevResult != nil {
 		if err = version.ParsePrevResult(&n.NetConf); err != nil {
 			utils.Logger.Debug(fmt.Sprintf("could not parse prevResult: %v", err))
-			return nil
-		}
-		result, err = current.NewResultFromResult(n.NetConf.PrevResult)
-		if err != nil {
-			utils.Logger.Debug(fmt.Sprintf("could not convert result to current version: %v", err))
-			return nil
+		} else {
+			result, err = current.NewResultFromResult(n.NetConf.PrevResult)
+			if err != nil {
+				utils.Logger.Debug(fmt.Sprintf("could not convert result to current version: %v", err))
+			}
 		}
-	} else {
+	}
+	if result == nil {
 		result = &current.Result{CNIVersion: current.ImplementedSpecVersion}
 	}
 
@@ -282,7 +279,6 @@ func cmdCheck(args *skel.CmdArgs) error {
 	}
 	if err != nil {
 		utils.Logger.Debug(fmt.Sprintf("Fail loading %v: %v", string(args.StdinData), err))
-		return nil
 	}
 	if len(confBytesArray) == 0 {
 		utils.Logger.Debug(fmt.Sprintf("zero config on cmdCheck: %v (%d)", string(args.StdinData), len(n.Masters)))
@@ -295,7 +291,6 @@ func cmdCheck(args *skel.CmdArgs) error {
 		_, err := execPlugin(deviceType, command, confBytes, args, ifName, false)
 		if err != nil {
 			utils.Logger.Debug(fmt.Sprintf("Fail execPlugin %v: %v", string(confBytes), err))
-			return nil
 		}
 	}
 	return nil