Add minor fixes

test/integration-new/cni-version-testing/cni_version_host_networking_test.go

@@ -1,3 +1,16 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"). You may
+// not use this file except in compliance with the License. A copy of the
+// License is located at
+//
+//     http://aws.amazon.com/apache2.0/
+//
+// or in the "license" file accompanying this file. This file is distributed
+// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+// express or implied. See the License for the specific language governing
+// permissions and limitations under the License.
+
 package versiontesting
 
 import (

test/integration-new/cni-version-testing/cni_version_pod_traffic_test.go

@@ -13,6 +13,8 @@
 
 package versiontesting
 
+import v1 "k8s.io/api/apps/v1"
+
 import (
 	"fmt"
 	"github.com/aws/amazon-vpc-cni-k8s/test/framework/resources/k8s/manifest"
@@ -21,35 +23,11 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	v1 "k8s.io/api/apps/v1"
 	coreV1 "k8s.io/api/core/v1"
 	"strconv"
 )
 
 var (
-	err error
-	// The command to run on server pods, to allow incoming
-	// connections for different traffic type
-	serverListenCmd []string
-	// Arguments to the server listen command
-	serverListenCmdArgs []string
-	// The function that generates command which will be sent from
-	// tester pod to receiver pod
-	testConnectionCommandFunc func(serverPod coreV1.Pod, port int) []string
-	// The functions reinforces that the positive test is working as
-	// expected by creating a negative test command that should fail
-	testFailedConnectionCommandFunc func(serverPod coreV1.Pod, port int) []string
-	// Expected stdout from the exec command on testing connection
-	// from tester to server
-	testerExpectedStdOut string
-	// Expected stderr from the exec command on testing connection
-	// from tester to server
-	testerExpectedStdErr string
-	// The port on which server is listening for new connections
-	serverPort int
-	// Protocol for establishing connection to server
-	protocol string
-
 	// Primary node server deployment
 	primaryNodeDeployment *v1.Deployment
 	// Secondary node Server deployment
@@ -364,57 +342,3 @@ func testConnectivity(senderPod coreV1.Pod, receiverPod coreV1.Pod, expectedStdo
 	Expect(stdErr).To(ContainSubstring(expectedStderr))
 	Expect(stdOut).To(ContainSubstring(expectedStdout))
 }
-
-type InterfaceTypeToPodList struct {
-	PodsOnPrimaryENI   []coreV1.Pod
-	PodsOnSecondaryENI []coreV1.Pod
-}
-
-// GetPodsOnPrimaryAndSecondaryInterface returns the list of Pods on Primary Networking
-// Interface and Secondary Network Interface on a given Node
-func GetPodsOnPrimaryAndSecondaryInterface(node coreV1.Node,
-	podLabelKey string, podLabelVal string) InterfaceTypeToPodList {
-	podList, err := f.K8sResourceManagers.
-		PodManager().
-		GetPodsWithLabelSelector(podLabelKey, podLabelVal)
-	Expect(err).ToNot(HaveOccurred())
-
-	instance, err := f.CloudServices.EC2().
-		DescribeInstance(k8sUtils.GetInstanceIDFromNode(node))
-	Expect(err).ToNot(HaveOccurred())
-
-	interfaceToPodList := InterfaceTypeToPodList{
-		PodsOnPrimaryENI:   []coreV1.Pod{},
-		PodsOnSecondaryENI: []coreV1.Pod{},
-	}
-
-	ipToPod := map[string]coreV1.Pod{}
-	for _, pod := range podList.Items {
-		ipToPod[pod.Status.PodIP] = pod
-	}
-
-	for _, nwInterface := range instance.NetworkInterfaces {
-		isPrimary := IsPrimaryENI(nwInterface, instance.PrivateIpAddress)
-		for _, ip := range nwInterface.PrivateIpAddresses {
-			if pod, found := ipToPod[*ip.PrivateIpAddress]; found {
-				if isPrimary {
-					interfaceToPodList.PodsOnPrimaryENI =
-						append(interfaceToPodList.PodsOnPrimaryENI, pod)
-				} else {
-					interfaceToPodList.PodsOnSecondaryENI =
-						append(interfaceToPodList.PodsOnSecondaryENI, pod)
-				}
-			}
-		}
-	}
-	return interfaceToPodList
-}
-
-func IsPrimaryENI(nwInterface *ec2.InstanceNetworkInterface, instanceIPAddr *string) bool {
-	for _, privateIPAddress := range nwInterface.PrivateIpAddresses {
-		if *privateIPAddress.PrivateIpAddress == *instanceIPAddr {
-			return true
-		}
-	}
-	return false
-}

test/integration-new/cni-version-testing/cni_version_service_connectivity_test.go

@@ -1,3 +1,16 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"). You may
+// not use this file except in compliance with the License. A copy of the
+// License is located at
+//
+//     http://aws.amazon.com/apache2.0/
+//
+// or in the "license" file accompanying this file. This file is distributed
+// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+// express or implied. See the License for the specific language governing
+// permissions and limitations under the License.
+
 package versiontesting
 
 import (

test/integration-new/cni-version-testing/cni_version_suite_test.go

@@ -18,27 +18,52 @@ import (
 	"github.com/aws/amazon-vpc-cni-k8s/test/framework"
 	k8sUtils "github.com/aws/amazon-vpc-cni-k8s/test/framework/resources/k8s/utils"
 	"github.com/aws/amazon-vpc-cni-k8s/test/framework/utils"
+	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/eks"
-	"testing"
-	"time"
-
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	coreV1 "k8s.io/api/core/v1"
 	v1 "k8s.io/api/core/v1"
+	"testing"
+	"time"
 )
 
 const InstanceTypeNodeLabelKey = "beta.kubernetes.io/instance-type"
 
-var f *framework.Framework
-var maxIPPerInterface int
-var primaryNode v1.Node
-var secondaryNode v1.Node
-var instanceSecurityGroupID string
-var vpcCIDRs []string
-
-var k8sVersion string
-var initialCNIVersion string
-var finalCNIVersion string
+var (
+	f                       *framework.Framework
+	maxIPPerInterface       int
+	primaryNode             v1.Node
+	secondaryNode           v1.Node
+	instanceSecurityGroupID string
+	vpcCIDRs                []string
+
+	k8sVersion        string
+	initialCNIVersion string
+	finalCNIVersion   string
+	err               error
+	// The command to run on server pods, to allow incoming
+	// connections for different traffic type
+	serverListenCmd []string
+	// Arguments to the server listen command
+	serverListenCmdArgs []string
+	// The function that generates command which will be sent from
+	// tester pod to receiver pod
+	testConnectionCommandFunc func(serverPod coreV1.Pod, port int) []string
+	// The functions reinforces that the positive test is working as
+	// expected by creating a negative test command that should fail
+	testFailedConnectionCommandFunc func(serverPod coreV1.Pod, port int) []string
+	// Expected stdout from the exec command on testing connection
+	// from tester to server
+	testerExpectedStdOut string
+	// Expected stderr from the exec command on testing connection
+	// from tester to server
+	testerExpectedStdErr string
+	// The port on which server is listening for new connections
+	serverPort int
+	// Protocol for establishing connection to server
+	protocol string
+)
 
 func TestCNIVersion(t *testing.T) {
 	RegisterFailHandler(Fail)
@@ -115,8 +140,8 @@ func ApplyAddOn(versionName string) {
 	By("getting the current addon")
 	describeAddonOutput, err = f.CloudServices.EKS().DescribeAddon("vpc-cni", f.Options.ClusterName)
 	if err == nil {
-		fmt.Printf("%s,%s", *describeAddonOutput.Addon.AddonVersion, versionName)
-		By("checking if the current addon is same as initial addon")
+		fmt.Printf("By applying addon %s\n", versionName)
+		By("checking if the current addon is same as addon to be applied")
 		if *describeAddonOutput.Addon.AddonVersion != versionName {
 
 			By("deleting the current vpc cni addon ")
@@ -136,18 +161,72 @@ func ApplyAddOn(versionName string) {
 
 		}
 	} else {
-		By("apply initial addon version")
+		By("apply addon version")
 		_, err = f.CloudServices.EKS().CreateAddonWithVersion("vpc-cni", f.Options.ClusterName, versionName)
 		Expect(err).ToNot(HaveOccurred())
 	}
 
 	var status string = ""
 
-	By("waiting for initial addon to be ACTIVE")
+	By("waiting for  addon to be ACTIVE")
 	for status != "ACTIVE" {
 		describeAddonOutput, err = f.CloudServices.EKS().DescribeAddon("vpc-cni", f.Options.ClusterName)
 		Expect(err).ToNot(HaveOccurred())
 		status = *describeAddonOutput.Addon.Status
 		time.Sleep(5 * time.Second)
 	}
 }
+
+type InterfaceTypeToPodList struct {
+	PodsOnPrimaryENI   []coreV1.Pod
+	PodsOnSecondaryENI []coreV1.Pod
+}
+
+// GetPodsOnPrimaryAndSecondaryInterface returns the list of Pods on Primary Networking
+// Interface and Secondary Network Interface on a given Node
+func GetPodsOnPrimaryAndSecondaryInterface(node coreV1.Node,
+	podLabelKey string, podLabelVal string) InterfaceTypeToPodList {
+	podList, err := f.K8sResourceManagers.
+		PodManager().
+		GetPodsWithLabelSelector(podLabelKey, podLabelVal)
+	Expect(err).ToNot(HaveOccurred())
+
+	instance, err := f.CloudServices.EC2().
+		DescribeInstance(k8sUtils.GetInstanceIDFromNode(node))
+	Expect(err).ToNot(HaveOccurred())
+
+	interfaceToPodList := InterfaceTypeToPodList{
+		PodsOnPrimaryENI:   []coreV1.Pod{},
+		PodsOnSecondaryENI: []coreV1.Pod{},
+	}
+
+	ipToPod := map[string]coreV1.Pod{}
+	for _, pod := range podList.Items {
+		ipToPod[pod.Status.PodIP] = pod
+	}
+
+	for _, nwInterface := range instance.NetworkInterfaces {
+		isPrimary := IsPrimaryENI(nwInterface, instance.PrivateIpAddress)
+		for _, ip := range nwInterface.PrivateIpAddresses {
+			if pod, found := ipToPod[*ip.PrivateIpAddress]; found {
+				if isPrimary {
+					interfaceToPodList.PodsOnPrimaryENI =
+						append(interfaceToPodList.PodsOnPrimaryENI, pod)
+				} else {
+					interfaceToPodList.PodsOnSecondaryENI =
+						append(interfaceToPodList.PodsOnSecondaryENI, pod)
+				}
+			}
+		}
+	}
+	return interfaceToPodList
+}
+
+func IsPrimaryENI(nwInterface *ec2.InstanceNetworkInterface, instanceIPAddr *string) bool {
+	for _, privateIPAddress := range nwInterface.PrivateIpAddresses {
+		if *privateIPAddress.PrivateIpAddress == *instanceIPAddr {
+			return true
+		}
+	}
+	return false
+}