From 4ab97a7cb849d6a1895eff75547522d4b6413c06 Mon Sep 17 00:00:00 2001
From: Gavin <li.guangxu@zte.com.cn>
Date: Fri, 20 Oct 2017 12:47:21 +0800
Subject: [PATCH] migrate cluster dns test to sig network

---
 test/e2e/BUILD                                |  1 -
 test/e2e/examples.go                          | 11 -----------
 test/e2e/network/BUILD                        |  1 +
 test/e2e/{ => network}/example_cluster_dns.go | 18 ++++++++++++++++--
 4 files changed, 17 insertions(+), 14 deletions(-)
 rename test/e2e/{ => network}/example_cluster_dns.go (91%)

diff --git a/test/e2e/BUILD b/test/e2e/BUILD
index aa2ba4237cc..f2a705bf31d 100644
--- a/test/e2e/BUILD
+++ b/test/e2e/BUILD
@@ -39,7 +39,6 @@ go_library(
     srcs = [
         "e2e.go",
         "events.go",
-        "example_cluster_dns.go",
         "examples.go",
         "gke_local_ssd.go",
         "gke_node_pools.go",
diff --git a/test/e2e/examples.go b/test/e2e/examples.go
index ed7e9931090..e6d37daf946 100644
--- a/test/e2e/examples.go
+++ b/test/e2e/examples.go
@@ -598,17 +598,6 @@ func makeHttpRequestToService(c clientset.Interface, ns, service, path string, t
 	return string(result), err
 }
 
-// pass enough context with the 'old' parameter so that it replaces what your really intended.
-func prepareResourceWithReplacedString(inputFile, old, new string) string {
-	f, err := os.Open(inputFile)
-	Expect(err).NotTo(HaveOccurred())
-	defer f.Close()
-	data, err := ioutil.ReadAll(f)
-	Expect(err).NotTo(HaveOccurred())
-	podYaml := strings.Replace(string(data), old, new, 1)
-	return podYaml
-}
-
 func createFileForGoBinData(gobindataPath, outputFilename string) error {
 	data := generated.ReadOrDie(gobindataPath)
 	if len(data) == 0 {
diff --git a/test/e2e/network/BUILD b/test/e2e/network/BUILD
index e9d94a08e4b..449106762aa 100644
--- a/test/e2e/network/BUILD
+++ b/test/e2e/network/BUILD
@@ -12,6 +12,7 @@ go_library(
         "dns_common.go",
         "dns_configmap.go",
         "doc.go",
+        "example_cluster_dns.go",
         "firewall.go",
         "framework.go",
         "ingress.go",
diff --git a/test/e2e/example_cluster_dns.go b/test/e2e/network/example_cluster_dns.go
similarity index 91%
rename from test/e2e/example_cluster_dns.go
rename to test/e2e/network/example_cluster_dns.go
index b8bd84edd34..ab304d747e6 100644
--- a/test/e2e/example_cluster_dns.go
+++ b/test/e2e/network/example_cluster_dns.go
@@ -14,11 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e
+package network
 
 import (
 	"fmt"
+	"io/ioutil"
+	"os"
 	"path/filepath"
+	"strings"
 	"time"
 
 	"k8s.io/api/core/v1"
@@ -44,7 +47,7 @@ try:
 except:
 	print 'err'`
 
-var _ = framework.KubeDescribe("ClusterDns [Feature:Example]", func() {
+var _ = SIGDescribe("ClusterDns [Feature:Example]", func() {
 	f := framework.NewDefaultFramework("cluster-dns")
 
 	var c clientset.Interface
@@ -156,3 +159,14 @@ var _ = framework.KubeDescribe("ClusterDns [Feature:Example]", func() {
 func getNsCmdFlag(ns *v1.Namespace) string {
 	return fmt.Sprintf("--namespace=%v", ns.Name)
 }
+
+// pass enough context with the 'old' parameter so that it replaces what your really intended.
+func prepareResourceWithReplacedString(inputFile, old, new string) string {
+	f, err := os.Open(inputFile)
+	Expect(err).NotTo(HaveOccurred())
+	defer f.Close()
+	data, err := ioutil.ReadAll(f)
+	Expect(err).NotTo(HaveOccurred())
+	podYaml := strings.Replace(string(data), old, new, 1)
+	return podYaml
+}