test(windows): Enable more Windows tests (openservicemesh#4143)

Despite issue openservicemesh#4141 I was able to validate and enable a bunch of tests on Windows

    1. Add a Windows pod for tcp requests
    2. Add a Windows pod for httpbin
    3. Aggregate timeouts accross platform on a single variable

Signed-off-by: Sotiris Nanopoulos <[email protected]>

Author: Sotiris Nanopoulos

tests/e2e/e2e_controller_restart_test.go

@@ -15,6 +15,7 @@ var _ = OSMDescribe("Test HTTP traffic from 1 pod client -> 1 pod server before
 	OSMDescribeInfo{
 		Tier:   2,
 		Bucket: 1,
+		OS:     OSCrossPlatform,
 	},
 	func() {
 		Context("SimpleClientServer traffic test involving osm-controller restart: HTTP", func() {
@@ -40,14 +41,7 @@ func testHTTPTrafficWithControllerRestart() {
 		}
 
 		// Get simple pod definitions for the HTTP server
-		svcAccDef, podDef, svcDef, err := Td.SimplePodApp(
-			SimplePodAppDef{
-				PodName:   destName,
-				Namespace: destName,
-				Image:     "kennethreitz/httpbin",
-				Ports:     []int{80},
-				OS:        Td.ClusterOS,
-			})
+		svcAccDef, podDef, svcDef, err := Td.GetOSSpecificHTTPBinPod(destName, destName)
 		Expect(err).NotTo(HaveOccurred())
 
 		_, err = Td.CreateServiceAccount(destName, &svcAccDef)
@@ -88,7 +82,7 @@ func testHTTPTrafficWithControllerRestart() {
 			SourcePod:       srcPod.Name,
 			SourceContainer: srcPod.Name,
 
-			Destination: fmt.Sprintf("%s.%s", dstSvc.Name, dstSvc.Namespace),
+			Destination: fmt.Sprintf("%s.%s.svc.cluster.local", dstSvc.Name, dstSvc.Namespace),
 		}
 
 		srcToDestStr := fmt.Sprintf("%s -> %s",
@@ -105,7 +99,7 @@ func testHTTPTrafficWithControllerRestart() {
 			}
 			Td.T.Logf("> (%s) HTTP Req succeeded: %d", srcToDestStr, result.StatusCode)
 			return true
-		}, 5, 90*time.Second)
+		}, 5, Td.ReqSuccessTimeout)
 
 		Expect(cond).To(BeTrue(), "Failed testing HTTP traffic from source pod %s to destination service %s", srcPod.Name, dstSvc.Name)
 
@@ -124,7 +118,7 @@ func testHTTPTrafficWithControllerRestart() {
 			}
 			Td.T.Logf("%s > (%s) HTTP Req succeeded: %d", time.Now(), srcToDestStr, result.StatusCode)
 			return true
-		}, 20, 80*time.Second)
+		}, 20, Td.ReqSuccessTimeout)
 		Expect(cond).To(BeTrue(), "Failed testing HTTP traffic from source pod %s to destination service %s after osm-controller restart", srcPod.Name, dstSvc.Name)
 	})
 }

tests/e2e/e2e_egress_test.go

@@ -7,7 +7,6 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/openservicemesh/osm/pkg/constants"
 	. "github.com/openservicemesh/osm/tests/framework"
 )
 
