From 91f7c7c02da869ff844b0dce2cee1378bbdc8f58 Mon Sep 17 00:00:00 2001
From: Kuralamudhan Ramakrishnan <kuralamudhan.ramakrishnan@intel.com>
Date: Thu, 9 Nov 2017 17:55:37 +0000
Subject: [PATCH] Merge and updated the PR#8 (#27)

* Fix retrying DEL failure bug

* bug fix for consuming net conf file doesn't exist

Change-Id: I810dc308285437d167fa74ca1f63c71dad999f26
---
 multus/multus.go | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/multus/multus.go b/multus/multus.go
index 6a8259e2e..0fc4d02f1 100644
--- a/multus/multus.go
+++ b/multus/multus.go
@@ -125,12 +125,7 @@ func consumeScratchNetConf(containerID, dataDir string) ([]byte, error) {
 	path := filepath.Join(dataDir, containerID)
 	defer os.Remove(path)
 
-	data, err := ioutil.ReadFile(path)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read container data in the path(%q): %v", path, err)
-	}
-
-	return data, err
+	return ioutil.ReadFile(path)
 }
 
 func getifname() (f func() string) {
@@ -547,6 +542,10 @@ func cmdDel(args *skel.CmdArgs) error {
 	if in.Kubeconfig == "" || nopodnet {
 		netconfBytes, err := consumeScratchNetConf(args.ContainerID, in.CNIDir)
 		if err != nil {
+			if os.IsNotExist(err) {
+				// Per spec should ignore error if resources are missing / already removed
+				return nil
+			}
 			return fmt.Errorf("Multus: Err in  reading the delegates: %v", err)
 		}