[BLOCK] Add storage pool type field (#15415)

Author: sahil-mahajan-google

mmv1/products/netapp/StoragePool.yaml

@@ -54,8 +54,8 @@ import_format:
   - 'projects/{{project}}/locations/{{location}}/storagePools/{{name}}'
 timeouts:
   insert_minutes: 45
-  update_minutes: 20
-  delete_minutes: 20
+  update_minutes: 60
+  delete_minutes: 45
 autogen_async: true
 async:
   actions: ['create', 'delete', 'update']
@@ -184,6 +184,7 @@ properties:
     type: Boolean
     description: |
       Optional. True if using Independent Scaling of capacity and performance (Hyperdisk). Default is false.
+    default_from_api: true
     immutable: true
   - name: 'totalThroughputMibps'
     type: String
@@ -232,3 +233,15 @@ properties:
     description: |
       Total hot tier data rounded down to the nearest GiB used by the storage pool.
     output: true
+  - name: 'type'
+    type: Enum
+    description: |
+      Type of the storage pool.
+      This field is used to control whether the pool supports FILE based volumes only or UNIFIED (both FILE and BLOCK) volumes.
+      If not specified during creation, it defaults to FILE.
+    enum_values:
+      - 'STORAGE_POOL_TYPE_UNSPECIFIED'
+      - 'FILE'
+      - 'UNIFIED'
+    immutable: true
+    default_from_api: true

mmv1/third_party/terraform/services/netapp/resource_netapp_storage_pool_test.go

@@ -727,3 +727,84 @@ data "google_compute_network" "default" {
 }
 `, context)
 }
+
+func TestAccNetappStoragePool_unifiedStoragePoolCreate(t *testing.T) {
+	t.Parallel()
+
+	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),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccNetappStoragePool_unifiedStoragePoolCreate(context),
+			},
+			{
+				ResourceName:            "google_netapp_storage_pool.test_pool",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"location", "name", "labels", "terraform_labels"},
+			},
+			{
+				Config: testAccNetappStoragePool_unifiedStoragePoolCreate_update(context),
+			},
+			{
+				ResourceName:            "google_netapp_storage_pool.test_pool",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"location", "name", "labels", "terraform_labels"},
+			},
+		},
+	})
+}
+
+func testAccNetappStoragePool_unifiedStoragePoolCreate(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+
+data "google_compute_network" "default" {
+    name = "%{network_name}"
+}
+
+resource "google_netapp_storage_pool" "test_pool" {
+    name = "tf-test-pool%{random_suffix}"
+    location = "us-central1-a"
+    service_level = "FLEX"
+    type = "UNIFIED"
+    capacity_gib = "2048"
+    network = data.google_compute_network.default.id
+    description           = "this is a test description"
+    labels                = {
+        key = "test"
+        value = "pool"
+    }
+}
+`, context)
+}
+
+func testAccNetappStoragePool_unifiedStoragePoolCreate_update(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+
+data "google_compute_network" "default" {
+    name = "%{network_name}"
+}
+
+resource "google_netapp_storage_pool" "test_pool" {
+    name = "tf-test-pool%{random_suffix}"
+    location = "us-central1-a"
+    service_level = "FLEX"
+    type = "UNIFIED"
+    capacity_gib = "2048"
+    network = data.google_compute_network.default.id
+    description           = "this is a test description"
+    labels                = {
+        key = "test"
+        value = "pool"
+    }
+	total_throughput_mibps = "200"
+}
+`, context)
+}