Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ipam/pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 != "" {
Expand Down
11 changes: 7 additions & 4 deletions netlink/link.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"fmt"
"net"

"github.com/Azure/azure-container-networking/log"
"golang.org/x/sys/unix"
)

Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 2 additions & 1 deletion network/endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down