@@ -45,7 +44,7 @@ var _ = OSMDescribe("HTTP and HTTPS Egress",
 				Expect(err).NotTo(HaveOccurred())
 
 				// Expect it to be up and running in it's receiver namespace
-				Expect(Td.WaitForPodsRunningReady(sourceNs, 240*time.Second, 1, nil)).To(Succeed())
+				Expect(Td.WaitForPodsRunningReady(sourceNs, Td.PodDeploymentTimeout, 1, nil)).To(Succeed())
 				protocols := []string{
 					"http://",
 					"https://",
@@ -61,12 +60,6 @@ var _ = OSMDescribe("HTTP and HTTPS Egress",
 					}
 				}
 
-				waitTime := 60 * time.Second
-				if Td.ClusterOS == constants.OSWindows {
-					//TODO(#4027): Make the timeouts equal on all platforms.
-					waitTime = 5 * 60 * time.Second
-				}
-
 				for _, url := range urls {
 					cond := Td.WaitForRepeatedSuccess(func() bool {
 						result := Td.HTTPRequest(HTTPRequestDef{
@@ -83,7 +76,7 @@ var _ = OSMDescribe("HTTP and HTTPS Egress",
 						}
 						Td.T.Logf("%s > REST req succeeded: %d", url, result.StatusCode)
 						return true
-					}, 5, waitTime)
+					}, 5, Td.ReqSuccessTimeout)
 					Expect(cond).To(BeTrue())
 				}
 

tests/e2e/e2e_pod_client_server_test.go

@@ -12,13 +12,15 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"github.com/openservicemesh/osm/pkg/constants"
 	. "github.com/openservicemesh/osm/tests/framework"
 )
 
 var _ = OSMDescribe("Test HTTP traffic from 1 pod client -> 1 pod server",
 	OSMDescribeInfo{
 		Tier:   1,
 		Bucket: 7,
+		OS:     OSCrossPlatform,
 	},
 	func() {
 		Context("Test traffic flowing from client to server with a Kubernetes Service for the Source: HTTP", func() {
@@ -51,14 +53,7 @@ func testTraffic(withSourceKubernetesService bool) {
 		}
 
 		// Get simple pod definitions for the HTTP server
-		svcAccDef, podDef, svcDef, err := Td.SimplePodApp(
-			SimplePodAppDef{
-				PodName:   destName,
-				Namespace: destName,
-				Image:     "kennethreitz/httpbin",
-				Ports:     []int{80},
-				OS:        Td.ClusterOS,
-			})
+		svcAccDef, podDef, svcDef, err := Td.GetOSSpecificHTTPBinPod(destName, destName)
 		Expect(err).NotTo(HaveOccurred())
 
 		_, err = Td.CreateServiceAccount(destName, &svcAccDef)
@@ -99,7 +94,7 @@ func testTraffic(withSourceKubernetesService bool) {
 			SourcePod:       srcPod.Name,
 			SourceContainer: sourceName,
 
-			Destination: fmt.Sprintf("%s.%s", dstSvc.Name, dstSvc.Namespace),
+			Destination: fmt.Sprintf("%s.%s.svc.cluster.local", dstSvc.Name, dstSvc.Namespace),
 		}
 
 		srcToDestStr := fmt.Sprintf("%s -> %s",
@@ -116,7 +111,7 @@ func testTraffic(withSourceKubernetesService bool) {
 			}
 			Td.T.Logf("> (%s) HTTP Req succeeded: %d", srcToDestStr, result.StatusCode)
 			return true
-		}, 5, 90*time.Second)
+		}, 5, Td.ReqSuccessTimeout)
 
 		sourceService := map[bool]string{true: "with", false: "without"}[withSourceKubernetesService]
 		Expect(cond).To(BeTrue(), "Failed testing HTTP traffic from source pod %s Kubernetes Service to a destination", sourceService)
@@ -142,15 +137,32 @@ func testTraffic(withSourceKubernetesService bool) {
 }
 
 func setupSource(sourceName string, withKubernetesService bool) *v1.Pod {
-	// Get simple Pod definitions for the client
-	svcAccDef, podDef, svcDef, err := Td.SimplePodApp(SimplePodAppDef{
-		PodName:   sourceName,
-		Namespace: sourceName,
-		Command:   []string{"sleep", "365d"},
-		Image:     "curlimages/curl",
-		Ports:     []int{80},
-		OS:        Td.ClusterOS,
-	})
+	var svcAccDef v1.ServiceAccount
+	var podDef v1.Pod
+	var svcDef v1.Service
+	var err error
+	if Td.ClusterOS == constants.OSWindows {
+		svcAccDef, podDef, svcDef, err = Td.SimplePodApp(SimplePodAppDef{
+			PodName:   sourceName,
+			Namespace: sourceName,
+			Command:   []string{"cmd", "/c"},
+			Args:      []string{"FOR /L %N IN () DO ping -n 30 127.0.0.1> nul"},
+			Image:     WindowsNanoserverDockerImage,
+			Ports:     []int{80},
+			OS:        Td.ClusterOS,
+		})
+	} else {
+		// Get simple Pod definitions for the client
+		svcAccDef, podDef, svcDef, err = Td.SimplePodApp(SimplePodAppDef{
+			PodName:   sourceName,
+			Namespace: sourceName,
+			Command:   []string{"sleep", "365d"},
+			Image:     "curlimages/curl",
+			Ports:     []int{80},
+			OS:        Td.ClusterOS,
+		})
+	}
+
 	Expect(err).NotTo(HaveOccurred())
 
 	_, err = Td.CreateServiceAccount(sourceName, &svcAccDef)
@@ -166,7 +178,7 @@ func setupSource(sourceName string, withKubernetesService bool) *v1.Pod {
 	}
 
 	// Expect it to be up and running in it's receiver namespace
-	Expect(Td.WaitForPodsRunningReady(sourceName, 90*time.Second, 1, nil)).To(Succeed())
+	Expect(Td.WaitForPodsRunningReady(sourceName, Td.PodDeploymentTimeout, 1, nil)).To(Succeed())
 
 	return srcPod
 }

tests/e2e/e2e_tcp_client_server_test.go

@@ -11,7 +11,6 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/openservicemesh/osm/pkg/constants"
 	"github.com/openservicemesh/osm/tests/framework"
 	. "github.com/openservicemesh/osm/tests/framework"
 )
