fix: address comment

Author: santhoshmprabhu

network/endpoint.go

@@ -218,7 +218,9 @@ func (nw *network) deleteEndpoint(nl netlink.NetlinkInterface, plc platform.Exec
 	// Call the platform implementation.
 	// Pass nil for epClient and will be initialized in deleteEndpointImpl
 	err = nw.deleteEndpointImpl(nl, plc, nil, nioc, nsc, iptc, dhcpc, ep)
-	if err != nil {
+	if err == ErrMissingHNSID {
+		logger.Info("HNS ID is missing, skipping endpoint deletion")
+	} else if err != nil {
 		return err
 	}
 

network/endpoint_windows_test.go

@@ -81,7 +81,6 @@ func TestNewAndDeleteEndpointImplHnsV2(t *testing.T) {
 	}
 
 	err = nw.deleteEndpointImplHnsV2(ep)
-
 	if err != nil {
 		fmt.Printf("+%v", err)
 		t.Fatal(err)
@@ -137,8 +136,8 @@ func TestDeleteEndpointImplHnsV2WithEmptyHNSID(t *testing.T) {
 	mockCli := NewMockEndpointClient(nil)
 	err := nw.deleteEndpointImpl(netlink.NewMockNetlink(false, ""), platform.NewMockExecClient(false), mockCli,
 		netio.NewMockNetIO(false, 0), NewMockNamespaceClient(), iptables.NewClient(), &mockDHCP{}, &ep)
-	if err != nil {
-		t.Fatal("endpoint deletion gets executed")
+	if err != ErrMissingHNSID {
+		t.Fatalf("unexpected error when deleting endpoint with empty HNS ID: %v", err)
 	}
 }
 

network/errors.go

@@ -8,4 +8,5 @@ var (
 	ErrEndpointStateNotFound   = errors.New("endpoint state could not be found in the statefile")
 	ErrConnectionFailure       = errors.New("couldn't connect to CNS")
 	ErrGetEndpointStateFailure = errors.New("failure to obtain the endpoint state")
+	ErrMissingHNSID            = errors.New("HNS ID missing")
 )

network/manager.go

@@ -542,7 +542,9 @@ func (nm *networkManager) DeleteEndpointState(networkID string, epInfo *Endpoint
 	logger.Info("Deleting endpoint with", zap.String("Endpoint Info: ", epInfo.PrettyString()), zap.String("HNISID : ", ep.HnsId))
 
 	err := nw.deleteEndpointImpl(netlink.NewNetlink(), platform.NewExecClient(logger), nil, nil, nil, nil, nil, ep)
-	if err != nil {
+	if err == ErrMissingHNSID {
+		logger.Info("HNS ID is missing, skipping endpoint deletion")
+	} else if err != nil {
 		return err
 	}