address feedback

Author: QxBytes

cni/network/network.go

@@ -132,9 +132,9 @@ func NewPlugin(name string,
 
 	nl := netlink.NewNetlink()
 	plc := platform.NewExecClient(logger)
-	netio := &netio.NetIO{}
+	nio := &netio.NetIO{}
 	// Setup network manager.
-	nm, err := network.NewNetworkManager(nl, plc, netio, network.NewNamespaceClient(), iptables.NewClient(), dhcp.New(logger, netio))
+	nm, err := network.NewNetworkManager(nl, plc, nio, network.NewNamespaceClient(), iptables.NewClient(), dhcp.New(logger, nio))
 	if err != nil {
 		return nil, err
 	}
@@ -146,7 +146,7 @@ func NewPlugin(name string,
 		nm:                 nm,
 		nnsClient:          client,
 		multitenancyClient: multitenancyClient,
-		netClient:          netio,
+		netClient:          nio,
 	}, nil
 }
 

dhcp/dhcp_windows.go

@@ -17,6 +17,11 @@ const (
 	socketTimeoutMillis      = 1000
 )
 
+var (
+	errInvalidIPv4Address    = errors.New("invalid ipv4 address")
+	errIncorrectAddressCount = errors.New("address count found not equal to expected")
+)
+
 type Socket struct {
 	fd       windows.Handle
 	destAddr windows.SockaddrInet4
@@ -105,7 +110,7 @@ func (c *DHCP) verifyIPv4InterfaceAddressCount(ifName string, count, maxRuns, sl
 	addressCountErr := retry.Do(func() error {
 		addresses, err := c.getIPv4InterfaceAddresses(ifName)
 		if err != nil || len(addresses) != count {
-			return errors.New("address count found not equal to expected")
+			return errIncorrectAddressCount
 		}
 		return nil
 	}, maxRuns, sleepMs)
@@ -125,7 +130,7 @@ func (c *DHCP) DiscoverRequest(ctx context.Context, macAddress net.HardwareAddr,
 	}
 	uniqueAddress := ipv4Addresses[0].To4()
 	if uniqueAddress == nil {
-		return errors.New("invalid ipv4 address")
+		return errInvalidIPv4Address
 	}
 	uniqueAddressStr := uniqueAddress.String()
 	c.logger.Info("Retrieved automatic ip configuration: ", zap.Any("ip", uniqueAddress), zap.String("ipStr", uniqueAddressStr))

network/network_windows.go

@@ -438,8 +438,7 @@ func (nm *networkManager) newNetworkImplHnsV2(nwInfo *EndpointInfo, extIf *exter
 func (nm *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
+	timeout := 15 * 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))