add blockDevices and ISCSI changes for volume resource (#15405)

Author: Mehul3217

mmv1/products/netapp/Volume.yaml

@@ -35,9 +35,9 @@ update_mask: true
 import_format:
   - 'projects/{{project}}/locations/{{location}}/volumes/{{name}}'
 timeouts:
-  insert_minutes: 20
-  update_minutes: 20
-  delete_minutes: 20
+  insert_minutes: 50
+  update_minutes: 30
+  delete_minutes: 30
 autogen_async: true
 async:
   actions: ['create', 'delete', 'update']
@@ -48,6 +48,8 @@ async:
     resource_inside_response: false
 custom_code:
   pre_delete: 'templates/terraform/pre_delete/netapp_volume_force_delete.go.tmpl'
+  pre_update: 'templates/terraform/pre_update/netapp_volume_custom_block_devices_update.tmpl'
+  constants: 'templates/terraform/constants/netapp_volume.go.tmpl'
 examples:
   - name: 'netapp_volume_basic'
     primary_resource_id: 'test_volume'
@@ -103,7 +105,6 @@ properties:
     type: String
     description: |
       Share name (SMB) or export path (NFS) of the volume. Needs to be unique per location.
-    required: true
     immutable: true
   - name: 'psaRange'
     type: String
@@ -219,6 +220,7 @@ properties:
         - 'NFSV3'
         - 'NFSV4'
         - 'SMB'
+        - 'ISCSI'
   - name: 'smbSettings'
     type: Array
     description: |
@@ -618,3 +620,58 @@ properties:
     description: |
       Total hot tier data rounded down to the nearest GiB used by the volume. This field is only used for flex Service Level
     output: true
+  - name: 'blockDevices'
+    type: Array
+    description: |
+      Block device represents the device(s) which are stored in the block volume.
+      Currently, only one block device is permitted per Volume.
+    item_type:
+      type: NestedObject
+      properties:
+        - name: 'name'
+          type: String
+          description: |
+            User-defined name for the block device, unique within the Volume. In case
+            no user input is provided, name will be autogenerated in the backend.
+            The name must meet the following requirements:
+            *   Be between 1 and 255 characters long.
+            *   Contain only uppercase or lowercase letters (A-Z, a-z), numbers (0-9),
+                and the following special characters: "-", "_", "}", "{", ".".
+            *   Spaces are not allowed.
+          default_from_api: true
+        - name: 'hostGroups'
+          type: Array
+          description: |
+            A list of host groups that identify hosts that can mount the block volume.
+            Format:
+            `projects/{project_id}/locations/{location}/hostGroups/{host_group_id}`
+            This field can be updated after the block device is created.
+          default_from_api: true
+          diff_suppress_func: 'ProjectIDDiffSuppress'
+          item_type:
+            type: String
+        - name: 'identifier'
+          type: String
+          description: |
+            Device identifier of the Block volume. This represents lun_serial_number
+            for ISCSI volumes
+          output: true
+        - name: 'sizeGib'
+          type: Integer
+          description: |
+            The size of the block device in GiB.
+            Any value provided in this field during Volume creation is IGNORED.
+            The block device's size is system-managed and will be set to match
+            the parent Volume's `capacity_gib`.
+          output: true
+        - name: 'osType'
+          type: Enum
+          description: |
+            The OS type of the volume.
+            This field can't be changed after the block device is created.
+          immutable: true
+          required: true
+          enum_values:
+            - 'LINUX'
+            - 'WINDOWS'
+            - 'ESXI'

mmv1/templates/terraform/constants/netapp_volume.go.tmpl

@@ -0,0 +1,22 @@
+// Suppress diffs when the value read from api
+// has the project ID instead of the project number
+func ProjectIDDiffSuppress(_, old, new string, _ *schema.ResourceData) bool {
+
+	const marker = "/locations"
+
+	// Find the starting index of "/locations" in both strings.
+	index1 := strings.Index(old, marker)
+	index2 := strings.Index(new, marker)
+
+	// If "/locations" is not found in either string, they can't be compared as requested.
+	if index1 == -1 || index2 == -1 {
+		return false
+	}
+
+	// Extract the substrings from the marker to the end.
+	suffix1 := old[index1:]
+	suffix2 := new[index2:]
+
+	// Compare the extracted suffixes.
+	return suffix1 == suffix2
+}

mmv1/templates/terraform/pre_update/netapp_volume_custom_block_devices_update.tmpl

@@ -0,0 +1,24 @@
+// remove sizeGib and identifier from the update request for block_devices
+
+if v, ok := d.GetOk("block_devices"); ok {
+
+    l := v.([]interface{})
+    newBlockDevices := make([]interface{}, 0, len(l))
+
+    for _, item := range v.([]interface{}) {
+        if item == nil { continue }
+        blockDevice := item.(map[string]interface{})
+        newblockDevice := make(map[string]interface{})
+
+        if val, exists := blockDevice["name"]; exists { newblockDevice["name"] = val }
+        if val, exists := blockDevice["host_groups"]; exists { newblockDevice["host_groups"] = val }
+        if val, exists := blockDevice["os_type"]; exists { newblockDevice["os_type"] = val }
+
+        newBlockDevices = append(newBlockDevices, newblockDevice)
+    }
+
+    log.Printf("newBlockDevices %v", newBlockDevices)
+    if len(newBlockDevices) > 0 {
+        obj["blockDevices"] = newBlockDevices
+    }
+}

mmv1/third_party/terraform/services/netapp/resource_netapp_volume_test.go.tmpl

@@ -1311,3 +1311,121 @@ func testAccNetappVolume_volumeExportPolicyWithoutSquashModeUpdate(context map[s
   `, context)
 }
 {{ end }}
+
+func TestAccNetappBlockVolume_NetappVolumeBasicExample_update(t *testing.T) {
+	context := map[string]interface{}{
+		"network_name":  acctest.BootstrapSharedServiceNetworkingConnection(t, "gcnv-network-config-3", acctest.ServiceNetworkWithParentService("netapp.servicenetworking.goog")),
+		"random_suffix": acctest.RandString(t, 10),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckNetappVolumeDestroyProducer(t),
+		ExternalProviders: map[string]resource.ExternalProvider{
+			"time": {},
+		},
+		Steps: []resource.TestStep{
+			{
+				Config: testAccNetappBlockVolume_volumeBasicExample_basic(context),
+			},
+			{
+				ResourceName:            "google_netapp_volume.test_volume",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"restore_parameters", "location", "name", "deletion_policy", "labels", "terraform_labels"},
+			},
+			{
+				Config: testAccNetappBlockVolume_volumeBasicExample_update(context),
+			},
+			{
+				ResourceName:            "google_netapp_volume.test_volume",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"restore_parameters", "location", "name", "deletion_policy", "labels", "terraform_labels"},
+			},
+		},
+	})
+}
+
+func testAccNetappBlockVolume_volumeBasicExample_basic(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+    resource "google_netapp_storage_pool" "default" {
+        name = "tf-test-test-pool%{random_suffix}"
+        location = "us-central1-a"
+        service_level = "FLEX"
+        capacity_gib = "2048"
+        type = "UNIFIED"
+        network = data.google_compute_network.default.id
+    }
+
+    resource "google_netapp_host_group" "test_host_group" {
+		name = "tf-test-test-host-group%{random_suffix}"
+		location = "us-central1"
+		os_type = "LINUX"
+		type = "ISCSI_INITIATOR"
+		hosts = ["iqn.1994-05.com.redhat:8518f79d5366"]
+	}
+
+    resource "google_netapp_volume" "test_volume" {
+        location = "us-central1-a"
+        name = "tf_test_test_volume%{random_suffix}"
+        capacity_gib = "100"
+        storage_pool = google_netapp_storage_pool.default.name
+        protocols = ["ISCSI"]
+        block_devices {
+            host_groups = [google_netapp_host_group.test_host_group.id]
+            os_type = "LINUX"
+        }
+    }
+
+    data "google_compute_network" "default" {
+        name = "%{network_name}"
+    }
+    `, context)
+}
+
+func testAccNetappBlockVolume_volumeBasicExample_update(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+    resource "google_netapp_storage_pool" "default" {
+        name = "tf-test-test-pool%{random_suffix}"
+        location = "us-central1-a"
+        service_level = "FLEX"
+        capacity_gib = "2048"
+        type = "UNIFIED"
+        network = data.google_compute_network.default.id
+    }
+
+    resource "google_netapp_host_group" "test_host_group" {
+		name = "tf-test-test-host-group%{random_suffix}"
+		location = "us-central1"
+		os_type = "LINUX"
+		type = "ISCSI_INITIATOR"
+		hosts = ["iqn.1994-05.com.redhat:8518f79d5366"]
+	}
+
+    resource "google_netapp_host_group" "test_host_group2" {
+		name = "tf-test-test-host2-group%{random_suffix}"
+		location = "us-central1"
+		os_type = "LINUX"
+		type = "ISCSI_INITIATOR"
+		hosts = ["iqn.1994-05.com.debian:8518f79d5366"]
+	}
+
+    resource "google_netapp_volume" "test_volume" {
+        location = "us-central1-a"
+        name = "tf_test_test_volume%{random_suffix}"
+        capacity_gib = "100"
+        storage_pool = google_netapp_storage_pool.default.name
+        protocols = ["ISCSI"]
+        block_devices {
+            host_groups = [google_netapp_host_group.test_host_group.id, google_netapp_host_group.test_host_group2.id]
+            os_type = "LINUX"
+        }
+    }
+
+    data "google_compute_network" "default" {
+        name = "%{network_name}"
+    }
+    `, context)
+}