remove synchost skip and single ip skip

Author: NihaNallappagari

cns/kubecontroller/nodenetworkconfig/conversion_linux.go

@@ -16,15 +16,12 @@ import (
 func createNCRequestFromStaticNCHelper(nc v1alpha.NetworkContainer, primaryIPPrefix netip.Prefix, subnet cns.IPSubnet) (*cns.CreateNetworkContainerRequest, error) {
 	secondaryIPConfigs := map[string]cns.SecondaryIPConfig{}
 
-	// in the case of vnet prefix on swift v2 the primary IP is a /32 and should not be added to secondary IP configs
-	if !primaryIPPrefix.IsSingleIP() {
-		// iterate through all IP addresses in the subnet described by primaryPrefix and
-		// add them to the request as secondary IPConfigs.
-		for addr := primaryIPPrefix.Masked().Addr(); primaryIPPrefix.Contains(addr); addr = addr.Next() {
-			secondaryIPConfigs[addr.String()] = cns.SecondaryIPConfig{
-				IPAddress: addr.String(),
-				NCVersion: int(nc.Version),
-			}
+	// iterate through all IP addresses in the subnet described by primaryPrefix and
+	// add them to the request as secondary IPConfigs.
+	for addr := primaryIPPrefix.Masked().Addr(); primaryIPPrefix.Contains(addr); addr = addr.Next() {
+		secondaryIPConfigs[addr.String()] = cns.SecondaryIPConfig{
+			IPAddress: addr.String(),
+			NCVersion: int(nc.Version),
 		}
 	}
 

cns/restserver/internalapi.go

@@ -191,13 +191,6 @@ 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 prefix on NIC 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

@@ -42,7 +42,6 @@ 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"}
@@ -313,29 +312,7 @@ func TestPendingIPsGotUpdatedWhenSyncHostNCVersion(t *testing.T) {
 	}
 }
 
-func TestSyncHostNCVersion_SkipsNCVersionForPrefixOnNICSwiftV2(t *testing.T) {
-	orchestratorTypes := []string{cns.Kubernetes, cns.KubernetesCRD}
-	for _, orchestratorType := range orchestratorTypes {
-		t.Run(orchestratorType, func(t *testing.T) {
-			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
-			assert.Equal(t, "-1", containerStatus.HostVersion)
-			assert.Equal(t, "0", containerStatus.CreateNetworkContainerRequest.Version)
-		})
-	}
-}
-
-func createNCReqeustForSyncHostNCVersion(t *testing.T, macAddresses ...string) cns.CreateNetworkContainerRequest {
-	var macAddress string
-	if len(macAddresses) > 0 {
-		macAddress = macAddresses[0]
-	} else {
-		macAddress = ""
-	}
+func createNCReqeustForSyncHostNCVersion(t *testing.T) cns.CreateNetworkContainerRequest {
 	restartService()
 	setEnv(t)
 	setOrchestratorTypeInternal(cns.KubernetesCRD)
@@ -349,7 +326,7 @@ func createNCReqeustForSyncHostNCVersion(t *testing.T, macAddresses ...string) c
 	secIPConfig := newSecondaryIPConfig(ipAddress, ncVersion)
 	ipID := uuid.New()
 	secondaryIPConfigs[ipID.String()] = secIPConfig
-	req := createNCReqInternal(t, secondaryIPConfigs, ncID, strconv.Itoa(ncVersion), macAddress)
+	req := createNCReqInternal(t, secondaryIPConfigs, ncID, strconv.Itoa(ncVersion))
 	return req
 }
 
@@ -928,14 +905,7 @@ func validateNetworkRequest(t *testing.T, req 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 = ""
-	}
-
+func generateNetworkContainerRequest(secondaryIps map[string]cns.SecondaryIPConfig, ncID, ncVersion string) *cns.CreateNetworkContainerRequest {
 	var ipConfig cns.IPConfiguration
 	ipConfig.DNSServers = dnsservers
 	ipConfig.GatewayIPAddress = gatewayIP
@@ -949,9 +919,6 @@ func generateNetworkContainerRequest(secondaryIps map[string]cns.SecondaryIPConf
 		NetworkContainerid:   ncID,
 		IPConfiguration:      ipConfig,
 		Version:              ncVersion,
-		NetworkInterfaceInfo: cns.NetworkInterfaceInfo{
-			MACAddress: mac,
-		},
 	}
 
 	ncVersionInInt, _ := strconv.Atoi(ncVersion)
@@ -1078,14 +1045,8 @@ func validateIPAMStateAfterReconcile(t *testing.T, ncReqs []*cns.CreateNetworkCo
 	}
 }
 
-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)
+func createNCReqInternal(t *testing.T, secondaryIPConfigs map[string]cns.SecondaryIPConfig, ncID, ncVersion string) cns.CreateNetworkContainerRequest {
+	req := generateNetworkContainerRequest(secondaryIPConfigs, ncID, ncVersion)
 	returnCode := svc.CreateOrUpdateNetworkContainerInternal(req)
 	if returnCode != 0 {
 		t.Fatalf("Failed to createNetworkContainerRequest, req: %+v, err: %d", req, returnCode)