Use nmagent.(HomeAZResponse).ContainsFixes in CNS

This alters the response to use the ContainsFixes method added to the
HomeAzResponse. Rather than using API Version directly, the more
semantically-meaningful constants from the nmagent package are used
instead to indicate whether or not some bugfixes have been applied.

Author: timraymond

cns/restserver/homeazmonitor.go

@@ -154,14 +154,7 @@ func (h *HomeAzMonitor) Populate(ctx context.Context) {
 		h.update(returnCode, returnMessage, cns.HomeAzResponse{IsSupported: true})
 		return
 	}
-	// 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, NmaAppliedTheIPV6Fix: azResponse.NmaAppliedTheIPV6Fix()})
+	h.update(types.Success, "Get Home Az succeeded", cns.HomeAzResponse{IsSupported: true, HomeAz: azResponse.HomeAz, NmaAppliedTheIPV6Fix: azResponse.ContainsFixes(nmagent.HomeAZFixIPv6)})
 }
 
 // update constructs a GetHomeAzResponse entity and update its cache

cns/restserver/homeazmonitor_test.go

@@ -28,7 +28,7 @@ func TestHomeAzMonitor(t *testing.T) {
 					return []string{"GetHomeAz"}, nil
 				},
 				GetHomeAzF: func(_ context.Context) (nmagent.AzResponse, error) {
-					return nmagent.AzResponse{HomeAz: uint(1), APIVersion: uint(2)}, nil
+					return nmagent.AzResponse{HomeAz: uint(1), AppliedFixes: []nmagent.HomeAZFix{nmagent.HomeAZFixIPv6}}, nil
 				},
 			},
 			cns.HomeAzResponse{IsSupported: true, HomeAz: uint(1), NmaAppliedTheIPV6Fix: true},
@@ -67,7 +67,7 @@ func TestHomeAzMonitor(t *testing.T) {
 					return []string{GetHomeAzAPIName}, nil
 				},
 				GetHomeAzF: func(_ context.Context) (nmagent.AzResponse, error) {
-					return nmagent.AzResponse{HomeAz: uint(1), APIVersion: uint(1)}, nil
+					return nmagent.AzResponse{HomeAz: uint(1), AppliedFixes: []nmagent.HomeAZFix{nmagent.HomeAZFixIPv6}}, nil
 				},
 			},
 			cns.HomeAzResponse{IsSupported: true},