Commit 66381c66 authored by mfanjie's avatar mfanjie Committed by fmeng

delete forwardingRules instead of globalForwardingRules

parent 127e1b61
...@@ -1446,6 +1446,14 @@ func (gce *GCECloud) deleteForwardingRule(name, region string) error { ...@@ -1446,6 +1446,14 @@ func (gce *GCECloud) deleteForwardingRule(name, region string) error {
return nil return nil
} }
func (gce *GCECloud) DeleteForwardingRule(name string) error {
region, err := GetGCERegion(gce.localZone)
if err != nil {
return err
}
return gce.deleteForwardingRule(name, region)
}
// DeleteTargetPool deletes the given target pool. // DeleteTargetPool deletes the given target pool.
func (gce *GCECloud) DeleteTargetPool(name string, hc *compute.HttpHealthCheck) error { func (gce *GCECloud) DeleteTargetPool(name string, hc *compute.HttpHealthCheck) error {
region, err := GetGCERegion(gce.localZone) region, err := GetGCERegion(gce.localZone)
......
...@@ -4589,7 +4589,7 @@ func CleanupGCEResources(loadBalancerName string) (err error) { ...@@ -4589,7 +4589,7 @@ func CleanupGCEResources(loadBalancerName string) (err error) {
return fmt.Errorf("failed to convert CloudConfig.Provider to GCECloud: %#v", TestContext.CloudConfig.Provider) return fmt.Errorf("failed to convert CloudConfig.Provider to GCECloud: %#v", TestContext.CloudConfig.Provider)
} }
gceCloud.DeleteFirewall(loadBalancerName) gceCloud.DeleteFirewall(loadBalancerName)
gceCloud.DeleteGlobalForwardingRule(loadBalancerName) gceCloud.DeleteForwardingRule(loadBalancerName)
gceCloud.DeleteGlobalStaticIP(loadBalancerName) gceCloud.DeleteGlobalStaticIP(loadBalancerName)
hc, _ := gceCloud.GetHttpHealthCheck(loadBalancerName) hc, _ := gceCloud.GetHttpHealthCheck(loadBalancerName)
gceCloud.DeleteTargetPool(loadBalancerName, hc) gceCloud.DeleteTargetPool(loadBalancerName, hc)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment