remove unwanted changes

Author: NihaNallappagari

cns/restserver/internalapi.go

@@ -222,8 +222,7 @@ func (service *HTTPRestService) syncHostNCVersion(ctx context.Context, channelMo
 	if len(outdatedNCs) == 0 {
 		return len(programmedNCs), nil
 	}
-	// Todo: Query NMA for the supported API to validate the build version. If supported, query IMDS for the Swiftv2 NC version list and perform synchostversion update.
-	// WorkItem: https://msazure.visualstudio.com/One/_workitems/edit/33460135
+
 	ncVersionListResp, err := service.nma.GetNCVersionList(ctx)
 	if err != nil {
 		return len(programmedNCs), errors.Wrap(err, "failed to get nc version list from nmagent")

cns/restserver/internalapi_test.go

@@ -11,6 +11,7 @@ import (
 	"os"
 	"reflect"
 	"strconv"
+	"strings"
 	"sync"
 	"testing"
 	"time"
@@ -44,7 +45,6 @@ const (
 	initPoolSize        = 10
 	ncID                = "6a07155a-32d7-49af-872f-1e70ee366dc0"
 	imdsNCID            = "6a07155a-32d7-49af-872f-1e70ee36imds"
-	macAddress          = "00:11:22:33:44:55"
 )
 
 var dnsservers = []string{"8.8.8.8", "8.8.4.4"}
@@ -337,6 +337,212 @@ func TestPendingIPsGotUpdatedWhenSyncHostNCVersion(t *testing.T) {
 	}
 }
 
+func TestSyncHostNCVersionErrorMissingNC(t *testing.T) {
+	req := createNCReqeustForSyncHostNCVersion(t)
+
+	svc.Lock()
+	ncStatus := svc.state.ContainerStatus[req.NetworkContainerid]
+	ncStatus.CreateNetworkContainerRequest.Version = "2"
+	ncStatus.HostVersion = "0"
+	svc.state.ContainerStatus[req.NetworkContainerid] = ncStatus
+	svc.Unlock()
+
+	// Setup IMDS mock with different interface IDs (not matching the outdated NC)
+	cleanupIMDS := setupIMDSMockAPIsWithCustomIDs(svc, []string{"different-nc-id-1", "different-nc-id-2"})
+	defer cleanupIMDS()
+
+	// NMAgent returns empty
+	mnma := &fakes.NMAgentClientFake{
+		GetNCVersionListF: func(_ context.Context) (nma.NCVersionList, error) {
+			return nma.NCVersionList{
+				Containers: []nma.NCVersion{},
+			}, nil
+		},
+	}
+	cleanup := setMockNMAgent(svc, mnma)
+	defer cleanup()
+
+	_, err := svc.syncHostNCVersion(context.Background(), cns.KubernetesCRD)
+	if err == nil {
+		t.Errorf("Expected error when NC is missing from both NMAgent and IMDS, but got nil")
+	}
+
+	// Check that the error message contains the expected text
+	expectedErrorText := "unable to update some NCs"
+	if !strings.Contains(err.Error(), expectedErrorText) {
+		t.Errorf("Expected error to contain '%s', but got: %v", expectedErrorText, err)
+	}
+
+	// Verify that the NC HostVersion was not updated, should still be 0
+	containerStatus := svc.state.ContainerStatus[req.NetworkContainerid]
+	if containerStatus.HostVersion != "0" {
+		t.Errorf("Expected HostVersion to remain 0, but got %s", containerStatus.HostVersion)
+	}
+}
+
+func TestSyncHostNCVersionLocalVersionHigher(t *testing.T) {
+	// Test scenario where local NC version is higher than consolidated NC version from IMDS
+	// This should trigger the "NC version from consolidated sources is decreasing" error
+	req := createNCReqeustForSyncHostNCVersion(t)
+
+	svc.Lock()
+	ncStatus := svc.state.ContainerStatus[req.NetworkContainerid]
+	ncStatus.CreateNetworkContainerRequest.Version = "1" // DNC version is 1
+	ncStatus.HostVersion = "3"                           // But local host version is 3
+	svc.state.ContainerStatus[req.NetworkContainerid] = ncStatus
+	svc.Unlock()
+
+	// Create IMDS mock that returns lower version(1) than local host version(3)
+	// Setup IMDS mock with version support
+	cleanupIMDS := setupIMDSMockAPIsWithCustomIDs(svc, []string{imdsNCID, "nc2"})
+	defer cleanupIMDS()
+
+	mnma := &fakes.NMAgentClientFake{
+		GetNCVersionListF: func(_ context.Context) (nma.NCVersionList, error) {
+			return nma.NCVersionList{
+				Containers: []nma.NCVersion{},
+			}, nil
+		},
+	}
+	cleanup := setMockNMAgent(svc, mnma)
+	defer cleanup()
+
+	_, err := svc.syncHostNCVersion(context.Background(), cns.KubernetesCRD)
+	if err != nil {
+		t.Errorf("Expected sync to succeed, but got error: %v", err)
+	}
+
+	// Verify that the NC HostVersion was NOT updated (should remain "3")
+	containerStatus := svc.state.ContainerStatus[req.NetworkContainerid]
+	if containerStatus.HostVersion != "3" {
+		t.Errorf("Expected HostVersion to remain 3 (unchanged due to decreasing version), got %s", containerStatus.HostVersion)
+	}
+
+	t.Logf("Successfully handled decreasing version scenario: local=%s, consolidated=%s",
+		containerStatus.HostVersion, "2")
+}
+
+func TestSyncHostNCVersionLocalHigherThanDNC(t *testing.T) {
+	// Test scenario where localNCVersion > dncNCVersion
+	// This should trigger an error log: "NC version from NMAgent is larger than DNC"
+	req := createNCReqeustForSyncHostNCVersion(t)
+
+	// Set up the NC state where HostVersion (localNCVersion) > DNC NC Version
+	svc.Lock()
+	ncStatus := svc.state.ContainerStatus[req.NetworkContainerid]
+	ncStatus.CreateNetworkContainerRequest.Version = "1"
+	ncStatus.HostVersion = "3"
+	svc.state.ContainerStatus[req.NetworkContainerid] = ncStatus
+	svc.Unlock()
+
+	cleanupIMDS := setupIMDSMockAPIsWithCustomIDs(svc, []string{imdsNCID, "nc2"})
+	defer cleanupIMDS()
+
+	mnma := &fakes.NMAgentClientFake{
+		GetNCVersionListF: func(_ context.Context) (nma.NCVersionList, error) {
+			return nma.NCVersionList{
+				Containers: []nma.NCVersion{}, // Empty
+			}, nil
+		},
+	}
+	cleanup := setMockNMAgent(svc, mnma)
+	defer cleanup()
+
+	// This should detect that localNCVersion (3) > dncNCVersion (1) and log error
+	// but since there are no outdated NCs, it should return successfully
+	_, err := svc.syncHostNCVersion(context.Background(), cns.KubernetesCRD)
+	if err != nil {
+		t.Errorf("Expected no error when localNCVersion > dncNCVersion (no outdated NCs), but got: %v", err)
+	}
+
+	containerStatus := svc.state.ContainerStatus[req.NetworkContainerid]
+	if containerStatus.HostVersion != "3" {
+		t.Errorf("Expected HostVersion to remain 3 (unchanged), got %s", containerStatus.HostVersion)
+	}
+
+	// Verify that the DNC version remains unchanged, should still be 1
+	if containerStatus.CreateNetworkContainerRequest.Version != "1" {
+		t.Errorf("Expected DNC version to remain 1 (unchanged), got %s", containerStatus.CreateNetworkContainerRequest.Version)
+	}
+
+	t.Logf("Successfully handled localNCVersion > dncNCVersion scenario: local=%s, dnc=%s",
+		containerStatus.HostVersion, containerStatus.CreateNetworkContainerRequest.Version)
+}
+
+func TestSyncHostNCVersionIMDSAPIVersionNotSupported(t *testing.T) {
+	orchestratorTypes := []string{cns.Kubernetes, cns.KubernetesCRD}
+	for _, orchestratorType := range orchestratorTypes {
+		t.Run(orchestratorType, func(t *testing.T) {
+			req := createNCReqeustForSyncHostNCVersion(t)
+
+			// Make the NMA NC up-to-date so it doesn't interfere with the test
+			svc.Lock()
+			nmaNCStatus := svc.state.ContainerStatus[req.NetworkContainerid]
+			nmaNCStatus.HostVersion = "0" // Same as Version "0", so not outdated
+			svc.state.ContainerStatus[req.NetworkContainerid] = nmaNCStatus
+			svc.Unlock()
+
+			// NMAgent mock - not important for this test, just needs to not interfere
+			mnma := &fakes.NMAgentClientFake{
+				GetNCVersionListF: func(_ context.Context) (nma.NCVersionList, error) {
+					return nma.NCVersionList{Containers: []nma.NCVersion{}}, nil
+				},
+			}
+			cleanup := setMockNMAgent(svc, mnma)
+			defer cleanup()
+
+			// Add IMDS NC that is outdated - this is the focus of the test
+			svc.state.ContainerStatus[imdsNCID] = containerstatus{
+				ID:          imdsNCID,
+				VMVersion:   "0",
+				HostVersion: "-1", // Outdated
+				CreateNetworkContainerRequest: cns.CreateNetworkContainerRequest{
+					NetworkContainerid: imdsNCID,
+					Version:            "1", // Higher than HostVersion
+				},
+			}
+
+			// Setup IMDS mock that returns API versions WITHOUT the expected version "2025-07-24"
+			mockIMDS := &struct {
+				networkInterfaces func(_ context.Context) ([]imds.NetworkInterface, error)
+				imdsVersions      func(_ context.Context) (*imds.APIVersionsResponse, error)
+			}{
+				networkInterfaces: func(_ context.Context) ([]imds.NetworkInterface, error) {
+					return []imds.NetworkInterface{
+						{InterfaceCompartmentID: imdsNCID},
+					}, nil
+				},
+				imdsVersions: func(_ context.Context) (*imds.APIVersionsResponse, error) {
+					return &imds.APIVersionsResponse{
+						APIVersions: []string{"2017-03-01", "2021-01-01"}, // Missing "2025-07-24"
+					}, nil
+				},
+			}
+			originalIMDS := svc.imdsClient
+			svc.imdsClient = &mockIMDSAdapter{mockIMDS}
+			defer func() { svc.imdsClient = originalIMDS }()
+
+			// Test should fail because of outdated IMDS NC that can't be updated
+			_, err := svc.syncHostNCVersion(context.Background(), orchestratorType)
+			if err == nil {
+				t.Errorf("Expected error when there are outdated IMDS NCs but API version is not supported, but got nil")
+			}
+
+			// Verify the error is about being unable to update NCs
+			expectedErrorText := "unable to update some NCs"
+			if !strings.Contains(err.Error(), expectedErrorText) {
+				t.Errorf("Expected error to contain '%s', but got: %v", expectedErrorText, err)
+			}
+
+			// Only verify IMDS NC state - this is the focus of the test
+			imdsContainerStatus := svc.state.ContainerStatus[imdsNCID]
+			if imdsContainerStatus.HostVersion != "-1" {
+				t.Errorf("Expected IMDS NC HostVersion to remain -1, got %s", imdsContainerStatus.HostVersion)
+			}
+		})
+	}
+}
+
 func createNCReqeustForSyncHostNCVersion(t *testing.T) cns.CreateNetworkContainerRequest {
 	restartService()
 	setEnv(t)