From dfed97a585ec9abf63b6d623f739c87948fd0762 Mon Sep 17 00:00:00 2001 From: jpayne3506 Date: Thu, 27 Jul 2023 18:33:33 -0700 Subject: [PATCH 1/2] refactor: Match other CNI go tests --- .../datapath/datapath_windows_test.go | 44 +++++++++++++------ 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/test/integration/datapath/datapath_windows_test.go b/test/integration/datapath/datapath_windows_test.go index 9a060e9cec..dcd967ffa0 100644 --- a/test/integration/datapath/datapath_windows_test.go +++ b/test/integration/datapath/datapath_windows_test.go @@ -10,7 +10,6 @@ import ( "github.com/Azure/azure-container-networking/test/internal/datapath" "github.com/Azure/azure-container-networking/test/internal/k8sutils" - "github.com/pkg/errors" "github.com/stretchr/testify/require" apiv1 "k8s.io/api/core/v1" ) @@ -46,16 +45,14 @@ Timeout context is controled by the -timeout flag. */ -func TestDatapathWin(t *testing.T) { +func setupWindowsEnvironment(t *testing.T) { ctx := context.Background() t.Log("Create Clientset") clientset, err := k8sutils.MustGetClientset() if err != nil { - require.NoError(t, err) + t.Fatal(err) } - t.Log("Get REST config") - restConfig := k8sutils.MustGetRestConfig(t) t.Log("Create Label Selectors") podLabelSelector := k8sutils.CreateLabelSelector(podLabelKey, podPrefix) @@ -64,7 +61,7 @@ func TestDatapathWin(t *testing.T) { t.Log("Get Nodes") nodes, err := k8sutils.GetNodeListByLabelSelector(ctx, clientset, nodeLabelSelector) if err != nil { - require.NoError(t, err) + t.Fatal(err) } // Create namespace if it doesn't exist @@ -84,7 +81,7 @@ func TestDatapathWin(t *testing.T) { t.Log("Creating Windows pods through deployment") deployment, err := k8sutils.MustParseDeployment(WindowsDeployYamlPath) if err != nil { - require.NoError(t, err) + t.Fatal(err) } // Fields for overwritting existing deployment yaml. @@ -98,13 +95,13 @@ func TestDatapathWin(t *testing.T) { deploymentsClient := clientset.AppsV1().Deployments(*podNamespace) err = k8sutils.MustCreateDeployment(ctx, deploymentsClient, deployment) if err != nil { - require.NoError(t, err) + t.Fatal(err) } t.Log("Waiting for pods to be running state") - err := k8sutils.WaitForPodsRunning(ctx, clientset, *podNamespace, podLabelSelector) + err = k8sutils.WaitForPodsRunning(ctx, clientset, *podNamespace, podLabelSelector) if err != nil { - require.NoError(t, err) + t.Fatal(err) } t.Log("Successfully created customer windows pods") } else { @@ -112,9 +109,9 @@ func TestDatapathWin(t *testing.T) { t.Log("Namespace already exists") t.Log("Checking for pods to be running state") - err := k8sutils.WaitForPodsRunning(ctx, clientset, *podNamespace, podLabelSelector) + err = k8sutils.WaitForPodsRunning(ctx, clientset, *podNamespace, podLabelSelector) if err != nil { - require.NoError(t, err) + t.Fatal(err) } } @@ -123,14 +120,33 @@ func TestDatapathWin(t *testing.T) { pods, err := k8sutils.GetPodsByNode(ctx, clientset, *podNamespace, podLabelSelector, node.Name) if err != nil { - require.NoError(t, err) + t.Fatal(err) } if len(pods.Items) <= 1 { - require.NoError(t, errors.New("Less than 2 pods on node")) + t.Fatal("Less than 2 pods on node") } } t.Log("Windows test environment ready") +} + +func TestDatapathWin(t *testing.T) { + ctx := context.Background() + + t.Log("Get REST config") + restConfig := k8sutils.MustGetRestConfig(t) + t.Log("Create Clientset") + clientset, _ := k8sutils.MustGetClientset() + + setupWindowsEnvironment(t) + podLabelSelector := k8sutils.CreateLabelSelector(podLabelKey, podPrefix) + nodeLabelSelector := k8sutils.CreateLabelSelector(nodepoolKey, nodepoolSelector) + + t.Log("Get Nodes") + nodes, err := k8sutils.GetNodeListByLabelSelector(ctx, clientset, nodeLabelSelector) + if err != nil { + t.Fatal(err) + } t.Run("Windows ping tests pod -> node", func(t *testing.T) { // Windows ping tests between pods and node for _, node := range nodes.Items { From 48a7a6609013eac8d0331162c7ef6766e3e5fc2a Mon Sep 17 00:00:00 2001 From: jpayne3506 Date: Fri, 28 Jul 2023 11:38:03 -0700 Subject: [PATCH 2/2] Addressing Comments --- test/integration/datapath/datapath_linux_test.go | 8 +++++--- test/integration/datapath/datapath_windows_test.go | 7 +++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/test/integration/datapath/datapath_linux_test.go b/test/integration/datapath/datapath_linux_test.go index 93116df1d6..4b04da95b8 100644 --- a/test/integration/datapath/datapath_linux_test.go +++ b/test/integration/datapath/datapath_linux_test.go @@ -178,7 +178,7 @@ func setupLinuxEnvironment(t *testing.T) { t.Fatalf("could not get k8s clientset: %v", err) } if len(pods.Items) <= 1 { - t.Fatal("Less than 2 pods on node") + t.Fatalf("Less than 2 pods on node: %v", node.Name) } } @@ -192,8 +192,10 @@ func TestDatapathLinux(t *testing.T) { restConfig := k8sutils.MustGetRestConfig(t) t.Log("Create Clientset") - clientset, _ := k8sutils.MustGetClientset() - + clientset, err := k8sutils.MustGetClientset() + if err != nil { + t.Fatalf("could not get k8s clientset: %v", err) + } setupLinuxEnvironment(t) podLabelSelector := k8sutils.CreateLabelSelector(podLabelKey, podPrefix) diff --git a/test/integration/datapath/datapath_windows_test.go b/test/integration/datapath/datapath_windows_test.go index dcd967ffa0..3707203db4 100644 --- a/test/integration/datapath/datapath_windows_test.go +++ b/test/integration/datapath/datapath_windows_test.go @@ -123,7 +123,7 @@ func setupWindowsEnvironment(t *testing.T) { t.Fatal(err) } if len(pods.Items) <= 1 { - t.Fatal("Less than 2 pods on node") + t.Fatalf("Less than 2 pods on node: %v", node.Name) } } t.Log("Windows test environment ready") @@ -136,7 +136,10 @@ func TestDatapathWin(t *testing.T) { restConfig := k8sutils.MustGetRestConfig(t) t.Log("Create Clientset") - clientset, _ := k8sutils.MustGetClientset() + clientset, err := k8sutils.MustGetClientset() + if err != nil { + t.Fatalf("could not get k8s clientset: %v", err) + } setupWindowsEnvironment(t) podLabelSelector := k8sutils.CreateLabelSelector(podLabelKey, podPrefix)