fix tests

Author: paulgmiller

cns/restserver/internalapi_test.go

@@ -446,7 +446,7 @@ func TestSyncHostNCVersionErrorMissingNC(t *testing.T) {
 	}
 
 	// Check that the error message contains the expected text
-	expectedErrorText := "unable to update some NCs"
+	expectedErrorText := "Have outdated NCs"
 	if !strings.Contains(err.Error(), expectedErrorText) {
 		t.Errorf("Expected error to contain '%s', but got: %v", expectedErrorText, err)
 	}
@@ -607,7 +607,7 @@ func TestSyncHostNCVersionIMDSAPIVersionNotSupported(t *testing.T) {
 			}
 
 			// Verify the error is about being unable to update NCs
-			expectedErrorText := "unable to update some NCs"
+			expectedErrorText := "Have outdated NCs"
 			if !strings.Contains(err.Error(), expectedErrorText) {
 				t.Errorf("Expected error to contain '%s', but got: %v", expectedErrorText, err)
 			}

cns/restserver/nodesubnet.go

@@ -31,7 +31,8 @@ func (service *HTTPRestService) UpdateIPsForNodeSubnet(secondaryIPs []netip.Addr
 
 	// saved NC successfully. UpdateIPsForNodeSubnet is called only when IPs are fetched from NMAgent.
 	// We now have IPs to serve IPAM requests. Generate conflist to indicate CNS is ready
-	service.MustGenerateCNIConflistOnce()
+	service.ncSynced = make(chan struct{}) // in case this is called multiple times
+	service.mustGenerateCNIConflistOnce()
 	return nil
 }
 

cns/restserver/synchostnc.go

@@ -50,7 +50,7 @@ func (service *HTTPRestService) SyncHostNCVersion(ctx context.Context, channelMo
 	if programmedNCCount > 0 {
 		// This will only be done once per lifetime of the CNS process. This function is threadsafe and will panic
 		// if it fails, so it is safe to call in a non-preemptable goroutine.
-		go service.MustGenerateCNIConflistOnce()
+		go service.mustGenerateCNIConflistOnce()
 	} else {
 		logger.Printf("No NCs programmed on this host yet, skipping CNI conflist generation")
 	}
@@ -185,9 +185,11 @@ func (service *HTTPRestService) syncHostNCVersion(ctx context.Context, channelMo
 
 // MustGenerateCNIConflistOnce will generate the CNI conflist once if the service was initialized with
 // a conflist generator. If not, this is a no-op.
-func (service *HTTPRestService) MustGenerateCNIConflistOnce() {
+func (service *HTTPRestService) mustGenerateCNIConflistOnce() {
 	service.generateCNIConflistOnce.Do(func() {
-		close(service.ncSynced)
+		if service.ncSynced != nil {
+			close(service.ncSynced)
+		}
 		if err := service.cniConflistGenerator.Generate(); err != nil {
 			panic("unable to generate cni conflist with error: " + err.Error())
 		}