From f923359522fbd5e0bf551b6323293d50f1cbec08 Mon Sep 17 00:00:00 2001 From: Ashley Gau Date: Fri, 2 Mar 2018 11:56:37 -0800 Subject: [PATCH 1/2] Expect NetworkTier not to be set as GCE value (all uppercase) --- test/e2e/network/network_tiers.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/network/network_tiers.go b/test/e2e/network/network_tiers.go index 998025ec1cc..8e731e9b8d3 100644 --- a/test/e2e/network/network_tiers.go +++ b/test/e2e/network/network_tiers.go @@ -73,7 +73,7 @@ var _ = SIGDescribe("Services [Feature:GCEAlphaFeature][Slow]", func() { By("creating a Service of type LoadBalancer using the standard network tier") svc := jig.CreateTCPServiceOrFail(ns, func(svc *v1.Service) { svc.Spec.Type = v1.ServiceTypeLoadBalancer - setNetworkTier(svc, gcecloud.NetworkTierAnnotationStandard.ToGCEValue()) + setNetworkTier(svc, gcecloud.NetworkTierAnnotationStandard) }) // Verify that service has been updated properly. svcTier, err := gcecloud.GetServiceNetworkTier(svc) @@ -120,7 +120,7 @@ var _ = SIGDescribe("Services [Feature:GCEAlphaFeature][Slow]", func() { By("updating the Service to use the standard tier with a requested IP") svc = jig.UpdateServiceOrFail(ns, svc.Name, func(svc *v1.Service) { svc.Spec.LoadBalancerIP = requestedIP - setNetworkTier(svc, gcecloud.NetworkTierAnnotationStandard.ToGCEValue()) + setNetworkTier(svc, gcecloud.NetworkTierAnnotationStandard) }) // Verify that service has been updated properly. Expect(svc.Spec.LoadBalancerIP).To(Equal(requestedIP)) From d21cbd716bdfaafe6b0340afe4ce5c1ddd20aebf Mon Sep 17 00:00:00 2001 From: Ashley Gau Date: Fri, 2 Mar 2018 12:14:15 -0800 Subject: [PATCH 2/2] requires string input --- test/e2e/network/network_tiers.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/network/network_tiers.go b/test/e2e/network/network_tiers.go index 8e731e9b8d3..6ae5855b302 100644 --- a/test/e2e/network/network_tiers.go +++ b/test/e2e/network/network_tiers.go @@ -73,7 +73,7 @@ var _ = SIGDescribe("Services [Feature:GCEAlphaFeature][Slow]", func() { By("creating a Service of type LoadBalancer using the standard network tier") svc := jig.CreateTCPServiceOrFail(ns, func(svc *v1.Service) { svc.Spec.Type = v1.ServiceTypeLoadBalancer - setNetworkTier(svc, gcecloud.NetworkTierAnnotationStandard) + setNetworkTier(svc, string(gcecloud.NetworkTierAnnotationStandard)) }) // Verify that service has been updated properly. svcTier, err := gcecloud.GetServiceNetworkTier(svc) @@ -120,7 +120,7 @@ var _ = SIGDescribe("Services [Feature:GCEAlphaFeature][Slow]", func() { By("updating the Service to use the standard tier with a requested IP") svc = jig.UpdateServiceOrFail(ns, svc.Name, func(svc *v1.Service) { svc.Spec.LoadBalancerIP = requestedIP - setNetworkTier(svc, gcecloud.NetworkTierAnnotationStandard) + setNetworkTier(svc, string(gcecloud.NetworkTierAnnotationStandard)) }) // Verify that service has been updated properly. Expect(svc.Spec.LoadBalancerIP).To(Equal(requestedIP))