Implemented Windows network and endpoint configuration

Author: ofiliz

network/endpoint.go

@@ -44,7 +44,7 @@ func (nw *network) newEndpoint(epInfo *EndpointInfo) (*endpoint, error) {
 	var ep *endpoint
 	var err error
 
-	log.Printf("[net] Creating endpoint %v in network %v.", epInfo.Id, nw.Id)
+	log.Printf("[net] Creating endpoint %+v in network %v.", epInfo, nw.Id)
 
 	if nw.Endpoints[epInfo.Id] != nil {
 		err = errEndpointExists

network/endpoint_windows.go

@@ -7,6 +7,8 @@ package network
 
 import (
 	"encoding/json"
+	"net"
+	"strings"
 
 	"github.com/Azure/azure-container-networking/log"
 	"github.com/Microsoft/hcsshim"
@@ -16,7 +18,29 @@ import (
 func (nw *network) newEndpointImpl(epInfo *EndpointInfo) (*endpoint, error) {
 	// Initialize HNS endpoint.
 	hnsEndpoint := &hcsshim.HNSEndpoint{
-		Name: epInfo.Id,
+		Name:           epInfo.Id,
+		VirtualNetwork: nw.HnsId,
+		DNSSuffix:      epInfo.DNSSuffix,
+		DNSServerList:  strings.Join(epInfo.DNSServers, ","),
+	}
+
+	// HNS currently supports only one IP address per endpoint.
+	if epInfo.IPAddresses != nil {
+		hnsEndpoint.IPAddress = epInfo.IPAddresses[0].IP
+		pl, _ := epInfo.IPAddresses[0].Mask.Size()
+		hnsEndpoint.PrefixLength = uint8(pl)
+	}
+
+	// HNS currently supports only one (default) route per endpoint.
+	for _, route := range epInfo.Routes {
+		var pl int
+		if route.Dst.Mask != nil {
+			pl, _ = route.Dst.Mask.Size()
+		}
+		if route.Dst.Mask == nil || pl == 0 {
+			hnsEndpoint.GatewayAddress = route.Gw.String()
+			break
+		}
 	}
 
 	// Marshal the request.
@@ -34,12 +58,26 @@ func (nw *network) newEndpointImpl(epInfo *EndpointInfo) (*endpoint, error) {
 		return nil, err
 	}
 
+	// Attach the endpoint.
+	log.Printf("[net] Attaching endpoint %v to container %v.", hnsResponse.Id, epInfo.ContainerID)
+	err = hcsshim.HotAttachEndpoint(epInfo.ContainerID, hnsResponse.Id)
+	if err != nil {
+		log.Printf("[net] Failed to attach endpoint: %v.", err)
+		return nil, err
+	}
+
 	// Create the endpoint object.
 	ep := &endpoint{
 		Id:          epInfo.Id,
 		HnsId:       hnsResponse.Id,
+		SandboxKey:  epInfo.ContainerID,
+		IfName:      epInfo.IfName,
+		IPAddresses: epInfo.IPAddresses,
+		Gateways:    []net.IP{net.ParseIP(hnsEndpoint.GatewayAddress)},
 	}
 
+	ep.MacAddress, _ = net.ParseMAC(hnsResponse.MacAddress)
+
 	return ep, nil
 }
 

network/network_windows.go

@@ -14,8 +14,8 @@ import (
 
 const (
 	// HNS network types.
-	HnsL2bridge = "l2bridge"
-	HnsL2tunnel = "l2tunnel"
+	hnsL2bridge = "l2bridge"
+	hnsL2tunnel = "l2tunnel"
 )
 
 // Windows implementation of route.
@@ -26,18 +26,24 @@ func (nm *networkManager) newNetworkImpl(nwInfo *NetworkInfo, extIf *externalInt
 	// Initialize HNS network.
 	hnsNetwork := &hcsshim.HNSNetwork{
 		Name:               nwInfo.Id,
-		Type:               HnsL2bridge,
 		NetworkAdapterName: extIf.Name,
-		SourceMac:          extIf.MacAddress.String(),
-		DNSSuffix:          "",
-		DNSServerList:      "10.1.1.2",
+	}
+
+	// Set network mode.
+	switch nwInfo.Mode {
+	case opModeBridge:
+		hnsNetwork.Type = hnsL2bridge
+	case opModeTunnel:
+		hnsNetwork.Type = hnsL2tunnel
+	default:
+		return nil, errNetworkModeInvalid
 	}
 
 	// Populate subnets.
 	for _, subnet := range nwInfo.Subnets {
 		hnsSubnet := hcsshim.Subnet{
 			AddressPrefix:  subnet,
-			GatewayAddress: "10.1.1.1",
+			GatewayAddress: extIf.IPv4Gateway.String(),
 		}
 
 		hnsNetwork.Subnets = append(hnsNetwork.Subnets, hnsSubnet)