From f7486d52ea08b0cd008e2aca3b582b30d148a6da Mon Sep 17 00:00:00 2001
From: "Madhusudan.C.S" <madhusudancs@google.com>
Date: Tue, 7 Jun 2016 02:13:47 -0700
Subject: [PATCH] Add clientset support for federation e2e tests.

---
 test/e2e/framework/framework.go | 27 +++++++++++++++++++++------
 test/e2e/framework/util.go      | 27 +++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go
index 9e9c76e1fc..b086397c30 100644
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -25,6 +25,7 @@ import (
 	"sync"
 	"time"
 
+	"k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset"
 	unversionedfederation "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned"
 	"k8s.io/kubernetes/pkg/api"
 	apierrs "k8s.io/kubernetes/pkg/api/errors"
@@ -55,6 +56,8 @@ type Framework struct {
 	Clientset_1_2 *release_1_2.Clientset
 	Clientset_1_3 *release_1_3.Clientset
 
+	FederationClientset *federation_internalclientset.Clientset
+	// TODO: remove FederationClient, all the client access must be through FederationClientset
 	FederationClient *unversionedfederation.FederationClient
 
 	Namespace                *api.Namespace   // Every test has at least one namespace
@@ -146,11 +149,19 @@ func (f *Framework) BeforeEach() {
 		Expect(err).NotTo(HaveOccurred())
 	}
 
-	if f.federated && f.FederationClient == nil {
-		By("Creating a federated kubernetes client")
-		var err error
-		f.FederationClient, err = LoadFederationClient()
-		Expect(err).NotTo(HaveOccurred())
+	if f.federated {
+		if f.FederationClient == nil {
+			By("Creating a federated kubernetes client")
+			var err error
+			f.FederationClient, err = LoadFederationClient()
+			Expect(err).NotTo(HaveOccurred())
+		}
+		if f.FederationClientset == nil {
+			By("Creating a federation Clientset")
+			var err error
+			f.FederationClientset, err = LoadFederationClientset()
+			Expect(err).NotTo(HaveOccurred())
+		}
 	}
 
 	By("Building a namespace api object")
@@ -229,7 +240,11 @@ func (f *Framework) AfterEach() {
 	if f.federated {
 		defer func() {
 			if f.FederationClient == nil {
-				Logf("Warning: framework is marked federated, but has no FederationClient")
+				Logf("Warning: framework is marked federated, but has no federation client")
+				return
+			}
+			if f.FederationClientset == nil {
+				Logf("Warning: framework is marked federated, but has no federation clientset")
 				return
 			}
 			if err := f.FederationClient.Clusters().DeleteCollection(nil, api.ListOptions{}); err != nil {
diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go
index 4d6567fe3c..28da1667c5 100644
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -37,6 +37,7 @@ import (
 	"sync"
 	"time"
 
+	"k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset"
 	unversionedfederation "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned"
 	"k8s.io/kubernetes/pkg/api"
 	apierrs "k8s.io/kubernetes/pkg/api/errors"
@@ -1630,6 +1631,32 @@ func loadClientFromConfig(config *restclient.Config) (*client.Client, error) {
 	return c, nil
 }
 
+func loadFederationClientsetFromConfig(config *restclient.Config) (*federation_internalclientset.Clientset, error) {
+	c, err := federation_internalclientset.NewForConfig(config)
+	if err != nil {
+		return nil, fmt.Errorf("error creating federation clientset: %v", err.Error())
+	}
+	// Set timeout for each client in the set.
+	if c.DiscoveryClient.Client.Timeout == 0 {
+		c.DiscoveryClient.Client.Timeout = SingleCallTimeout
+	}
+	if c.FederationClient.Client.Timeout == 0 {
+		c.FederationClient.Client.Timeout = SingleCallTimeout
+	}
+	if c.CoreClient.Client.Timeout == 0 {
+		c.CoreClient.Client.Timeout = SingleCallTimeout
+	}
+	return c, nil
+}
+
+func LoadFederationClientset() (*federation_internalclientset.Clientset, error) {
+	config, err := LoadFederatedConfig()
+	if err != nil {
+		return nil, fmt.Errorf("error creating federated client config: %v", err.Error())
+	}
+	return loadFederationClientsetFromConfig(config)
+}
+
 func loadFederationClientFromConfig(config *restclient.Config) (*unversionedfederation.FederationClient, error) {
 	c, err := unversionedfederation.NewForConfig(config)
 	if err != nil {