update synhost skip test scenario

fix linting error

updated lint error

fix linting error

.

Author: NihaNallappagari

cns/restserver/internalapi_test.go

@@ -42,6 +42,7 @@ const (
 	batchSize           = 10
 	initPoolSize        = 10
 	ncID                = "6a07155a-32d7-49af-872f-1e70ee366dc0"
+	macAddress          = "00:11:22:33:44:55"
 )
 
 var dnsservers = []string{"8.8.8.8", "8.8.4.4"}
@@ -315,38 +316,26 @@ 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
+			req := createNCReqeustForSyncHostNCVersion(t, macAddress)
+			containerStatus := svc.state.ContainerStatus[req.NetworkContainerid]
+			//// HostVersion -1 and NC Version 0  and should remain unchanged, should not error
 			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)
+			assert.Equal(t, "-1", containerStatus.HostVersion)
+			assert.Equal(t, "0", containerStatus.CreateNetworkContainerRequest.Version)
 		})
 	}
 }
 
-func createNCReqeustForSyncHostNCVersion(t *testing.T) cns.CreateNetworkContainerRequest {
+func createNCReqeustForSyncHostNCVersion(t *testing.T, macAddresses ...string) cns.CreateNetworkContainerRequest {
+	var macAddress string
+	if len(macAddresses) > 0 {
+		macAddress = macAddresses[0]
+	} else {
+		macAddress = ""
+	}
 	restartService()
 	setEnv(t)
 	setOrchestratorTypeInternal(cns.KubernetesCRD)
@@ -360,7 +349,7 @@ func createNCReqeustForSyncHostNCVersion(t *testing.T) cns.CreateNetworkContaine
 	secIPConfig := newSecondaryIPConfig(ipAddress, ncVersion)
 	ipID := uuid.New()
 	secondaryIPConfigs[ipID.String()] = secIPConfig
-	req := createNCReqInternal(t, secondaryIPConfigs, ncID, strconv.Itoa(ncVersion))
+	req := createNCReqInternal(t, secondaryIPConfigs, ncID, strconv.Itoa(ncVersion), macAddress)
 	return req
 }
 
@@ -939,7 +928,14 @@ func validateNetworkRequest(t *testing.T, req cns.CreateNetworkContainerRequest)
 	}
 }
 
-func generateNetworkContainerRequest(secondaryIps map[string]cns.SecondaryIPConfig, ncID, ncVersion string) *cns.CreateNetworkContainerRequest {
+func generateNetworkContainerRequest(secondaryIps map[string]cns.SecondaryIPConfig, ncID, ncVersion string, macAddress ...string) *cns.CreateNetworkContainerRequest {
+	var mac string
+	if len(macAddress) > 0 {
+		mac = macAddress[0]
+	} else {
+		mac = ""
+	}
+
 	var ipConfig cns.IPConfiguration
 	ipConfig.DNSServers = dnsservers
 	ipConfig.GatewayIPAddress = gatewayIP
@@ -953,6 +949,9 @@ func generateNetworkContainerRequest(secondaryIps map[string]cns.SecondaryIPConf
 		NetworkContainerid:   ncID,
 		IPConfiguration:      ipConfig,
 		Version:              ncVersion,
+		NetworkInterfaceInfo: cns.NetworkInterfaceInfo{
+			MACAddress: mac,
+		},
 	}
 
 	ncVersionInInt, _ := strconv.Atoi(ncVersion)
@@ -1079,8 +1078,14 @@ func validateIPAMStateAfterReconcile(t *testing.T, ncReqs []*cns.CreateNetworkCo
 	}
 }
 
-func createNCReqInternal(t *testing.T, secondaryIPConfigs map[string]cns.SecondaryIPConfig, ncID, ncVersion string) cns.CreateNetworkContainerRequest {
-	req := generateNetworkContainerRequest(secondaryIPConfigs, ncID, ncVersion)
+func createNCReqInternal(t *testing.T, secondaryIPConfigs map[string]cns.SecondaryIPConfig, ncID, ncVersion string, macAddresses ...string) cns.CreateNetworkContainerRequest {
+	var macAddress string
+	if len(macAddresses) > 0 {
+		macAddress = macAddresses[0]
+	} else {
+		macAddress = ""
+	}
+	req := generateNetworkContainerRequest(secondaryIPConfigs, ncID, ncVersion, macAddress)
 	returnCode := svc.CreateOrUpdateNetworkContainerInternal(req)
 	if returnCode != 0 {
 		t.Fatalf("Failed to createNetworkContainerRequest, req: %+v, err: %d", req, returnCode)