From 51749b58e356d35962e3d49331253553d86102f2 Mon Sep 17 00:00:00 2001 From: Zihong Zheng Date: Wed, 6 Jun 2018 09:29:12 -0700 Subject: [PATCH] [e2e service] Change CleanupServiceGCEResources() to CleanupServiceResources() --- test/e2e/network/service.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/e2e/network/service.go b/test/e2e/network/service.go index 09746b44072..8bda7438af1 100644 --- a/test/e2e/network/service.go +++ b/test/e2e/network/service.go @@ -90,8 +90,8 @@ var _ = SIGDescribe("Services", func() { framework.DescribeSvc(f.Namespace.Name) } for _, lb := range serviceLBNames { - framework.Logf("cleaning gce resource for %s", lb) - framework.CleanupServiceGCEResources(cs, lb, framework.TestContext.CloudConfig.Region, framework.TestContext.CloudConfig.Zone) + framework.Logf("cleaning load balancer resource for %s", lb) + framework.CleanupServiceResources(cs, lb, framework.TestContext.CloudConfig.Region, framework.TestContext.CloudConfig.Zone) } //reset serviceLBNames serviceLBNames = []string{} @@ -1624,8 +1624,8 @@ var _ = SIGDescribe("ESIPP [Slow] [DisabledForLargeClusters]", func() { framework.DescribeSvc(f.Namespace.Name) } for _, lb := range serviceLBNames { - framework.Logf("cleaning gce resource for %s", lb) - framework.CleanupServiceGCEResources(cs, lb, framework.TestContext.CloudConfig.Region, framework.TestContext.CloudConfig.Zone) + framework.Logf("cleaning load balancer resource for %s", lb) + framework.CleanupServiceResources(cs, lb, framework.TestContext.CloudConfig.Region, framework.TestContext.CloudConfig.Zone) } //reset serviceLBNames serviceLBNames = []string{} @@ -2025,8 +2025,8 @@ func execAffinityTestForLBService(f *framework.Framework, cs clientset.Interface defer func() { framework.StopServeHostnameService(cs, ns, serviceName) lb := cloudprovider.GetLoadBalancerName(svc) - framework.Logf("cleaning gce resource for %s", lb) - framework.CleanupServiceGCEResources(cs, lb, framework.TestContext.CloudConfig.Region, framework.TestContext.CloudConfig.Zone) + framework.Logf("cleaning load balancer resource for %s", lb) + framework.CleanupServiceResources(cs, lb, framework.TestContext.CloudConfig.Region, framework.TestContext.CloudConfig.Zone) }() ingressIP := framework.GetIngressPoint(&svc.Status.LoadBalancer.Ingress[0]) port := int(svc.Spec.Ports[0].Port)