remove DHCP error msg fix

Signed-off-by: GitHub <[email protected]>

Author: isaac-dasan

network/secondary_endpoint_client_linux.go

@@ -13,7 +13,6 @@ import (
 	"github.com/Azure/azure-container-networking/platform"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
-	"k8s.io/kubernetes/pkg/kubelet"
 )
 
 var errorSecondaryEndpointClient = errors.New("SecondaryEndpointClient Error")
@@ -142,7 +141,7 @@ func (client *SecondaryEndpointClient) ConfigureContainerInterfacesAndRoutes(epI
 	logger.Info("Sending DHCP packet", zap.Any("macAddress", epInfo.MacAddress), zap.String("ifName", epInfo.IfName))
 	err := client.dhcpClient.DiscoverRequest(ctx, epInfo.MacAddress, epInfo.IfName)
 	if err != nil {
-		return errors.Wrapf(err, kubelet.NetworkNotReadyErrorMsg+" - failed to issue dhcp discover packet to create mapping in host")
+		return errors.Wrapf(err, "failed to issue dhcp discover packet to create mapping in host")
 	}
 	logger.Info("Finished configuring container interfaces and routes for secondary endpoint client")
 

network/secondary_endpoint_linux_test.go

@@ -4,8 +4,6 @@
 package network
 
 import (
-	"context"
-	"errors"
 	"net"
 	"testing"
 
@@ -15,18 +13,8 @@ import (
 	"github.com/Azure/azure-container-networking/network/networkutils"
 	"github.com/Azure/azure-container-networking/platform"
 	"github.com/stretchr/testify/require"
-	"k8s.io/kubernetes/pkg/kubelet"
 )
 
-var errMockDHCPFailure = errors.New("failed to send dhcp discover packet")
-
-// mockDHCPFail is a failing DHCP client mock for testing error scenarios
-type mockDHCPFail struct{}
-
-func (netns *mockDHCPFail) DiscoverRequest(context.Context, net.HardwareAddr, string) error {
-	return errMockDHCPFailure
-}
-
 func TestSecondaryAddEndpoints(t *testing.T) {
 	nl := netlink.NewMockNetlink(false, "")
 	plc := platform.NewMockExecClient(false)
@@ -375,33 +363,6 @@ func TestSecondaryConfigureContainerInterfacesAndRoutes(t *testing.T) {
 			wantErr:    true,
 			wantErrMsg: "SecondaryEndpointClient Error: routes expected for eth1",
 		},
-		{
-			name: "Configure Interface and routes fail with network is not ready error",
-			client: &SecondaryEndpointClient{
-				netlink:        netlink.NewMockNetlink(false, ""),
-				plClient:       platform.NewMockExecClient(false),
-				netUtilsClient: networkutils.NewNetworkUtils(nl, plc),
-				netioshim:      netio.NewMockNetIO(false, 0),
-				dhcpClient:     &mockDHCPFail{},
-				ep:             &endpoint{SecondaryInterfaces: map[string]*InterfaceInfo{"eth1": {Name: "eth1"}}},
-			},
-			epInfo: &EndpointInfo{
-				IfName: "eth1",
-				IPAddresses: []net.IPNet{
-					{
-						IP:   net.ParseIP("192.168.0.4"),
-						Mask: net.CIDRMask(subnetv4Mask, ipv4Bits),
-					},
-				},
-				Routes: []RouteInfo{
-					{
-						Dst: net.IPNet{IP: net.ParseIP("192.168.0.4"), Mask: net.CIDRMask(ipv4FullMask, ipv4Bits)},
-					},
-				},
-			},
-			wantErr:    true,
-			wantErrMsg: kubelet.NetworkNotReadyErrorMsg,
-		},
 	}
 
 	for _, tt := range tests {