Merge pull request #3 from yuewko/ib_client_changes

Incompatible infoblox-go-client changes
infobloxopen · Sep 22, 2016 · 106d1c2 · 106d1c2
2 parents 79828fc + e674716
commit 106d1c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/infoblox-ipam.go b/infoblox-ipam.go
@@ -55,7 +55,7 @@ func (ibDrv *InfobloxDriver) RequestAddress(netviewName string, cidr string, ipA
 	if len(macAddr) == 0 {
 		log.Printf("RequestAddressRequest contains empty MAC Address. '00:00:00:00:00:00' will be used.")
 	} else {
-		fixedAddr, _ = ibDrv.objMgr.GetFixedAddress(netviewName, ipAddr, macAddr)
+		fixedAddr, _ = ibDrv.objMgr.GetFixedAddress(netviewName, cidr, ipAddr, macAddr)
 	}
 
 	if fixedAddr == nil {
@@ -70,7 +70,7 @@ func (ibDrv *InfobloxDriver) ReleaseAddress(netviewName string, ipAddr string, m
 	if netviewName == "" {
 		netviewName = ibDrv.networkView
 	}
-	ref, err = ibDrv.objMgr.ReleaseIP(netviewName, ipAddr, macAddr)
+	ref, err = ibDrv.objMgr.ReleaseIP(netviewName, "", ipAddr, macAddr)
 	if ref == "" {
 		log.Printf("ReleaseAddress: ***** IP Cannot be deleted '%s', '%s', '%s'! *******", netviewName, ipAddr, macAddr)
 	}

diff --git a/plugin.go b/plugin.go
@@ -26,10 +26,11 @@ import (
 	"github.com/containernetworking/cni/pkg/ns"
 	"github.com/containernetworking/cni/pkg/skel"
 	"github.com/containernetworking/cni/pkg/types"
+	"github.com/containernetworking/cni/pkg/version"
 )
 
 func main() {
-	skel.PluginMain(cmdAdd, cmdDel)
+	skel.PluginMain(cmdAdd, cmdDel, version.Legacy)
 }
 
 type InterfaceInfo struct {