address comment

Author: ZetaoZhuang

cns/hnsclient/hnsclient_windows.go

@@ -576,7 +576,7 @@ func CreateHostNCApipaEndpoint(
 		return endpoint.Id, nil
 	}
 
-	adhocAdjustIPConfig(&localIPConfiguration)
+	adjustIPConfig(&localIPConfiguration)
 	if network, err = createHostNCApipaNetwork(localIPConfiguration); err != nil {
 		logger.Errorf("[Azure CNS] Failed to create HostNCApipaNetwork. Error: %v", err)
 		return "", err
@@ -608,8 +608,11 @@ func CreateHostNCApipaEndpoint(
 	return endpoint.Id, nil
 }
 
-// adhocAdjustIPConfig applies adhoc change on gw IP address
-func adhocAdjustIPConfig(localIPConfiguration *cns.IPConfiguration) {
+// adjustIPConfig applies change on gw IP address.
+// currently cns using the same ip address "169.254.128.1" for both apipa gw and loopback adapter. This cause conflict
+// issue when hns get restarted and not able to rehydrate the apipa endpoints. This func is to overwrite the address to 169.254.128.2
+// when the gateway address is 169.254.128.1
+func adjustIPConfig(localIPConfiguration *cns.IPConfiguration) {
 	// When gw address is 169.254.128.1, should use .2 instead. If gw address is not .1, that mean this value is
 	// configured from dnc, we should keep it
 	if localIPConfiguration.GatewayIPAddress == "169.254.128.1" {

cns/hnsclient/hnsclient_windows_test.go

@@ -28,7 +28,7 @@ func TestAdhocAdjustIPConfig(t *testing.T) {
 	for _, tt := range tests {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			adhocAdjustIPConfig(&tt.ipConfig)
+			adjustIPConfig(&tt.ipConfig)
 			assert.Equal(t, tt.expected.GatewayIPAddress, tt.ipConfig.GatewayIPAddress)
 		})
 	}