network profiles and RDMA v1 support

Author: cesteve

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,6 +11,6 @@ For example: Fixes https://github.com/hashicorp/terraform-provider-google/issues
 
 See [Write release notes](https://googlecloudplatform.github.io/magic-modules/contribute/release-notes/) for guidance.
 
-```release-note:REPLACEME
-
+```release-note:enhancement
+   compute: added `network_profile` field to `google_compute_network` resource. Added support for MRDMA and IRDMA nic types.
 ```

mmv1/products/compute/Network.yaml

@@ -230,10 +230,9 @@ properties:
   - name: 'networkProfile'
     type: String
     immutable: true
-    min_version: 'beta'
     description: |
       A full or partial URL of the network profile to apply to this network.
       This field can be set only at resource creation time. For example, the
       following are valid URLs:
-      * https://www.googleapis.com/compute/beta/projects/{projectId}/global/networkProfiles/{network_profile_name}
+      * https://www.googleapis.com/compute/{api_version}/projects/{projectId}/global/networkProfiles/{network_profile_name}
       * projects/{projectId}/global/networkProfiles/{network_profile_name}

mmv1/third_party/terraform/services/compute/data_source_google_compute_network.go.tmpl

@@ -42,12 +42,10 @@ func DataSourceGoogleComputeNetwork() *schema.Resource {
 				Computed: true,
 			},
 
-			{{- if ne $.TargetVersionName "ga" }}
 			"network_profile": {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
-			{{- end }}
 
 			"self_link": {
 				Type:     schema.TypeString,
@@ -93,11 +91,9 @@ func dataSourceGoogleComputeNetworkRead(d *schema.ResourceData, meta interface{}
 	if err := d.Set("internal_ipv6_range", network.InternalIpv6Range); err != nil {
 		return fmt.Errorf("Error setting internal_ipv6_range: %s", err)
 	}
-	{{- if ne $.TargetVersionName "ga" }}
 	if err := d.Set("network_profile", network.NetworkProfile); err != nil {
 		return fmt.Errorf("Error setting network_profile: %s", err)
 	}
-	{{- end }}
 	if err := d.Set("self_link", network.SelfLink); err != nil {
 		return fmt.Errorf("Error setting self_link: %s", err)
 	}

mmv1/third_party/terraform/services/compute/resource_compute_instance.go.tmpl

@@ -467,13 +467,8 @@ func ResourceComputeInstance() *schema.Resource {
 							Type:         schema.TypeString,
 							Optional:     true,
 							ForceNew:     true,
-							{{- if eq $.TargetVersionName `ga` }}
-							ValidateFunc: validation.StringInSlice([]string{"GVNIC", "VIRTIO_NET", "IDPF"}, false),
-							Description:  `The type of vNIC to be used on this interface. Possible values:GVNIC, VIRTIO_NET, IDPF`,
-							{{- else }}
 							ValidateFunc: validation.StringInSlice([]string{"GVNIC", "VIRTIO_NET", "IDPF", "MRDMA", "IRDMA"}, false),
 							Description:  `The type of vNIC to be used on this interface. Possible values:GVNIC, VIRTIO_NET, IDPF, MRDMA, and IRDMA`,
-							{{- end }}
 						},
 						"access_config": {
 							Type:        schema.TypeList,

mmv1/third_party/terraform/services/compute/resource_compute_instance_template.go.tmpl

@@ -487,13 +487,8 @@ Google Cloud KMS.`,
 							Type:         schema.TypeString,
 							Optional:     true,
 							ForceNew:     true,
-							{{- if eq $.TargetVersionName `ga` }}
-							ValidateFunc: validation.StringInSlice([]string{"GVNIC", "VIRTIO_NET"}, false),
-							Description:  `The type of vNIC to be used on this interface. Possible values:GVNIC, VIRTIO_NET`,
-							{{- else }}
 							ValidateFunc: validation.StringInSlice([]string{"GVNIC", "VIRTIO_NET", "MRDMA", "IRDMA"}, false),
 							Description:  `The type of vNIC to be used on this interface. Possible values:GVNIC, VIRTIO_NET, MRDMA, and IRDMA`,
-							{{- end }}
 						},
 						"access_config": {
 							Type:        schema.TypeList,

mmv1/third_party/terraform/services/compute/resource_compute_network_test.go.tmpl

@@ -218,6 +218,7 @@ func TestAccComputeNetwork_bgpInterRegionCostAndUpdate(t *testing.T) {
        },
    })
 }
