.

Author: NihaNallappagari

cns/restserver/internalapi.go

@@ -230,8 +230,8 @@ func (service *HTTPRestService) syncHostNCVersion(ctx context.Context, channelMo
 		return len(programmedNCs), errors.Wrap(err, "failed to get nc version list from nmagent")
 	}
 
-	// Get IMDS NC versions for delegated NIC scenarios
-	imdsNCVersions, err := service.getIMDSNCs(ctx)
+	// Get IMDS NC versions for delegated NIC scenarios. If any of the NMA API check calls, imds calls fails assume that nma build doesn't have the latest changes and create empty map
+	imdsNCVersions := service.getIMDSNCs(ctx)
 	if err != nil {
 		// If any of the NMA API check calls, imds calls fails assume that nma build doesn't have the latest changes and create empty map
 		imdsNCVersions = make(map[string]string)
@@ -687,26 +687,26 @@ func (service *HTTPRestService) isNCDetailsAPIExists(ctx context.Context) bool {
 }
 
 // GetIMDSNCs gets NC versions from IMDS and returns them as a map
-func (service *HTTPRestService) getIMDSNCs(ctx context.Context) (map[string]string, error) {
+func (service *HTTPRestService) getIMDSNCs(ctx context.Context) map[string]string {
 	imdsClient := service.imdsClient
 	if imdsClient == nil {
 		//nolint:staticcheck // SA1019: suppress deprecated logger.Printf usage. Todo: legacy logger usage is consistent in cns repo. Migrates when all logger usage is migrated
 		logger.Errorf("IMDS client is not available")
-		return make(map[string]string), nil
+		return make(map[string]string)
 	}
 	// Check NC version support
 	if !service.isNCDetailsAPIExists(ctx) {
 		//nolint:staticcheck // SA1019: suppress deprecated logger.Printf usage. Todo: legacy logger usage is consistent in cns repo. Migrates when all logger usage is migrated
 		logger.Errorf("IMDS does not support NC details API")
-		return make(map[string]string), nil
+		return make(map[string]string)
 	}
 
 	// Get all network interfaces from IMDS
 	networkInterfaces, err := imdsClient.GetNetworkInterfaces(ctx)
 	if err != nil {
 		//nolint:staticcheck // SA1019: suppress deprecated logger.Printf usage. Todo: legacy logger usage is consistent in cns repo. Migrates when all logger usage is migrated
 		logger.Errorf("Failed to get network interfaces from IMDS: %v", err)
-		return make(map[string]string), nil
+		return make(map[string]string)
 	}
 
 	// Build ncs map from the network interfaces
@@ -722,12 +722,13 @@ func (service *HTTPRestService) getIMDSNCs(ctx context.Context) (map[string]stri
 		} else if runtime.GOOS == "windows" && service.isPrefixonNicSwiftV2() {
 			err := service.setPrefixOnNICRegistry(true, iface.MacAddress.String())
 			if err != nil {
+				//nolint:staticcheck // SA1019: suppress deprecated logger.Debugf usage. Todo: legacy logger usage is consistent in cns repo. Migrates when all logger usage is migrated
 				logger.Debugf("failed to add PrefixOnNic keys to Windows registry: %w", err)
 			}
 		}
 	}
 
-	return ncs, nil
+	return ncs
 }
 
 // Check whether NC is SwiftV2 NIC associated NC and prefix on nic is enabled

cns/restserver/internalapi_test.go

@@ -1790,8 +1790,7 @@ func TestSyncHostNCVersionWithWindowsSwiftV2(t *testing.T) {
 	assert.Equal(t, "2", updatedRegularNC.HostVersion, "Regular NC host version should be updated to 2")
 	assert.Equal(t, "2", updatedSwiftV2NC.HostVersion, "SwiftV2 NC host version should be updated to 2")
 
-	imdsNCs, err := testSvc.getIMDSNCs(ctx)
-	assert.NoError(t, err, "getIMDSNCs should not return error")
+	imdsNCs := testSvc.getIMDSNCs(ctx)
 
 	// Verify IMDS results
 	assert.Contains(t, imdsNCs, "nc-with-compartment-id", "NC with compartment ID should be in results")
@@ -1807,8 +1806,4 @@ func TestSyncHostNCVersionWithWindowsSwiftV2(t *testing.T) {
 	// Test with no SwiftV2 NCs
 	delete(testSvc.state.ContainerStatus, swiftV2NCID)
 	assert.False(t, testSvc.isPrefixonNicSwiftV2(), "isPrefixonNicSwiftV2() should return false without SwiftV2 NCs")
-
-	// Call getIMDSNCs again to verify condition is not triggered
-	_, err2 := testSvc.getIMDSNCs(ctx)
-	assert.NoError(t, err2, "getIMDSNCs should not return error")
 }