Skip to content

Commit 6d4d8e9

Browse files
committed
fix: addressing the comments
1 parent 859f4e4 commit 6d4d8e9

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

network/network_windows.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ const (
4545
defaultIPv6NextHop = "fe80::1234:5678:9abc"
4646
)
4747

48+
var errHcnNetworkCreate = errors.New("Failed to create hcn network")
49+
var errHcnNetworkGet = errors.New("Failed to get hcn network")
50+
4851
// Windows implementation of route.
4952
type route interface{}
5053

@@ -365,18 +368,19 @@ func (nm *networkManager) newNetworkImplHnsV2(nwInfo *EndpointInfo, extIf *exter
365368
} else {
366369
if strings.Contains(err.Error(), "already exists") {
367370
// fetch the network name again since the parallel CNI Add call has created the HNS network
371+
logger.Error("Failed to create hcn network.due to error:", zap.String("hnsResponse", hcnNetwork.Name), zap.String("hnsResponse", err.Error()))
368372
hnsResponse, err = Hnsv2.GetNetworkByName(hcnNetwork.Name)
369373
if err != nil {
370-
return nil, fmt.Errorf("Failed to get hcn network: %s due to error: %v", hcnNetwork.Name, err)
374+
return nil, fmt.Errorf("%s: %s due to error %s", errHcnNetworkGet, hcnNetwork.Name, err.Error())
371375
}
372-
logger.Info("Successfully fetched hcn network with response", zap.Any("hnsResponse", hnsResponse))
376+
logger.Info("Successfully fetched hcn network with response", zap.Any("hnsResponse", hnsResponse.Id))
373377
} else {
374-
return nil, fmt.Errorf("Failed to create hcn network: %s due to error: %v", hcnNetwork.Name, err)
378+
return nil, fmt.Errorf("%s: %s due to error %s", errHcnNetworkCreate, hcnNetwork.Name, err.Error())
375379
}
376380
}
377381
} else {
378382
// we can't validate if the network already exists, don't continue
379-
return nil, fmt.Errorf("Failed to create hcn network: %s, failed to query for existing network with error: %v", hcnNetwork.Name, err)
383+
return nil, fmt.Errorf("%s: %s due to error %s", errHcnNetworkCreate, hcnNetwork.Name, err.Error())
380384
}
381385
} else {
382386
if hcnNetwork.Type == hcn.Transparent {

0 commit comments

Comments
 (0)