From 75ec46f8880e8cb20e148528b86608a06013d23f Mon Sep 17 00:00:00 2001
From: Sam Levenick <slevenick@google.com>
Date: Mon, 23 Mar 2020 14:46:31 -0700
Subject: [PATCH] GA ILB multi-nic (#3289)

* GA ILB multi-nic

* Failover is not GA, needs if/else
---
 products/compute/api.yaml                              |  1 -
 ...resource_compute_region_backend_service_test.go.erb | 10 ++++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/products/compute/api.yaml b/products/compute/api.yaml
index 7f97a3b6a42e..5be8ec6a7e88 100644
--- a/products/compute/api.yaml
+++ b/products/compute/api.yaml
@@ -2308,7 +2308,6 @@ objects:
         description: |
           The URL of the network to which this backend service belongs.
           This field can only be specified when the load balancing scheme is set to INTERNAL.
-        min_version: beta
   - !ruby/object:Api::Resource
     name: 'BackendServiceSignedUrlKey'
     kind: 'compute#BackendServiceSignedUrlKey'
diff --git a/third_party/terraform/tests/resource_compute_region_backend_service_test.go.erb b/third_party/terraform/tests/resource_compute_region_backend_service_test.go.erb
index e457b3f5631a..08da2f2b5ced 100644
--- a/third_party/terraform/tests/resource_compute_region_backend_service_test.go.erb
+++ b/third_party/terraform/tests/resource_compute_region_backend_service_test.go.erb
@@ -114,7 +114,6 @@ func TestAccComputeRegionBackendService_withBackendInternalManaged(t *testing.T)
   })
 }
 
-<% unless version == 'ga' -%>
 func TestAccComputeRegionBackendService_withBackendMultiNic(t *testing.T) {
         t.Parallel()
 
@@ -141,7 +140,6 @@ func TestAccComputeRegionBackendService_withBackendMultiNic(t *testing.T) {
                 },
         })
 }
-<% end -%>
 
 func TestAccComputeRegionBackendService_withConnectionDrainingAndUpdate(t *testing.T) {
 	t.Parallel()
@@ -559,7 +557,6 @@ resource "google_compute_health_check" "default" {
 `, serviceName, timeout, igName, itName, checkName)
 }
 
-<% unless version == 'ga' -%>
 func testAccComputeRegionBackendService_withBackendMultiNic(
         serviceName, net1Name, net2Name, igName, itName, checkName string, timeout int64) string {
         return fmt.Sprintf(`
@@ -577,13 +574,15 @@ resource "google_compute_region_backend_service" "lipsum" {
 
   backend {
     group = google_compute_instance_group_manager.foobar.instance_group
+<% unless version.nil? || version == 'ga' -%>
     failover = true
   }
 
   failover_policy {
     disable_connection_drain_on_failover = true
-    drop_traffic_if_unhealthy = true
-    failover_ratio = 0.4
+    drop_traffic_if_unhealthy            = true
+    failover_ratio                       = 0.4
+<% end -%>
   }
 
   network = google_compute_network.network2.self_link
@@ -658,7 +657,6 @@ resource "google_compute_health_check" "default" {
 }
 `, serviceName, timeout, net1Name, net1Name, net2Name, net2Name, igName, itName, checkName)
 }
-<% end -%>
 
 func testAccComputeRegionBackendService_withInvalidInternalBackend(
   serviceName, igName, itName, checkName string) string {