Add support for releasing addresses by ID

Author: ofiliz

cni/ipam/ipam.go

@@ -193,7 +193,7 @@ func (plugin *ipamPlugin) Add(args *cniSkel.CmdArgs) error {
 	defer func() {
 		if err != nil && address != "" {
 			log.Printf("[cni-ipam] Releasing address %v.", address)
-			plugin.am.ReleaseAddress(nwCfg.Ipam.AddrSpace, nwCfg.Ipam.Subnet, address)
+			plugin.am.ReleaseAddress(nwCfg.Ipam.AddrSpace, nwCfg.Ipam.Subnet, address, nil)
 		}
 	}()
 
@@ -274,7 +274,7 @@ func (plugin *ipamPlugin) Delete(args *cniSkel.CmdArgs) error {
 	// If an address is specified, release that address. Otherwise, release the pool.
 	if nwCfg.Ipam.Address != "" {
 		// Release the address.
-		err := plugin.am.ReleaseAddress(nwCfg.Ipam.AddrSpace, nwCfg.Ipam.Subnet, nwCfg.Ipam.Address)
+		err := plugin.am.ReleaseAddress(nwCfg.Ipam.AddrSpace, nwCfg.Ipam.Subnet, nwCfg.Ipam.Address, nil)
 		if err != nil {
 			err = plugin.Errorf("Failed to release address: %v", err)
 			return err

ipam/pool.go

@@ -517,8 +517,8 @@ func (ap *addressPool) releaseAddress(address string, options map[string]string)
 	var id string
 	var err error
 
-	log.Printf("[ipam] Releasing address %v options:%+v.", address, options)
-	defer func() { log.Printf("[ipam] Address release completed with err:%v.", err) }()
+	log.Printf("[ipam] Releasing address with address:%v options:%+v.", address, options)
+	defer func() { log.Printf("[ipam] Address release completed with address:%v err:%v.", address, err) }()
 
 	if options != nil {
 		id = options[OptAddressID]
@@ -535,10 +535,13 @@ func (ap *addressPool) releaseAddress(address string, options map[string]string)
 	} else if id != "" {
 		// Release the address with the matching ID.
 		ar = ap.addrsByID[id]
-		log.Printf("[ipam] Releasing address %v.", ar.Addr.String())
+		if ar != nil {
+			address = ar.Addr.String()
+		}
 	}
 
-	if ar == nil {
+	// Fail if an address record with a matching ID is not found.
+	if ar == nil || (id != "" && id != ar.ID) {
 		err = errAddressNotFound
 		return err
 	}