@@ -30,7 +30,6 @@ import (
3030 clientset "k8s.io/client-go/kubernetes"
3131 api "k8s.io/kubernetes/pkg/apis/core"
3232 "k8s.io/kubernetes/test/e2e/framework"
33- e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3433 e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3534 e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3635 e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"
@@ -74,7 +73,7 @@ var _ = SIGDescribe("Reboot [Disruptive] [Feature:Reboot]", func() {
7473 framework .ExpectNoError (err )
7574
7675 for _ , e := range events .Items {
77- e2elog .Logf ("event for %v: %v %v: %v" , e .InvolvedObject .Name , e .Source , e .Reason , e .Message )
76+ framework .Logf ("event for %v: %v %v: %v" , e .InvolvedObject .Name , e .Source , e .Reason , e .Message )
7877 }
7978 }
8079 // In GKE, our current tunneling setup has the potential to hold on to a broken tunnel (from a
@@ -138,7 +137,7 @@ func testReboot(c clientset.Interface, rebootCmd string, hook terminationHook) {
138137 nodelist := framework .GetReadySchedulableNodesOrDie (c )
139138 if hook != nil {
140139 defer func () {
141- e2elog .Logf ("Executing termination hook on nodes" )
140+ framework .Logf ("Executing termination hook on nodes" )
142141 hook (framework .TestContext .Provider , nodelist )
143142 }()
144143 }
@@ -165,10 +164,10 @@ func testReboot(c clientset.Interface, rebootCmd string, hook terminationHook) {
165164 for ix := range nodelist .Items {
166165 n := nodelist .Items [ix ]
167166 if ! result [ix ] {
168- e2elog .Logf ("Node %s failed reboot test." , n .ObjectMeta .Name )
167+ framework .Logf ("Node %s failed reboot test." , n .ObjectMeta .Name )
169168 }
170169 }
171- e2elog .Failf ("Test failed; at least one node failed to reboot in the time given." )
170+ framework .Failf ("Test failed; at least one node failed to reboot in the time given." )
172171 }
173172}
174173
@@ -179,9 +178,9 @@ func printStatusAndLogsForNotReadyPods(c clientset.Interface, ns string, podName
179178 prefix = "Retrieving log for the last terminated container"
180179 }
181180 if err != nil {
182- e2elog .Logf ("%s %s, err: %v:\n %s\n " , prefix , id , err , log )
181+ framework .Logf ("%s %s, err: %v:\n %s\n " , prefix , id , err , log )
183182 } else {
184- e2elog .Logf ("%s %s:\n %s\n " , prefix , id , log )
183+ framework .Logf ("%s %s:\n %s\n " , prefix , id , log )
185184 }
186185 }
187186 podNameSet := sets .NewString (podNames ... )
@@ -195,7 +194,7 @@ func printStatusAndLogsForNotReadyPods(c clientset.Interface, ns string, podName
195194 if ok , _ := testutils .PodRunningReady (p ); ok {
196195 continue
197196 }
198- e2elog .Logf ("Status for not ready pod %s/%s: %+v" , p .Namespace , p .Name , p .Status )
197+ framework .Logf ("Status for not ready pod %s/%s: %+v" , p .Namespace , p .Name , p .Status )
199198 // Print the log of the containers if pod is not running and ready.
200199 for _ , container := range p .Status .ContainerStatuses {
201200 cIdentifer := fmt .Sprintf ("%s/%s/%s" , p .Namespace , p .Name , container .Name )
@@ -224,16 +223,16 @@ func rebootNode(c clientset.Interface, provider, name, rebootCmd string) bool {
224223 ns := metav1 .NamespaceSystem
225224 ps , err := testutils .NewPodStore (c , ns , labels .Everything (), fields .OneTermEqualSelector (api .PodHostField , name ))
226225 if err != nil {
227- e2elog .Logf ("Couldn't initialize pod store: %v" , err )
226+ framework .Logf ("Couldn't initialize pod store: %v" , err )
228227 return false
229228 }
230229 defer ps .Stop ()
231230
232231 // Get the node initially.
233- e2elog .Logf ("Getting %s" , name )
232+ framework .Logf ("Getting %s" , name )
234233 node , err := c .CoreV1 ().Nodes ().Get (name , metav1.GetOptions {})
235234 if err != nil {
236- e2elog .Logf ("Couldn't get node %s" , name )
235+ framework .Logf ("Couldn't get node %s" , name )
237236 return false
238237 }
239238
@@ -258,7 +257,7 @@ func rebootNode(c clientset.Interface, provider, name, rebootCmd string) bool {
258257 podNames = append (podNames , p .ObjectMeta .Name )
259258 }
260259 }
261- e2elog .Logf ("Node %s has %d assigned pods with no liveness probes: %v" , name , len (podNames ), podNames )
260+ framework .Logf ("Node %s has %d assigned pods with no liveness probes: %v" , name , len (podNames ), podNames )
262261
263262 // For each pod, we do a sanity check to ensure it's running / healthy
264263 // or succeeded now, as that's what we'll be checking later.
@@ -269,7 +268,7 @@ func rebootNode(c clientset.Interface, provider, name, rebootCmd string) bool {
269268
270269 // Reboot the node.
271270 if err = e2essh .IssueSSHCommand (rebootCmd , provider , node ); err != nil {
272- e2elog .Logf ("Error while issuing ssh command: %v" , err )
271+ framework .Logf ("Error while issuing ssh command: %v" , err )
273272 return false
274273 }
275274
@@ -291,7 +290,7 @@ func rebootNode(c clientset.Interface, provider, name, rebootCmd string) bool {
291290 return false
292291 }
293292
294- e2elog .Logf ("Reboot successful on node %s" , name )
293+ framework .Logf ("Reboot successful on node %s" , name )
295294 return true
296295}
297296
@@ -302,7 +301,7 @@ func catLogHook(logPath string) terminationHook {
302301 for _ , n := range nodes .Items {
303302 cmd := fmt .Sprintf ("cat %v && rm %v" , logPath , logPath )
304303 if _ , err := e2essh .IssueSSHCommandWithResult (cmd , provider , & n ); err != nil {
305- e2elog .Logf ("Error while issuing ssh command: %v" , err )
304+ framework .Logf ("Error while issuing ssh command: %v" , err )
306305 }
307306 }
308307
0 commit comments