Merge pull request #41 from Azure/development

Development

Author: ofiliz

cni/network/network.go

@@ -158,13 +158,20 @@ func (plugin *netPlugin) Add(args *cniSkel.CmdArgs) error {
 		return nil
 	}
 
+	ip, ipv4Address, err := net.ParseCIDR(address)
+	ipv4Address.IP = ip
+	if err != nil {
+		log.Printf("[cni] Failed to parse address %v, err:%v.", address, err)
+		return nil
+	}
+
 	log.Printf("[cni] Allocated address: %v", address)
 
 	// Create the endpoint.
 	epInfo := network.EndpointInfo{
 		Id:          endpointId,
 		IfName:      args.IfName,
-		IPv4Address: address,
+		IPv4Address: *ipv4Address,
 		NetNsPath:   args.Netns,
 	}
 
@@ -175,15 +182,8 @@ func (plugin *netPlugin) Add(args *cniSkel.CmdArgs) error {
 	}
 
 	// Output the result.
-	ip, cidr, err := net.ParseCIDR(address)
-	cidr.IP = ip
-	if err != nil {
-		log.Printf("[cni] Failed to parse address, err:%v.", err)
-		return nil
-	}
-
 	result := &cniTypes.Result{
-		IP4: &cniTypes.IPConfig{IP: *cidr},
+		IP4: &cniTypes.IPConfig{IP: *ipv4Address},
 	}
 
 	result.Print()
@@ -238,7 +238,7 @@ func (plugin *netPlugin) Delete(args *cniSkel.CmdArgs) error {
 	}
 
 	// Release the address.
