From 923757f3e03009b1fba4c07152bdf3adb7e9ee69 Mon Sep 17 00:00:00 2001
From: Chao Xu <xuchao@google.com>
Date: Mon, 17 Oct 2016 15:09:42 -0700
Subject: [PATCH] rewrite client-go import path in the main repository convert
 e2e tests of client-go to use version options

---
 test/e2e/disruption.go          | 15 +++++++--------
 test/e2e/framework/framework.go |  6 +++---
 test/e2e/generated_clientset.go |  7 +++----
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/test/e2e/disruption.go b/test/e2e/disruption.go
index 1c36ec1a9ec..220488842db 100644
--- a/test/e2e/disruption.go
+++ b/test/e2e/disruption.go
@@ -22,13 +22,12 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"k8s.io/client-go/1.5/kubernetes"
-	apiapi "k8s.io/client-go/1.5/pkg/api"
-	"k8s.io/client-go/1.5/pkg/api/unversioned"
-	api "k8s.io/client-go/1.5/pkg/api/v1"
-	extensions "k8s.io/client-go/1.5/pkg/apis/extensions/v1beta1"
-	policy "k8s.io/client-go/1.5/pkg/apis/policy/v1alpha1"
-	"k8s.io/client-go/1.5/pkg/util/intstr"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/pkg/api/unversioned"
+	api "k8s.io/client-go/pkg/api/v1"
+	extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
+	policy "k8s.io/client-go/pkg/apis/policy/v1alpha1"
+	"k8s.io/client-go/pkg/util/intstr"
 	"k8s.io/kubernetes/pkg/util/wait"
 	"k8s.io/kubernetes/test/e2e/framework"
 )
@@ -132,7 +131,7 @@ var _ = framework.KubeDescribe("DisruptionController", func() {
 			// Locate a running pod.
 			var pod api.Pod
 			err := wait.PollImmediate(framework.Poll, schedulingTimeout, func() (bool, error) {
-				podList, err := cs.Pods(ns).List(apiapi.ListOptions{})
+				podList, err := cs.Pods(ns).List(api.ListOptions{})
 				if err != nil {
 					return false, err
 				}
diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go
index 07deb4d0956..47aabec77a1 100644
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -26,9 +26,9 @@ import (
 	"sync"
 	"time"
 
-	staging "k8s.io/client-go/1.5/kubernetes"
-	"k8s.io/client-go/1.5/pkg/util/sets"
-	clientreporestclient "k8s.io/client-go/1.5/rest"
+	staging "k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/pkg/util/sets"
+	clientreporestclient "k8s.io/client-go/rest"
 	"k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5"
 	"k8s.io/kubernetes/pkg/api"
 	apierrs "k8s.io/kubernetes/pkg/api/errors"
diff --git a/test/e2e/generated_clientset.go b/test/e2e/generated_clientset.go
index 0aaefee7d56..9ec05d6b174 100644
--- a/test/e2e/generated_clientset.go
+++ b/test/e2e/generated_clientset.go
@@ -20,8 +20,7 @@ import (
 	"strconv"
 	"time"
 
-	clientapi "k8s.io/client-go/1.5/pkg/api"
-	clientv1 "k8s.io/client-go/1.5/pkg/api/v1"
+	clientv1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/runtime"
@@ -198,7 +197,7 @@ var _ = framework.KubeDescribe("Staging client repo client", func() {
 		podCopy := stagingClientPod(name, value)
 		pod := &podCopy
 		By("verifying no pod exists before the test")
-		pods, err := podClient.List(clientapi.ListOptions{})
+		pods, err := podClient.List(clientv1.ListOptions{})
 		if err != nil {
 			framework.Failf("Failed to query for pods: %v", err)
 		}
@@ -212,7 +211,7 @@ var _ = framework.KubeDescribe("Staging client repo client", func() {
 		By("verifying the pod is in kubernetes")
 		timeout := 1 * time.Minute
 		if err := wait.PollImmediate(time.Second, timeout, func() (bool, error) {
-			pods, err = podClient.List(clientapi.ListOptions{})
+			pods, err = podClient.List(clientv1.ListOptions{})
 			if err != nil {
 				return false, err
 			}