refactor: reduce duplicated GetNodeInternalIP function

kubeovn · Feb 23, 2021 · 0a7024f · 0a7024f
1 parent 6e09801
commit 0a7024f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go
@@ -291,14 +291,3 @@ func getPodInitStatus(pod corev1.Pod, reason string) (bool, string) {
 	}
 	return initializing, reason
 }
-
-func GetNodeInternalIP(node corev1.Node) string {
-	var nodeAddr string
-	for _, addr := range node.Status.Addresses {
-		if addr.Type == corev1.NodeInternalIP {
-			nodeAddr = addr.Address
-			break
-		}
-	}
-	return nodeAddr
-}
diff --git a/test/e2e/service/service.go b/test/e2e/service/service.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"os/exec"
 
+	"github.com/kubeovn/kube-ovn/pkg/util"
 	"github.com/kubeovn/kube-ovn/test/e2e/framework"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -49,7 +50,7 @@ var _ = Describe("[Service]", func() {
 			nodes, err := f.KubeClientSet.CoreV1().Nodes().List(context.Background(), metav1.ListOptions{})
 			Expect(err).NotTo(HaveOccurred())
 			for _, node := range nodes.Items {
-				nodeIP := framework.GetNodeInternalIP(node)
+				nodeIP := util.GetNodeInternalIP(&node)
 				output, err := exec.Command(
 					"kubectl", "exec", "-n", "kube-system", pod.Name, "--",
 					"curl", "-s", "-w", "%{http_code}", fmt.Sprintf("%s:%d/metrics", nodeIP, hostService.Spec.Ports[0].NodePort), "-o", "/dev/null",
@@ -76,7 +77,7 @@ var _ = Describe("[Service]", func() {
 			nodes, err := f.KubeClientSet.CoreV1().Nodes().List(context.Background(), metav1.ListOptions{})
 			Expect(err).NotTo(HaveOccurred())
 			for _, node := range nodes.Items {
-				nodeIP := framework.GetNodeInternalIP(node)
+				nodeIP := util.GetNodeInternalIP(&node)
 				output, err := exec.Command(
 					"kubectl", "exec", "-n", "kube-system", pod.Name, "--",
 					"curl", "-s", "-w", "%{http_code}", fmt.Sprintf("%s:%d/metrics", nodeIP, containerService.Spec.Ports[0].NodePort), "-o", "/dev/null",
@@ -103,7 +104,7 @@ var _ = Describe("[Service]", func() {
 			nodes, err := f.KubeClientSet.CoreV1().Nodes().List(context.Background(), metav1.ListOptions{})
 			Expect(err).NotTo(HaveOccurred())
 			for _, node := range nodes.Items {
-				nodeIP := framework.GetNodeInternalIP(node)
+				nodeIP := util.GetNodeInternalIP(&node)
 				output, err := exec.Command(
 					"kubectl", "exec", "-n", "kube-system", pod.Name, "--",
 					"curl", "-s", "-w", "%{http_code}", fmt.Sprintf("%s:%d/metrics", nodeIP, containerService.Spec.Ports[0].NodePort), "-o", "/dev/null",
@@ -130,7 +131,7 @@ var _ = Describe("[Service]", func() {
 			nodes, err := f.KubeClientSet.CoreV1().Nodes().List(context.Background(), metav1.ListOptions{})
 			Expect(err).NotTo(HaveOccurred())
 			for _, node := range nodes.Items {
-				nodeIP := framework.GetNodeInternalIP(node)
+				nodeIP := util.GetNodeInternalIP(&node)
 				output, err := exec.Command(
 					"kubectl", "exec", "-n", "kube-system", pod.Name, "--",
 					"curl", "-s", "-w", "%{http_code}", fmt.Sprintf("%s:%d/metrics", nodeIP, hostService.Spec.Ports[0].NodePort), "-o", "/dev/null",