-	err = plugin.am.ReleaseAddress(nwCfg.Ipam.AddrSpace, nwInfo.Subnets[0], epInfo.IPv4Address)
+	err = plugin.am.ReleaseAddress(nwCfg.Ipam.AddrSpace, nwInfo.Subnets[0], epInfo.IPv4Address.IP.String())
 	if err != nil {
 		log.Printf("[cni] Failed to release address, err:%v.", err)
 		return nil

cnm/network/network.go

@@ -4,6 +4,7 @@
 package network
 
 import (
+	"net"
 	"net/http"
 
 	"github.com/Azure/azure-container-networking/cnm"
@@ -18,6 +19,9 @@ const (
 
 	// Plugin capabilities.
 	scope = "local"
+
+	// Prefix for container network interface names.
+	containerInterfacePrefix = "eth"
 )
 
 // NetPlugin represents a CNM (libnetwork) network plugin.
@@ -186,14 +190,20 @@ func (plugin *netPlugin) createEndpoint(w http.ResponseWriter, r *http.Request)
 	}
 
 	// Process request.
-	var ipv4Address string
+	var ipv4Address *net.IPNet
 	if req.Interface != nil {
-		ipv4Address = req.Interface.Address
+		var ip net.IP
+		ip, ipv4Address, err = net.ParseCIDR(req.Interface.Address)
+		if err != nil {
+			plugin.SendErrorResponse(w, err)
+			return
+		}
+		ipv4Address.IP = ip
 	}
 
 	epInfo := network.EndpointInfo{
 		Id:          req.EndpointID,
-		IPv4Address: ipv4Address,
+		IPv4Address: *ipv4Address,
 	}
 
 	err = plugin.nm.CreateEndpoint(req.NetworkID, &epInfo)
@@ -257,8 +267,8 @@ func (plugin *netPlugin) join(w http.ResponseWriter, r *http.Request) {
 
 	// Encode response.
 	ifname := interfaceName{
-		SrcName:   ep.SrcName,
-		DstPrefix: ep.DstPrefix,
+		SrcName:   ep.IfName,
+		DstPrefix: containerInterfacePrefix,
 	}
 
 	resp := joinResponse{

network/endpoint.go

@@ -24,8 +24,8 @@ const (
 type endpoint struct {
 	Id          string
 	SandboxKey  string
-	SrcName     string
-	DstPrefix   string
+	IfName      string
+	HostIfName  string
 	MacAddress  net.HardwareAddr
 	IPv4Address net.IPNet
 	IPv6Address net.IPNet
@@ -37,8 +37,8 @@ type endpoint struct {
 type EndpointInfo struct {
 	Id          string
 	IfName      string
-	IPv4Address string
 	NetNsPath   string
+	IPv4Address net.IPNet
 }
 
 // NewEndpoint creates a new endpoint in the network.
@@ -54,12 +54,7 @@ func (nw *network) newEndpoint(epInfo *EndpointInfo) (*endpoint, error) {
 		return nil, errEndpointExists
 	}
 
-	// Parse IP address.
-	ipAddr, ipNet, err := net.ParseCIDR(epInfo.IPv4Address)
-	ipNet.IP = ipAddr
-	if err != nil {
-		return nil, err
-	}
+	ipAddr := epInfo.IPv4Address
 
 	// Create a veth pair.
 	hostIfName := fmt.Sprintf("%s%s", hostInterfacePrefix, epInfo.Id[:7])
@@ -102,7 +97,7 @@ func (nw *network) newEndpoint(epInfo *EndpointInfo) (*endpoint, error) {
 
 	// Setup MAC address translation rules for container interface.
 	log.Printf("[net] Setting up MAC address translation rules for endpoint %v.", contIfName)
-	err = ebtables.SetupDnatBasedOnIPV4Address(ipAddr.String(), containerIf.HardwareAddr.String())
+	err = ebtables.SetupDnatBasedOnIPV4Address(ipAddr.IP.String(), containerIf.HardwareAddr.String())
 	if err != nil {
 		goto cleanup
 	}
@@ -158,8 +153,8 @@ func (nw *network) newEndpoint(epInfo *EndpointInfo) (*endpoint, error) {
 	}
 
 	// Assign IP address to container network interface.
-	log.Printf("[net] Adding IP address %v to link %v.", ipAddr, contIfName)
-	err = netlink.AddIpAddress(contIfName, ipAddr, ipNet)
+	log.Printf("[net] Adding IP address %v to link %v.", ipAddr.String(), contIfName)
+	err = netlink.AddIpAddress(contIfName, ipAddr.IP, &ipAddr)
 	if err != nil {
 		goto cleanup
 	}
@@ -177,10 +172,10 @@ func (nw *network) newEndpoint(epInfo *EndpointInfo) (*endpoint, error) {
 	// Create the endpoint object.
 	ep = &endpoint{
 		Id:          epInfo.Id,
-		SrcName:     contIfName,
-		DstPrefix:   containerInterfacePrefix,
+		IfName:      contIfName,
+		HostIfName:  hostIfName,
 		MacAddress:  containerIf.HardwareAddr,
-		IPv4Address: *ipNet,
+		IPv4Address: ipAddr,
 		IPv6Address: net.IPNet{},
 		IPv4Gateway: nw.extIf.IPv4Gateway,
 		IPv6Gateway: nw.extIf.IPv6Gateway,
@@ -203,25 +198,41 @@ cleanup:
 
 // DeleteEndpoint deletes an existing endpoint from the network.
 func (nw *network) deleteEndpoint(endpointId string) error {
+	log.Printf("[net] Deleting endpoint %v from network %v.", endpointId, nw.Id)
+
+	// Look up the endpoint.
 	ep, err := nw.getEndpoint(endpointId)
 	if err != nil {
-		return err
+		goto cleanup
 	}
 
-	log.Printf("[net] Deleting endpoint %+v.", ep)
-
-	// Delete veth pair.
-	netlink.DeleteLink(ep.SrcName)
+	// Delete the veth pair by deleting one of the peer interfaces.
+	// Deleting the host interface is more convenient since it does not require
+	// entering the container netns and hence works both for CNI and CNM.
+	log.Printf("[net] Deleting veth pair %v %v.", ep.HostIfName, ep.IfName)
+	err = netlink.DeleteLink(ep.HostIfName)
+	if err != nil {
+		goto cleanup
+	}
 
-	// Cleanup MAC address translation rules.
+	// Delete MAC address translation rule.
+	log.Printf("[net] Deleting MAC address translation rule for endpoint %v.", endpointId)
 	err = ebtables.RemoveDnatBasedOnIPV4Address(ep.IPv4Address.IP.String(), ep.MacAddress.String())
+	if err != nil {
+		goto cleanup
+	}
 
 	// Remove the endpoint object.
 	delete(nw.Endpoints, endpointId)
 
 	log.Printf("[net] Deleted endpoint %+v.", ep)
 
 	return nil
+
+cleanup:
+	log.Printf("[net] Deleting endpoint %v failed, err:%v.", endpointId, err)
+
+	return err
 }
 
 // GetEndpoint returns the endpoint with the given ID.

network/manager.go

@@ -251,7 +251,7 @@ func (nm *networkManager) GetEndpointInfo(networkId string, endpointId string) (
 
 	epInfo := &EndpointInfo{
 		Id:          endpointId,
-		IPv4Address: ep.IPv4Address.String(),
+		IPv4Address: ep.IPv4Address,
 	}
 
 	return epInfo, nil