+{{- end }}
 
 func TestAccComputeNetwork_networkProfile(t *testing.T) {
    t.Parallel()
@@ -226,11 +227,11 @@ func TestAccComputeNetwork_networkProfile(t *testing.T) {
    suffixName := acctest.RandString(t, 10)
    networkName := fmt.Sprintf("tf-test-network-profile-%s", suffixName)
    projectId := envvar.GetTestProjectFromEnv()
-   profileURL := fmt.Sprintf("https://www.googleapis.com/compute/beta/projects/%s/global/networkProfiles/europe-west1-b-vpc-roce", projectId)
+   profileURL := fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/global/networkProfiles/europe-west1-b-vpc-roce", projectId)
 
    acctest.VcrTest(t, resource.TestCase{
        PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-       ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+       ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
        CheckDestroy:             testAccCheckComputeNetworkDestroyProducer(t),
        Steps: []resource.TestStep{
            {
@@ -245,7 +246,6 @@ func TestAccComputeNetwork_networkProfile(t *testing.T) {
        },
    })
 }
-{{- end }}
 
 func TestAccComputeNetwork_numericId(t *testing.T) {
 	t.Parallel()
@@ -650,6 +650,7 @@ func testAccCheckComputeNetworkHasBgpInterRegionCost(t *testing.T, n string, net
        return nil
    }
 }
+{{- end }}
 
 func testAccCheckComputeNetworkHasNetworkProfile(t *testing.T, n string, network *compute.Network, networkProfile string) resource.TestCheckFunc {
    return func(s *terraform.State) error {
@@ -679,7 +680,6 @@ func testAccCheckComputeNetworkHasNetworkProfile(t *testing.T, n string, network
        return nil
    }
 }
-{{- end }}
 
 func testAccCheckComputeNetworkHasNetworkFirewallPolicyEnforcementOrder(t *testing.T, n string, network *compute.Network, order string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
@@ -791,19 +791,18 @@ resource "google_compute_network" "acc_network_bgp_inter_region_cost" {
 }
 `, networkName, bgpInterRegionCost)
 }
+{{- end }}
 
 func testAccComputeNetwork_network_profile(networkName, networkProfile string) string {
    return fmt.Sprintf(`
 resource "google_compute_network" "acc_network_network_profile" {
- provider                = google-beta
  name                    = "%s"
  routing_mode            = "REGIONAL"
  network_profile         = "%s"
  auto_create_subnetworks = false
 }
 `, networkName, networkProfile)
 }
-{{- end }}
 
 func testAccComputeNetwork_deleteDefaultRoute(networkName string) string {
 	return fmt.Sprintf(`

mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template.go.tmpl

@@ -455,13 +455,8 @@ Google Cloud KMS.`,
 							Type:         schema.TypeString,
 							Optional:     true,
 							ForceNew:     true,
-							{{- if eq $.TargetVersionName `ga` }}
-							ValidateFunc: validation.StringInSlice([]string{"GVNIC", "VIRTIO_NET"}, false),
-							Description:  `The type of vNIC to be used on this interface. Possible values:GVNIC, VIRTIO_NET`,
-							{{- else }}
 							ValidateFunc: validation.StringInSlice([]string{"GVNIC", "VIRTIO_NET", "MRDMA", "IRDMA"}, false),
 							Description:  `The type of vNIC to be used on this interface. Possible values:GVNIC, VIRTIO_NET, MRDMA, and IRDMA`,
-							{{- end }}
 						},
 						"access_config": {
 							Type:        schema.TypeList,

mmv1/third_party/terraform/website/docs/d/compute_network.html.markdown

@@ -42,7 +42,7 @@ In addition to the arguments listed above, the following attributes are exported
 
 * `internal_ipv6_range` - The ula internal ipv6 range assigned to this network.
 
-* `network_profile` - [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html) A full or partial URL of the network profile to apply to this network.
+* `network_profile` - A full or partial URL of the network profile to apply to this network.
 
 * `subnetworks_self_links` - the list of subnetworks which belong to the network
 

mmv1/third_party/terraform/website/docs/r/compute_instance.html.markdown

@@ -397,7 +397,7 @@ is desired, you will need to modify your state file manually using
     array of alias IP ranges for this network interface. Can only be specified for network
     interfaces on subnet-mode networks. Structure [documented below](#nested_alias_ip_range).
 
-* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET, IDPF. In the beta provider the additional values of MRDMA and IRDMA are supported.
+* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET, IDPF, MRDMA, IRDMA.
 
 * `network_attachment` - (Optional) [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html) The URL of the network attachment that this interface should connect to in the following format: `projects/{projectNumber}/regions/{region_name}/networkAttachments/{network_attachment_name}`.
 

mmv1/third_party/terraform/website/docs/r/compute_instance_template.html.markdown

@@ -561,7 +561,7 @@ The following arguments are supported:
     array of alias IP ranges for this network interface. Can only be specified for network
     interfaces on subnet-mode networks. Structure [documented below](#nested_alias_ip_range).
 
-* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET. In the beta provider the additional values of MRDMA and IRDMA are supported.
+* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET, MRDMA, IRDMA.
 
 * `stack_type` - (Optional) The stack type for this network interface to identify whether the IPv6 feature is enabled or not. Values are IPV4_IPV6 or IPV4_ONLY. If not specified, IPV4_ONLY will be used.
 

mmv1/third_party/terraform/website/docs/r/compute_region_instance_template.html.markdown

@@ -527,7 +527,7 @@ The following arguments are supported:
     array of alias IP ranges for this network interface. Can only be specified for network
     interfaces on subnet-mode networks. Structure [documented below](#nested_alias_ip_range).
 
-* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET. In the beta provider the additional values of MRDMA and IRDMA are supported.
+* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET, MRDMA, IRDMA.
 
 * `stack_type` - (Optional) The stack type for this network interface to identify whether the IPv6 feature is enabled or not. Values are IPV4_IPV6 or IPV4_ONLY. If not specified, IPV4_ONLY will be used.