Merge pull request #6341 from jayunit100/networking-test-reorder

Reorder/Modularize networking e2e + pod launch phase, clean up comments.

test/e2e/networking.go

@@ -29,6 +29,62 @@ import (
 	. "github.com/onsi/gomega"
 )
 
+var _ = BeforeSuite(func() {
+	//Assert basic external connectivity.
+	//Since this is not really a test of kubernetes in any way, we
+	//leave it as a pre-test assertion, rather than a Ginko test.
+
+	By("Executing a successfull http request from the external internet")
+	resp, err := http.Get("http://google.com")
+	if err != nil {
+		Failf("Unable to connect/talk to the internet: %v", err)
+	}
+	if resp.StatusCode != http.StatusOK {
+		Failf("Unexpected error code, expected 200, got, %v (%v)", resp.StatusCode, resp)
+	}
+})
+
+func LaunchNetTestPodPerNode(nodes *api.NodeList, name string, c *client.Client, ns string) []string {
+	podNames := []string{}
+
+	totalPods := len(nodes.Items)
+
+	Expect(totalPods).NotTo(Equal(0))
+
+	for i, node := range nodes.Items {
+		podName := fmt.Sprintf("%s-%d", name, i)
+		podNames = append(podNames, podName)
+		Logf("Creating pod %s on node %s", podName, node.Name)
+		_, err := c.Pods(ns).Create(&api.Pod{
+			ObjectMeta: api.ObjectMeta{
+				Name: podName,
+				Labels: map[string]string{
+					"name": name,
+				},
+			},
+			Spec: api.PodSpec{
+				Containers: []api.Container{
+					{
+						Name:  "webserver",
+						Image: "gcr.io/google_containers/nettest:1.1",
+						Args: []string{
+							"-service=" + name,
+							//peers >= totalPods should be asserted by the container.
+							//the nettest container finds peers by looking up list of svc endpoints.
+							fmt.Sprintf("-peers=%d", totalPods),
+							"-namespace=" + ns},
+						Ports: []api.ContainerPort{{ContainerPort: 8080}},
+					},
+				},
+				Host:          node.Name,
+				RestartPolicy: api.RestartPolicyNever,
+			},
+		})
+		Expect(err).NotTo(HaveOccurred())
+	}
+	return podNames
+}
+
 var _ = Describe("Networking", func() {
 	var c *client.Client
 
@@ -38,37 +94,38 @@ var _ = Describe("Networking", func() {
 		Expect(err).NotTo(HaveOccurred())
 	})
 
+	// First test because it has no dependencies on variables created later on.
+	It("should provide unchanging, static URL paths for kubernetes api services.", func() {
+		tests := []struct {
+			path string
+		}{
+			{path: "/validate"},
+			{path: "/healthz"},
+			// TODO: test proxy links here
+		}
+		for _, test := range tests {
+			By(fmt.Sprintf("testing: %s", test.path))
+			data, err := c.RESTClient.Get().
+				Namespace(api.NamespaceDefault).
+				AbsPath(test.path).
+				DoRaw()
+			if err != nil {
+				Failf("Failed: %v\nBody: %s", err, string(data))
+			}
+		}
+	})
+
 	// Create a unique namespace for this test.
 	ns := "nettest-" + randomSuffix()
+	name := "nettest"
 
-	It("should function for pods", func() {
+	It("should function for intra-pod communication", func() {
 		if testContext.Provider == "vagrant" {
 			By("Skipping test which is broken for vagrant (See https://github.com/GoogleCloudPlatform/kubernetes/issues/3580)")
 			return
 		}
 
-		// Obtain a list of nodes so we can place one webserver container on each node.
+		By(fmt.Sprintf("Creating a service named [%s] in namespace %s", name, ns))
-		nodes, err := c.Nodes().List()
-		if err != nil {
-			Failf("Failed to list nodes: %v", err)
-		}
-		peers := len(nodes.Items)
-		if peers == 0 {
-			Failf("Failed to find any nodes")
-		}
-
-		// Test basic external connectivity.
-		resp, err := http.Get("http://google.com/")
-		if err != nil {
-			Failf("unable to talk to the external internet: %v", err)
-		}
-		if resp.StatusCode != http.StatusOK {
-			Failf("unexpected error code. expected 200, got: %v (%v)", resp.StatusCode, resp)
-		}
-
-		name := "nettest"
-
-		By(fmt.Sprintf("Creating service with name %s in namespace %s", name, ns))
 		svc, err := c.Services(ns).Create(&api.Service{
 			ObjectMeta: api.ObjectMeta{
 				Name: name,
@@ -88,8 +145,9 @@ var _ = Describe("Networking", func() {
 			},
 		})
 		if err != nil {
-			Failf("unable to create test service %s: %v", svc.Name, err)
+			Failf("unable to create test service named [%s] %v", svc.Name, err)
 		}
+
 		// Clean up service
 		defer func() {
 			defer GinkgoRecover()
@@ -99,37 +157,15 @@ var _ = Describe("Networking", func() {
 			}
 		}()
 
-		By("Creating a webserver pod on each node")
+		By("Creating a webserver (pending) pod on each node")
-		podNames := []string{}
+
-		for i, node := range nodes.Items {
+		nodes, err := c.Nodes().List()
-			podName := fmt.Sprintf("%s-%d", name, i)
+		if err != nil {
-			podNames = append(podNames, podName)
+			Failf("Failed to list nodes: %v", err)
-			Logf("Creating pod %s on node %s", podName, node.Name)
-			_, err := c.Pods(ns).Create(&api.Pod{
-				ObjectMeta: api.ObjectMeta{
-					Name: podName,
-					Labels: map[string]string{
-						"name": name,
-					},
-				},
-				Spec: api.PodSpec{
-					Containers: []api.Container{
-						{
-							Name:  "webserver",
-							Image: "gcr.io/google_containers/nettest:1.1",
-							Args: []string{
-								"-service=" + name,
-								fmt.Sprintf("-peers=%d", peers),
-								"-namespace=" + ns},
-							Ports: []api.ContainerPort{{ContainerPort: 8080}},
-						},
-					},
-					Host:          node.Name,
-					RestartPolicy: api.RestartPolicyNever,
-				},
-			})
-			Expect(err).NotTo(HaveOccurred())
 		}
+
+		podNames := LaunchNetTestPodPerNode(nodes, name, c, ns)
+
 		// Clean up the pods
 		defer func() {
 			defer GinkgoRecover()
@@ -141,7 +177,7 @@ var _ = Describe("Networking", func() {
 			}
 		}()
 
-		By("Wait for the webserver pods to be ready")
+		By("Waiting for the webserver pods to transition to Running state")
 		for _, podName := range podNames {
 			err = waitForPodRunningInNamespace(c, podName, ns)
 			Expect(err).NotTo(HaveOccurred())
@@ -150,7 +186,10 @@ var _ = Describe("Networking", func() {
 		By("Waiting for connectivity to be verified")
 		const maxAttempts = 60
 		passed := false
+
+		//once response OK, evaluate response body for pass/fail.
 		var body []byte
+
 		for i := 0; i < maxAttempts && !passed; i++ {
 			time.Sleep(2 * time.Second)
 			Logf("About to make a proxy status call")
@@ -167,6 +206,7 @@ var _ = Describe("Networking", func() {
 				Logf("Attempt %v/%v: service/pod still starting. (error: '%v')", i, maxAttempts, err)
 				continue
 			}
+			//Finally, we pass/fail the test based on if the container's response body, as to wether or not it was able to find peers.
 			switch string(body) {
 			case "pass":
 				Logf("Passed on attempt %v. Cleaning up.", i)
@@ -205,23 +245,4 @@ var _ = Describe("Networking", func() {
 		Expect(string(body)).To(Equal("pass"))
 	})
 
-	It("should provide unchanging URLs", func() {
-		tests := []struct {
-			path string
-		}{
-			{path: "/validate"},
-			{path: "/healthz"},
-			// TODO: test proxy links here
-		}
-		for _, test := range tests {
-			By(fmt.Sprintf("testing: %s", test.path))
-			data, err := c.RESTClient.Get().
-				Namespace(ns).
-				AbsPath(test.path).
-				DoRaw()
-			if err != nil {
-				Failf("Failed: %v\nBody: %s", err, string(data))
-			}
-		}
-	})
 })