fix gateway request error

Author: clinta

const.go

@@ -2,7 +2,7 @@ package vxrouter
 
 // usefule constants for the whole project
 const (
-	Version       = "0.0.3"
+	Version       = "0.0.4"
 	EnvPrefix     = "VXR_"
 	NetworkDriver = "vxrNet"
 	IpamDriver    = "vxrIpam"

docker/core/functions.go

@@ -2,6 +2,7 @@ package core
 
 import (
 	"fmt"
+	"net"
 	"os"
 	"strconv"
 	"strings"
@@ -36,5 +37,18 @@ func getEnvIntWithDefault(val, opt string, def int) int { //nolint: unparam
 }
 
 func poolFromID(poolid string) string {
-	return strings.TrimPrefix(poolid, ipamDriverName+"_")
+	return strings.TrimPrefix(poolid, ipamDriverName+"/")
+}
+
+// IPNetFromReqInfo returns an an IPNet from an ipam request
+func IPNetFromReqInfo(poolid, reqAddr string) (*net.IPNet, error) {
+	_, n, err := net.ParseCIDR(poolFromID(poolid))
+	if err != nil {
+		return nil, err
+	}
+	n.IP = net.ParseIP(reqAddr)
+	if n.IP == nil {
+		return nil, fmt.Errorf("invalid requested address")
+	}
+	return n, nil
 }

docker/ipam/driver.go

@@ -47,7 +47,7 @@ func (d *Driver) RequestPool(r *gphipam.RequestPoolRequest) (*gphipam.RequestPoo
 	}
 
 	rpr := &gphipam.RequestPoolResponse{
-		PoolID: DriverName + "_" + r.Pool,
+		PoolID: DriverName + "/" + r.Pool,
 		Pool:   r.Pool,
 	}
 
@@ -65,6 +65,18 @@ func (d *Driver) ReleasePool(r *gphipam.ReleasePoolRequest) error {
 func (d *Driver) RequestAddress(r *gphipam.RequestAddressRequest) (*gphipam.RequestAddressResponse, error) {
 	d.log.WithField("r", r).Debug("RequestAddress()")
 
+	// Always respond with the gateway address if specified
+	// This is called on network create, and network create will fail if this returns an error
+	if r.Options["RequestAddressType"] == "com.docker.network.gateway" && r.Address != "" {
+		r, err := core.IPNetFromReqInfo(r.PoolID, r.Address)
+		if err != nil {
+			return nil, err
+		}
+		return &gphipam.RequestAddressResponse{
+			Address: r.String(),
+		}, nil
+	}
+
 	addr, err := d.core.ConnectAndGetAddress(r.Address, r.PoolID)
 	if err != nil {
 		log.WithField("r.Address", r.Address).WithField("r.PoolID", r.PoolID).Error("failed to get address")