From 21f84db48fe95e074e9f4d7b0b27589674ddbafa Mon Sep 17 00:00:00 2001
From: Bowei Du <bowei@google.com>
Date: Fri, 6 Jan 2017 12:57:04 -0800
Subject: [PATCH] Remove reference to dns code from e2e test

This reference was not necessary and avoids having to vendor dns
back into Kubernetes for now.
---
 test/e2e/dns_configmap.go | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/test/e2e/dns_configmap.go b/test/e2e/dns_configmap.go
index c9400f9309c..021f0c0d720 100644
--- a/test/e2e/dns_configmap.go
+++ b/test/e2e/dns_configmap.go
@@ -24,7 +24,6 @@ import (
 	"k8s.io/kubernetes/pkg/api/v1"
 	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	fed "k8s.io/kubernetes/pkg/dns/federation"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/util/intstr"
@@ -43,6 +42,7 @@ type dnsConfigMapTest struct {
 	labels []string
 
 	cm      *v1.ConfigMap
+	fedMap  map[string]string
 	isValid bool
 
 	dnsPod      *v1.Pod
@@ -90,23 +90,25 @@ func (t *dnsConfigMapTest) run() {
 
 	t.labels = []string{"abc", "ghi"}
 	valid1 := map[string]string{"federations": t.labels[0] + "=def"}
+	valid1m := map[string]string{t.labels[0]: "def"}
 	valid2 := map[string]string{"federations": t.labels[1] + "=xyz"}
+	valid2m := map[string]string{t.labels[1]: "xyz"}
 	invalid := map[string]string{"federations": "invalid.map=xyz"}
 
 	By("empty -> valid1")
-	t.setConfigMap(&v1.ConfigMap{Data: valid1}, true)
+	t.setConfigMap(&v1.ConfigMap{Data: valid1}, valid1m, true)
 	t.validate()
 
 	By("valid1 -> valid2")
-	t.setConfigMap(&v1.ConfigMap{Data: valid2}, true)
+	t.setConfigMap(&v1.ConfigMap{Data: valid2}, valid2m, true)
 	t.validate()
 
 	By("valid2 -> invalid")
-	t.setConfigMap(&v1.ConfigMap{Data: invalid}, false)
+	t.setConfigMap(&v1.ConfigMap{Data: invalid}, nil, false)
 	t.validate()
 
 	By("invalid -> valid1")
-	t.setConfigMap(&v1.ConfigMap{Data: valid1}, true)
+	t.setConfigMap(&v1.ConfigMap{Data: valid1}, valid1m, true)
 	t.validate()
 
 	By("valid1 -> deleted")
@@ -114,7 +116,7 @@ func (t *dnsConfigMapTest) run() {
 	t.validate()
 
 	By("deleted -> invalid")
-	t.setConfigMap(&v1.ConfigMap{Data: invalid}, false)
+	t.setConfigMap(&v1.ConfigMap{Data: invalid}, nil, false)
 	t.validate()
 }
 
@@ -123,11 +125,7 @@ func (t *dnsConfigMapTest) validate() {
 }
 
 func (t *dnsConfigMapTest) validateFederation() {
-	federations := make(map[string]string)
-	if t.cm != nil {
-		err := fed.ParseFederationsFlag(t.cm.Data["federations"], federations)
-		Expect(err).NotTo(HaveOccurred())
-	}
+	federations := t.fedMap
 
 	if len(federations) == 0 {
 		By(fmt.Sprintf("Validating federation labels %v do not exist", t.labels))
@@ -210,9 +208,10 @@ func (t *dnsConfigMapTest) runDig(dnsName string) []string {
 	}
 }
 
-func (t *dnsConfigMapTest) setConfigMap(cm *v1.ConfigMap, isValid bool) {
+func (t *dnsConfigMapTest) setConfigMap(cm *v1.ConfigMap, fedMap map[string]string, isValid bool) {
 	if isValid {
 		t.cm = cm
+		t.fedMap = fedMap
 	}
 	t.isValid = isValid