handle synchostversion sync on pon swiftv2 nic

Author: NihaNallappagari

cns/restserver/internalapi.go

@@ -191,6 +191,13 @@ func (service *HTTPRestService) syncHostNCVersion(ctx context.Context, channelMo
 	outdatedNCs := map[string]struct{}{}
 	programmedNCs := map[string]struct{}{}
 	for idx := range service.state.ContainerStatus {
+
+		// For prefix-on-NIC SwiftV2 NIC scenario, the NC details is published to different path in NMAgent and call to NMA here creates error. So Skipping nma check, synchost version logic.
+		ncStatus := service.state.ContainerStatus[idx]
+		if mac := ncStatus.CreateNetworkContainerRequest.NetworkInterfaceInfo.MACAddress; mac != "" {
+			logger.Printf("NC %s has MAC address for prefix on nic swiftv2 scenario, skipping syncHostNCVersion", ncStatus.ID)
+			continue
+		}
 		// Will open a separate PR to convert all the NC version related variable to int. Change from string to int is a pain.
 		localNCVersion, err := strconv.Atoi(service.state.ContainerStatus[idx].HostVersion)
 		if err != nil {

cns/restserver/internalapi_test.go

@@ -312,6 +312,40 @@ func TestPendingIPsGotUpdatedWhenSyncHostNCVersion(t *testing.T) {
 	}
 }
 
+func TestSyncHostNCVersion_SkipsNCVersionForPrefixOnNICSwiftV2(t *testing.T) {
+	orchestratorTypes := []string{cns.Kubernetes, cns.KubernetesCRD}
+	for _, orchestratorType := range orchestratorTypes {
+		orchestratorType := orchestratorType
+		t.Run(orchestratorType, func(t *testing.T) {
+			restartService()
+			setEnv(t)
+			setOrchestratorTypeInternal(orchestratorType)
+
+			ncID := "swiftv2-ncid"
+			svc.state.ContainerStatus = map[string]containerstatus{
+				ncID: {
+					ID:          ncID,
+					HostVersion: "2",
+					CreateNetworkContainerRequest: cns.CreateNetworkContainerRequest{
+						NetworkContainerid: ncID,
+						Version:            "1",
+						NetworkInterfaceInfo: cns.NetworkInterfaceInfo{
+							MACAddress: "00:11:22:33:44:55",
+						},
+					},
+				},
+			}
+
+			// Should not error, and should not attempt version check
+			svc.SyncHostNCVersion(context.Background(), orchestratorType)
+			// HostVersion and Version should remain unchanged
+			containerStatus := svc.state.ContainerStatus[ncID]
+			assert.Equal(t, "2", containerStatus.HostVersion)
+			assert.Equal(t, "1", containerStatus.CreateNetworkContainerRequest.Version)
+		})
+	}
+}
+
 func createNCReqeustForSyncHostNCVersion(t *testing.T) cns.CreateNetworkContainerRequest {
 	restartService()
 	setEnv(t)