address feedback, move send request to before hns network creation

Author: QxBytes

dhcp/dhcp_windows.go

@@ -12,12 +12,12 @@ import (
 )
 
 const (
-	dummyIPAddressStr      = "169.254.128.10"
-	dummySubnetMask        = "255.255.128.0"
-	addIPAddressTimeout    = 10 * time.Second
-	deleteIPAddressTimeout = 2 * time.Second
+	dummyIPAddressStr    = "169.254.128.10"
+	dummySubnetMask      = "255.255.128.0"
+	addIPAddressDelay    = 4 * time.Second
+	deleteIPAddressDelay = 2 * time.Second
 
-	socketTimeout = 1000
+	socketTimeoutMillis = 1000
 )
 
 var (
@@ -53,7 +53,7 @@ func NewSocket(destAddr windows.SockaddrInet4) (*Socket, error) {
 		return ret, errors.Wrap(err, "error setting SO_BROADCAST")
 	}
 	// Set timeout
-	if err = windows.SetsockoptInt(windows.Handle(fd), windows.SOL_SOCKET, windows.SO_RCVTIMEO, socketTimeout); err != nil {
+	if err = windows.SetsockoptInt(windows.Handle(fd), windows.SOL_SOCKET, windows.SO_RCVTIMEO, socketTimeoutMillis); err != nil {
 		return ret, errors.Wrap(err, "error setting receive timeout")
 	}
 	return ret, nil
@@ -99,7 +99,7 @@ func (c *DHCP) DiscoverRequest(ctx context.Context, macAddress net.HardwareAddr,
 	if err != nil {
 		c.logger.Info("Could not remove dummy ip", zap.String("output", ret), zap.Error(err))
 	}
-	time.Sleep(deleteIPAddressTimeout)
+	time.Sleep(deleteIPAddressDelay)
 
 	// create dummy ip so we can direct the packet to the correct interface
 	ret, err = c.execClient.ExecuteCommand(ctx, "netsh", "interface", "ipv4", "add", "address", ifName, dummyIPAddressStr, dummySubnetMask)
@@ -114,7 +114,7 @@ func (c *DHCP) DiscoverRequest(ctx context.Context, macAddress net.HardwareAddr,
 		}
 	}()
 	// it takes time for the address to be assigned
-	time.Sleep(addIPAddressTimeout)
+	time.Sleep(addIPAddressDelay)
 
 	// now begin the dhcp request
 	txid, err := GenerateTransactionID()

network/endpoint_windows.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"net"
 	"strings"
-	"time"
 
 	"github.com/Azure/azure-container-networking/cns"
 	"github.com/Azure/azure-container-networking/netio"
@@ -142,21 +141,6 @@ func (nw *network) getEndpointWithVFDevice(plc platform.ExecClient, epInfo *Endp
 	return ep, nil
 }
 
-func (nw *network) sendDHCPDiscoverOnSecondary(client dhcpClient, mac net.HardwareAddr, ifName string) error {
-	// issue dhcp discover packet to ensure mapping created for dns via wireserver to work
-	// we do not use the response for anything
-	numSecs := 15 // we need to wait for the address to be assigned
-	timeout := time.Duration(numSecs) * time.Second
-	ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(timeout))
-	defer cancel()
-	logger.Info("Sending DHCP packet", zap.Any("macAddress", mac), zap.String("ifName", ifName))
-	err := client.DiscoverRequest(ctx, mac, ifName)
-	if err != nil {
-		return errors.Wrapf(err, "failed to issue dhcp discover packet to create mapping in host")
-	}
-	return nil
-}
-
 // newEndpointImpl creates a new endpoint in the network.
 func (nw *network) newEndpointImpl(
 	cli apipaClient,
@@ -172,12 +156,6 @@ func (nw *network) newEndpointImpl(
 	if epInfo.NICType == cns.BackendNIC {
 		return nw.getEndpointWithVFDevice(plc, epInfo)
 	}
-	if epInfo.NICType == cns.NodeNetworkInterfaceFrontendNIC {
-		// use master interface name, interface name, or adapter name?
-		if err := nw.sendDHCPDiscoverOnSecondary(dhcpc, epInfo.MacAddress, epInfo.MasterIfName); err != nil {
-			return nil, err
-		}
-	}
 
 	if useHnsV2, err := UseHnsV2(epInfo.NetNsPath); useHnsV2 {
 		if err != nil {

network/network_windows.go

@@ -4,8 +4,10 @@
 package network
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
+	"net"
 	"strconv"
 	"strings"
 	"time"
@@ -433,8 +435,30 @@ func (nm *networkManager) newNetworkImplHnsV2(nwInfo *EndpointInfo, extIf *exter
 	return nw, nil
 }
 
+func (nw *networkManager) sendDHCPDiscoverOnSecondary(client dhcpClient, mac net.HardwareAddr, ifName string) error {
+	// issue dhcp discover packet to ensure mapping created for dns via wireserver to work
+	// we do not use the response for anything
+	numSecs := 15 // we need to wait for the address to be assigned
+	timeout := time.Duration(numSecs) * time.Second
+	ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(timeout))
+	defer cancel()
+	logger.Info("Sending DHCP packet", zap.Any("macAddress", mac), zap.String("ifName", ifName))
+	err := client.DiscoverRequest(ctx, mac, ifName)
+	if err != nil {
+		return errors.Wrapf(err, "failed to issue dhcp discover packet to create mapping in host")
+	}
+	return nil
+}
+
 // NewNetworkImpl creates a new container network.
 func (nm *networkManager) newNetworkImpl(nwInfo *EndpointInfo, extIf *externalInterface) (*network, error) {
+	if nwInfo.NICType == cns.NodeNetworkInterfaceFrontendNIC {
+		// use master interface name, interface name, or adapter name?
+		if err := nm.sendDHCPDiscoverOnSecondary(nm.dhcpClient, nwInfo.MacAddress, nwInfo.MasterIfName); err != nil {
+			return nil, err
+		}
+	}
+
 	if useHnsV2, err := UseHnsV2(nwInfo.NetNs); useHnsV2 {
 		if err != nil {
 			return nil, err