Revert "use keys (#2167)" (#2188)

This reverts commit 974ed086f25ad45a01947e276e2eb8aa73d007a3.

1 files changed, 90 insertions, 25 deletions

diff --git a/plugin/kubernetes/kubernetes_test.go b/plugin/kubernetes/kubernetes_test.go
index b8274d01b..f35c9cd2c 100644
--- a/plugin/kubernetes/kubernetes_test.go
+++ b/plugin/kubernetes/kubernetes_test.go
@@ -59,24 +59,43 @@ func TestEndpointHostname(t *testing.T) {
 
 type APIConnServiceTest struct{}
 
-func (APIConnServiceTest) HasSynced() bool                         { return true }
-func (APIConnServiceTest) Run()                                    { return }
-func (APIConnServiceTest) Stop() error                             { return nil }
-func (APIConnServiceTest) PodIndex(string) []*object.Pod           { return nil }
-func (APIConnServiceTest) SvcIndexReverse(string) *object.Service  { return nil }
-func (APIConnServiceTest) EpIndexReverse(string) *object.Endpoints { return nil }
-func (APIConnServiceTest) Modified() int64                         { return 0 }
-func (APIConnServiceTest) SetWatchChan(watch.Chan)                 {}
-func (APIConnServiceTest) Watch(string) error                      { return nil }
-func (APIConnServiceTest) StopWatching(string)                     {}
+func (APIConnServiceTest) HasSynced() bool                           { return true }
+func (APIConnServiceTest) Run()                                      { return }
+func (APIConnServiceTest) Stop() error                               { return nil }
+func (APIConnServiceTest) PodIndex(string) []*object.Pod             { return nil }
+func (APIConnServiceTest) SvcIndexReverse(string) []*object.Service  { return nil }
+func (APIConnServiceTest) EpIndexReverse(string) []*object.Endpoints { return nil }
+func (APIConnServiceTest) Modified() int64                           { return 0 }
+func (APIConnServiceTest) SetWatchChan(watch.Chan)                   {}
+func (APIConnServiceTest) Watch(string) error                        { return nil }
+func (APIConnServiceTest) StopWatching(string)                       {}
 
-func (a APIConnServiceTest) SvcIndex(key string) *object.Service {
-	for _, s := range a.ServiceList() {
-		if object.ServiceKey(s.Namespace, s.Name) == key {
-			return s
-		}
+func (APIConnServiceTest) SvcIndex(string) []*object.Service {
+	svcs := []*object.Service{
+		{
+			Name:      "svc1",
+			Namespace: "testns",
+			ClusterIP: "10.0.0.1",
+			Ports: []api.ServicePort{
+				{Name: "http", Protocol: "tcp", Port: 80},
+			},
+		},
+		{
+			Name:      "hdls1",
+			Namespace: "testns",
+			ClusterIP: api.ClusterIPNone,
+		},
+		{
+			Name:         "external",
+			Namespace:    "testns",
+			ExternalName: "coredns.io",
+			Type:         api.ServiceTypeExternalName,
+			Ports: []api.ServicePort{
+				{Name: "http", Protocol: "tcp", Port: 80},
+			},
+		},
 	}
-	return nil
+	return svcs
 }
 
 func (APIConnServiceTest) ServiceList() []*object.Service {
@@ -107,13 +126,61 @@ func (APIConnServiceTest) ServiceList() []*object.Service {
 	return svcs
 }
 
-func (a APIConnServiceTest) EpIndex(key string) *object.Endpoints {
-	for _, e := range a.EndpointsList() {
-		if object.EndpointsKey(e.Namespace, e.Name) == key {
-			return e
-		}
+func (APIConnServiceTest) EpIndex(string) []*object.Endpoints {
+	eps := []*object.Endpoints{
+		{
+			Subsets: []object.EndpointSubset{
+				{
+					Addresses: []object.EndpointAddress{
+						{IP: "172.0.0.1", Hostname: "ep1a"},
+					},
+					Ports: []object.EndpointPort{
+						{Port: 80, Protocol: "tcp", Name: "http"},
+					},
+				},
+			},
+			Name:      "svc1",
+			Namespace: "testns",
+		},
+		{
+			Subsets: []object.EndpointSubset{
+				{
+					Addresses: []object.EndpointAddress{
+						{IP: "172.0.0.2"},
+					},
+					Ports: []object.EndpointPort{
+						{Port: 80, Protocol: "tcp", Name: "http"},
+					},
+				},
+			},
+			Name:      "hdls1",
+			Namespace: "testns",
+		},
+		{
+			Subsets: []object.EndpointSubset{
+				{
+					Addresses: []object.EndpointAddress{
+						{IP: "172.0.0.3"},
+					},
+					Ports: []object.EndpointPort{
+						{Port: 80, Protocol: "tcp", Name: "http"},
+					},
+				},
+			},
+			Name:      "hdls1",
+			Namespace: "testns",
+		},
+		{
+			Subsets: []object.EndpointSubset{
+				{
+					Addresses: []object.EndpointAddress{
+						{IP: "10.9.8.7", NodeName: "test.node.foo.bar"},
+					},
+				},
+			},
+		},
 	}
-	return nil
+	return eps
 }
 
 func (APIConnServiceTest) EndpointsList() []*object.Endpoints {
@@ -157,7 +224,7 @@ func (APIConnServiceTest) EndpointsList() []*object.Endpoints {
 					},
 				},
 			},
-			Name:      "hdls2",
+			Name:      "hdls1",
 			Namespace: "testns",
 		},
 		{
@@ -168,8 +235,6 @@ func (APIConnServiceTest) EndpointsList() []*object.Endpoints {
 					},
 				},
 			},
-			Name:      "testsvc",
-			Namespace: "testns",
 		},
 	}
 	return eps