fix UTs

Author: paulyufan2

cns/middlewares/k8sSwiftV2.go

@@ -3,6 +3,7 @@ package middlewares
 import (
 	"context"
 	"fmt"
+	"net/netip"
 
 	"github.com/Azure/azure-container-networking/cns"
 	"github.com/Azure/azure-container-networking/cns/configuration"
@@ -259,7 +260,7 @@ func (k *K8sSWIFTv2Middleware) addRoutes(cidrs []string, gatewayIP string) []cns
 	return routes
 }
 
-func (k *K8sSWIFTv2Middleware) SetInfraRoutes() ([]cns.Route, error) {
+func (k *K8sSWIFTv2Middleware) SetInfraRoutes(podIPInfo *cns.PodIpInfo) ([]cns.Route, error) {
 	var routes []cns.Route
 
 	// Get and parse infraVNETCIDRs from env

cns/middlewares/k8sSwiftV2_linux.go

@@ -27,11 +27,11 @@ func (k *K8sSWIFTv2Middleware) setRoutes(podIPInfo *cns.PodIpInfo) error {
 		routes = append(routes, virtualGWRoute, route)
 
 	case cns.InfraNIC:
-		infraRoutes, err := k.SetInfraRoutes()
+		infraRoutes, err := k.SetInfraRoutes(podIPInfo)
 		if err != nil {
 			return errors.Wrap(err, "failed to set routes for infraNIC interface")
 		}
-		routes = append(routes, infraRoutes)
+		routes = infraRoutes
 		podIPInfo.SkipDefaultRoutes = true
 
 	case cns.NodeNetworkInterfaceBackendNIC: //nolint:exhaustive // ignore exhaustive types check

cns/middlewares/k8sSwiftV2_windows.go

@@ -1,8 +1,9 @@
 package middlewares
 
 import (
+	"fmt"
+
 	"github.com/Azure/azure-container-networking/cns"
-	"github.com/Azure/azure-container-networking/cns/logger"
 	"github.com/Azure/azure-container-networking/cns/middlewares/utils"
 	"github.com/Azure/azure-container-networking/crd/multitenancy/api/v1alpha1"
 	"github.com/pkg/errors"
@@ -12,8 +13,6 @@ import (
 // default route is set for secondary interface NIC(i.e,delegatedNIC)
 func (k *K8sSWIFTv2Middleware) setRoutes(podIPInfo *cns.PodIpInfo) error {
 	if podIPInfo.NICType == cns.InfraNIC {
-		logger.Printf("[SWIFTv2Middleware] skip setting default route on InfraNIC interface")
-
 		// as a workaround, set a default route with gw 0.0.0.0 to avoid HNS setting default route to infraNIC interface
 		// TODO: remove this once HNS supports custom routes adding to the pod
 		route := cns.Route{
@@ -23,11 +22,12 @@ func (k *K8sSWIFTv2Middleware) setRoutes(podIPInfo *cns.PodIpInfo) error {
 		podIPInfo.Routes = append(podIPInfo.Routes, route)
 
 		// add routes for infraNIC
-		routes, err := k.SetInfraRoutes()
+		routes, err := k.SetInfraRoutes(podIPInfo)
+		fmt.Printf("routes are %v", routes)
 		if err != nil {
 			return errors.Wrap(err, "failed to set routes for infraNIC interface")
 		}
-		podIPInfo.Routes = append(podIPInfo.Routes, routes)
+		podIPInfo.Routes = routes
 		podIPInfo.SkipDefaultRoutes = true
 	}
 	return nil

cns/middlewares/k8sSwiftV2_windows_test.go

@@ -1,17 +1,22 @@
 package middlewares
 
 import (
+	"fmt"
 	"reflect"
 	"testing"
 
 	"github.com/Azure/azure-container-networking/cns"
+	"github.com/Azure/azure-container-networking/cns/configuration"
 	"github.com/Azure/azure-container-networking/cns/middlewares/mock"
 	"github.com/Azure/azure-container-networking/crd/multitenancy/api/v1alpha1"
 	"gotest.tools/v3/assert"
 )
 
 func TestSetRoutesSuccess(t *testing.T) {
 	middleware := K8sSWIFTv2Middleware{Cli: mock.NewClient()}
+	t.Setenv(configuration.EnvPodCIDRs, "10.0.1.10/24,16A0:0010:AB00:001E::2/32")
+	t.Setenv(configuration.EnvServiceCIDRs, "10.0.0.0/16,16A0:0010:AB00:0000::/32")
+	t.Setenv(configuration.EnvInfraVNETCIDRs, "10.240.0.1/16,16A0:0020:AB00:0000::/32")
 
 	podIPInfo := []cns.PodIpInfo{
 		{
@@ -32,6 +37,7 @@ func TestSetRoutesSuccess(t *testing.T) {
 	}
 	for i := range podIPInfo {
 		ipInfo := &podIPInfo[i]
+		fmt.Printf("ipInfo is %v", ipInfo)
 		err := middleware.setRoutes(ipInfo)
 		assert.Equal(t, err, nil)
 		if ipInfo.NICType == cns.InfraNIC {