Merge pull request #77 from tamilmani1989/cni_del_fix

CNI should invoke ipam release call even if delete endpoint fails

Author: tamilmani1989

ipam/pool.go

@@ -542,13 +542,13 @@ func (ap *addressPool) releaseAddress(address string, options map[string]string)
 
 	// Fail if an address record with a matching ID is not found.
 	if ar == nil || (id != "" && id != ar.ID) {
-		err = errAddressNotFound
-		return err
+		log.Printf("Address not found. Not Returning error")
+		return nil
 	}
 
 	if !ar.InUse {
-		err = errAddressNotInUse
-		return err
+		log.Printf("Address not in use. Not Returning error")
+		return nil
 	}
 
 	if ar.ID != "" {

netlink/link.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"net"
 
+	"github.com/Azure/azure-container-networking/log"
 	"golang.org/x/sys/unix"
 )
 
@@ -146,15 +147,17 @@ func AddLink(link Link) error {
 // DeleteLink deletes a network interface.
 func DeleteLink(name string) error {
 	if name == "" {
-		return fmt.Errorf("Invalid link name")
+		log.Printf("[net] Invalid link name. Not returning error")
+		return nil
 	}
 
-	s, err := getSocket()
+	iface, err := net.InterfaceByName(name)
 	if err != nil {
-		return err
+		log.Printf("[net] Interface not found. Not returning error")
+		return nil
 	}
 
-	iface, err := net.InterfaceByName(name)
+	s, err := getSocket()
 	if err != nil {
 		return err
 	}

network/endpoint.go

@@ -83,7 +83,8 @@ func (nw *network) deleteEndpoint(endpointId string) error {
 	// Look up the endpoint.
 	ep, err := nw.getEndpoint(endpointId)
 	if err != nil {
-		return err
+		log.Printf("[net] Endpoint %v not found. Not Returning error", endpointId)
+		return nil
 	}
 
 	// Call the platform implementation.