From cb07680ee9e2e5b1ff60aca3463e402b0225b6a1 Mon Sep 17 00:00:00 2001 From: yuxiaobo Date: Mon, 13 Jan 2020 16:11:03 +0800 Subject: [PATCH] remove TODO in test/e2e/framework/providers/gce/ingress.go Signed-off-by: yuxiaobo --- test/e2e/framework/providers/gce/ingress.go | 13 +------------ test/e2e/network/ingress.go | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/test/e2e/framework/providers/gce/ingress.go b/test/e2e/framework/providers/gce/ingress.go index c50bc5eaa42..03471724feb 100644 --- a/test/e2e/framework/providers/gce/ingress.go +++ b/test/e2e/framework/providers/gce/ingress.go @@ -571,19 +571,8 @@ func (cont *IngressController) GetFirewallRuleName() string { } // GetFirewallRule returns the firewall used by the IngressController. -// Causes a fatal error incase of an error. -// TODO: Rename this to GetFirewallRuleOrDie and similarly rename all other -// methods here to be consistent with rest of the code in this repo. -func (cont *IngressController) GetFirewallRule() *compute.Firewall { - fw, err := cont.GetFirewallRuleOrError() - framework.ExpectNoError(err) - return fw -} - -// GetFirewallRuleOrError returns the firewall used by the IngressController. // Returns an error if that fails. -// TODO: Rename this to GetFirewallRule when the above method with that name is renamed. -func (cont *IngressController) GetFirewallRuleOrError() (*compute.Firewall, error) { +func (cont *IngressController) GetFirewallRule() (*compute.Firewall, error) { gceCloud := cont.Cloud.Provider.(*Provider).gceCloud fwName := cont.GetFirewallRuleName() return gceCloud.GetFirewall(fwName) diff --git a/test/e2e/network/ingress.go b/test/e2e/network/ingress.go index 361968a3868..f5c836bf286 100644 --- a/test/e2e/network/ingress.go +++ b/test/e2e/network/ingress.go @@ -227,7 +227,7 @@ var _ = SIGDescribe("Loadbalancing: L7", func() { framework.Failf("unexpected backend service, expected none, got: %v", gceController.ListGlobalBackendServices()) } // Controller does not have a list command for firewall rule. We use get instead. - if fw, err := gceController.GetFirewallRuleOrError(); err == nil { + if fw, err := gceController.GetFirewallRule(); err == nil { framework.Failf("unexpected nil error in getting firewall rule, expected firewall NotFound, got firewall: %v", fw) }