@@ -20,6 +19,7 @@ var _ = OSMDescribe("Test TCP traffic from 1 pod client -> 1 pod server",
 	OSMDescribeInfo{
 		Tier:   1,
 		Bucket: 8,
+		OS:     OSCrossPlatform,
 	},
 	func() {
 		Context("SimpleClientServer TCP with SMI policies", func() {
@@ -56,17 +56,8 @@ func testTCPTraffic(permissiveMode bool) {
 		destinationPort := 80
 
 		// Get simple pod definitions for the TCP server
-		svcAccDef, podDef, svcDef, err := Td.SimplePodApp(
-			SimplePodAppDef{
-				PodName:     framework.RandomNameWithPrefix("pod"),
-				Namespace:   destNs,
-				Image:       fmt.Sprintf("%s/tcp-echo-server:%s", installOpts.ContainerRegistryLoc, installOpts.OsmImagetag),
-				Command:     []string{"/tcp-echo-server"},
-				Args:        []string{"--port", fmt.Sprintf("%d", destinationPort)},
-				Ports:       []int{destinationPort},
-				AppProtocol: constants.ProtocolTCP,
-				OS:          Td.ClusterOS,
-			})
+		svcAccDef, podDef, svcDef, err := Td.GetOSSpecificTCPEchoPod(framework.RandomNameWithPrefix("pod"), destNs, destinationPort)
+
 		Expect(err).NotTo(HaveOccurred())
 
 		_, err = Td.CreateServiceAccount(destNs, &svcAccDef)
@@ -115,7 +106,7 @@ func testTCPTraffic(permissiveMode bool) {
 			SourcePod:       srcPod.Name,
 			SourceContainer: srcPod.Name,
 
-			DestinationHost: fmt.Sprintf("%s.%s", dstSvc.Name, dstSvc.Namespace),
+			DestinationHost: fmt.Sprintf("%s.%s.svc.cluster.local", dstSvc.Name, dstSvc.Namespace),
 			DestinationPort: destinationPort,
 			Message:         requestMsg,
 		}
@@ -140,7 +131,7 @@ func testTCPTraffic(permissiveMode bool) {
 			}
 			Td.T.Logf("> (%s) TCP Req succeeded, response: %s", srcToDestStr, result.Response)
 			return true
-		}, 5, 90*time.Second)
+		}, 5, Td.ReqSuccessTimeout)
 
 		Expect(cond).To(BeTrue(), "Failed testing TCP traffic from %s", srcToDestStr)
 

tests/e2e/e2e_tcp_egress_test.go

@@ -16,6 +16,10 @@ var _ = OSMDescribe("Test TCP traffic from 1 pod client -> egress server",
 	OSMDescribeInfo{
 		Tier:   1,
 		Bucket: 9,
+		// TODO(#1610): This test assumes that the user can create a pod that is not part of the mesh.
+		// On Windows we set the HNS policies on all pods on the cluster and as a result we can't
+		// have pods that are not part of the mesh. This will be resolved when OSM CNI is available.
+		OS: constants.OSLinux,
 	},
 	func() {
 		Context("SimpleClientServer egress TCP", func() {

tests/framework/common.go

@@ -217,8 +217,13 @@ func (td *OsmTestData) InitTestData(t GinkgoTInterface) error {
 
 	if td.DeployOnWindowsWorkers {
 		td.ClusterOS = constants.OSWindows
+		//TODO(#4027): Make the timeouts equal on all platforms.
+		td.ReqSuccessTimeout = 5 * 60 * time.Second
+		td.PodDeploymentTimeout = 240 * time.Second
 	} else {
 		td.ClusterOS = constants.OSLinux
+		td.ReqSuccessTimeout = 60 * time.Second
+		td.PodDeploymentTimeout = 90 * time.Second
 	}
 
 	// String parameter validation

tests/framework/common_apps.go

@@ -545,6 +545,30 @@ func (td *OsmTestData) SimpleDeploymentApp(def SimpleDeploymentAppDef) (corev1.S
 	return serviceAccountDefinition, deploymentDefinition, serviceDefinition, nil
 }
 
+// GetOSSpecificHTTPBinPod returns a OS pod that runs httpbin.
+func (td *OsmTestData) GetOSSpecificHTTPBinPod(podName string, namespace string) (corev1.ServiceAccount, corev1.Pod, corev1.Service, error) {
+	if td.ClusterOS == constants.OSWindows {
+		return Td.SimplePodApp(
+			SimplePodAppDef{
+				PodName:   podName,
+				Namespace: namespace,
+				Command:   []string{"bin/go-httpbin.exe"},
+				Args:      []string{"--port", "80"},
+				Image:     HttpbinOSMWindowsImage,
+				Ports:     []int{80},
+				OS:        Td.ClusterOS,
+			})
+	}
+	return Td.SimplePodApp(
+		SimplePodAppDef{
+			PodName:   podName,
+			Namespace: namespace,
+			Image:     "kennethreitz/httpbin",
+			Ports:     []int{80},
+			OS:        Td.ClusterOS,
+		})
+}
+
 // GetOSSpecificSleepPod returns a simple OS specific busy loop pod.
 func (td *OsmTestData) GetOSSpecificSleepPod(sourceNs string) (corev1.ServiceAccount, corev1.Pod, corev1.Service, error) {
 	if td.ClusterOS == constants.OSWindows {
@@ -569,6 +593,31 @@ func (td *OsmTestData) GetOSSpecificSleepPod(sourceNs string) (corev1.ServiceAcc
 	})
 }
 
+// GetOSSpecificTCPEchoPod returns a simple OS specific tcp-echo pod.
+func (td *OsmTestData) GetOSSpecificTCPEchoPod(podName string, namespace string, destinationPort int) (corev1.ServiceAccount, corev1.Pod, corev1.Service, error) {
+	var image string
+	var command string
+	installOpts := Td.GetOSMInstallOpts()
+	if td.ClusterOS == constants.OSWindows {
+		image = fmt.Sprintf("%s/tcp-echo-server-windows:%s", installOpts.ContainerRegistryLoc, installOpts.OsmImagetag)
+		command = "/tcp-echo-server.exe"
+	} else {
+		image = fmt.Sprintf("%s/tcp-echo-server:%s", installOpts.ContainerRegistryLoc, installOpts.OsmImagetag)
+		command = "/tcp-echo-server"
+	}
+	return Td.SimplePodApp(
+		SimplePodAppDef{
+			PodName:     podName,
+			Namespace:   namespace,
+			Image:       image,
+			Command:     []string{command},
+			Args:        []string{"--port", fmt.Sprintf("%d", destinationPort)},
+			Ports:       []int{destinationPort},
+			AppProtocol: constants.ProtocolTCP,
+			OS:          Td.ClusterOS,
+		})
+}
+
 // GetGrafanaPodHandle generic func to forward a grafana pod and returns a handler pointing to the locally forwarded resource
 func (td *OsmTestData) GetGrafanaPodHandle(ns string, grafanaPodName string, port uint16) (*Grafana, error) {
 	dialer, err := k8s.DialerToPod(td.RestConfig, td.Client, grafanaPodName, ns)

tests/framework/common_traffic.go

@@ -134,8 +134,18 @@ func (td *OsmTestData) HTTPRequest(ht HTTPRequestDef) HTTPRequestResult {
 
 // TCPRequest runs a synchronous TCP request to run the TCPRequestDef and return a TCPRequestResult
 func (td *OsmTestData) TCPRequest(req TCPRequestDef) TCPRequestResult {
-	commandArgs := fmt.Sprintf("echo \"%s\" | nc %s %d", req.Message, req.DestinationHost, req.DestinationPort)
-	command := []string{"sh", "-c", commandArgs}
+	var command []string
+	if td.ClusterOS == constants.OSWindows {
+		powershellCommand := fmt.Sprintf("$IP = [System.Net.Dns]::GetHostAddresses('%s');", req.DestinationHost) +
+			fmt.Sprintf("$Socket = New-Object System.Net.Sockets.TCPClient($IP, %d);", req.DestinationPort) +
+			"$Stream = $Socket.GetStream(); $Writer = New-Object System.IO.StreamWriter($Stream);" +
+			fmt.Sprintf(" $Writer.WriteLine('%s'); $Writer.Flush();", req.Message) +
+			"$reader = New-Object System.IO.StreamReader($Stream); Write-Host -NoNewline $reader.ReadLine()"
+		command = []string{"pwsh.exe", "-c", powershellCommand}
+	} else {
+		commandArgs := fmt.Sprintf("echo \"%s\" | nc %s %d", req.Message, req.DestinationHost, req.DestinationPort)
+		command = []string{"sh", "-c", commandArgs}
+	}
 
 	stdout, stderr, err := td.RunRemote(req.SourceNs, req.SourcePod, req.SourceContainer, command)
 	if err != nil {

tests/framework/constants.go

@@ -74,5 +74,8 @@ const (
 	EnvoyOSMWindowsImage = "openservicemesh/envoy-windows-nanoserver@sha256:94590d10bc8a46c60cd3a3858d80f3d6577d4e9a191fa05c0077f8b3d6002e22"
 
 	// WindowsNanoserverDockerImage is the base Windows image that is compatible with the test cluster.
-	WindowsNanoserverDockerImage = "mcr.microsoft.com/windows/nanoserver/insider:10.0.20348.1"
+	WindowsNanoserverDockerImage = "mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022"
+
+	// HttpbinOSMWindowsImage is the Windows based httpbin image used for testing.
+	HttpbinOSMWindowsImage = "openservicemesh/go-http-win@sha256:dd81377aa0ff749a5a9a7a1a25786a710f77991c94b3015f674163e32d7fe5f8"
 )

tests/framework/types.go

@@ -1,6 +1,8 @@
 package framework
 
 import (
+	"time"
+
 	"github.com/onsi/ginkgo"
 	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	"k8s.io/client-go/kubernetes"
@@ -66,6 +68,9 @@ type OsmTestData struct {
 
 	ClusterOS string // The operating system of the working nodes in the cluster. Mixed OS traffic is not supported.
 
+	ReqSuccessTimeout    time.Duration // ReqSuccessTimeout timeout duration that the test expects for all requests from the client to server to succeed.
+	PodDeploymentTimeout time.Duration // PodDeploymentTimeout timeout duration that the test expects for all pods to be in ready state after they are deployed.
+
 	// Cluster handles and rest config
 	Env             *cli.EnvSettings
 	RestConfig      *rest.Config