address comment

Author: ZetaoZhuang

cns/api.go

@@ -354,9 +354,9 @@ type NmAgentSupportedApisResponse struct {
 }
 
 type HomeAzResponse struct {
-	IsSupported bool `json:"isSupported"`
-	HomeAz      uint `json:"homeAz"`
-	APIVersion  uint `json:"apiVersion"`
+	IsSupported          bool `json:"isSupported"`
+	HomeAz               uint `json:"homeAz"`
+	NmaAppliedTheIPV6Fix bool `json:"NmaAppliedTheIPV6Fix"`
 }
 
 type GetHomeAzResponse struct {

cns/restserver/homeazmonitor.go

@@ -154,15 +154,14 @@ func (h *HomeAzMonitor) Populate(ctx context.Context) {
 		h.update(returnCode, returnMessage, cns.HomeAzResponse{IsSupported: true})
 		return
 	}
-	// validate APIVersion, APIVersion is a uint, so its value >=0
-	// 0 should be valid when NMA version is old and does not have the apiVersion value in home az response
-	if azResponse.APIVersion > 0 && azResponse.APIVersion != 2 {
+	// validate APIVersion value
+	if !azResponse.Valid() {
 		returnMessage := fmt.Sprintf("[HomeAzMonitor] invalid APIVersion value from nmagent: %d", azResponse.APIVersion)
 		returnCode := types.UnexpectedError
 		h.update(returnCode, returnMessage, cns.HomeAzResponse{IsSupported: true})
 		return
 	}
-	h.update(types.Success, "Get Home Az succeeded", cns.HomeAzResponse{IsSupported: true, HomeAz: azResponse.HomeAz, APIVersion: azResponse.APIVersion})
+	h.update(types.Success, "Get Home Az succeeded", cns.HomeAzResponse{IsSupported: true, HomeAz: azResponse.HomeAz, NmaAppliedTheIPV6Fix: azResponse.NmaAppliedTheIPV6Fix()})
 }
 
 // update constructs a GetHomeAzResponse entity and update its cache

cns/restserver/homeazmonitor_test.go

@@ -31,7 +31,7 @@ func TestHomeAzMonitor(t *testing.T) {
 					return nmagent.AzResponse{HomeAz: uint(1), APIVersion: uint(2)}, nil
 				},
 			},
-			cns.HomeAzResponse{IsSupported: true, HomeAz: uint(1), APIVersion: uint(2)},
+			cns.HomeAzResponse{IsSupported: true, HomeAz: uint(1), NmaAppliedTheIPV6Fix: true},
 			false,
 		},
 		{

nmagent/responses.go

@@ -42,6 +42,15 @@ type AzResponse struct {
 	APIVersion uint `json:"apiVersion"`
 }
 
+func (az AzResponse) Valid() bool {
+	// 0 should be valid when NMA version is old and does not have the apiVersion value in home az response
+	return az.APIVersion == 0 || az.APIVersion == 2
+}
+
+func (az AzResponse) NmaAppliedTheIPV6Fix() bool {
+	return az.APIVersion == 2
+}
+
 type NodeIP struct {
 	Address   IPAddress `xml:"Address,attr"`
 	IsPrimary bool      `xml:"IsPrimary,attr"`