added qos support (#14929) (#24161)

[upstream:214ebd8df12aa3040fac3d200cf2310dfce9252a]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/14929.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+netapp: added  `qosType` and `availableThroughputMibps` fields to `netapp_storage_pool` resource
+```
+
+```release-note:enhancement
+netapp: added  `throughputMibps` field to `netapp_volume` resource
+```

google/services/netapp/resource_netapp_storage_pool.go

@@ -135,6 +135,13 @@ Please refer to the field 'effective_labels' for all of the labels present on th
 				ForceNew: true,
 				Description: `When enabled, the volumes uses Active Directory as LDAP name service for UID/GID lookups. Required to enable extended group support for NFSv3,
 using security identifiers for NFSv4.1 or principal names for kerberized NFSv4.1.`,
+			},
+			"qos_type": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: verify.ValidateEnum([]string{"QOS_TYPE_UNSPECIFIED", "AUTO", "MANUAL", ""}),
+				Description: `QoS (Quality of Service) type of the storage pool.
+Possible values are: AUTO, MANUAL. Possible values: ["QOS_TYPE_UNSPECIFIED", "AUTO", "MANUAL"]`,
 			},
 			"replica_zone": {
 				Type:     schema.TypeString,
@@ -149,6 +156,7 @@ using security identifiers for NFSv4.1 or principal names for kerberized NFSv4.1
 			},
 			"total_throughput_mibps": {
 				Type:        schema.TypeString,
+				Computed:    true,
 				Optional:    true,
 				Description: `Optional. Custom Performance Total Throughput of the pool (in MiB/s).`,
 			},
@@ -160,6 +168,11 @@ using security identifiers for NFSv4.1 or principal names for kerberized NFSv4.1
 [zone switch](https://cloud.google.com/netapp/volumes/docs/configure-and-use/storage-pools/edit-or-delete-storage-pool#switch_active_and_replica_zones).
 If you want to create a zonal Flex pool, specify a zone name for 'location' and omit 'zone'.`,
 			},
+			"available_throughput_mibps": {
+				Type:        schema.TypeFloat,
+				Computed:    true,
+				Description: `Available throughput of the storage pool (in MiB/s).`,
+			},
 			"effective_labels": {
 				Type:        schema.TypeMap,
 				Computed:    true,
@@ -285,6 +298,12 @@ func resourceNetappStoragePoolCreate(d *schema.ResourceData, meta interface{}) e
 	} else if v, ok := d.GetOkExists("total_iops"); !tpgresource.IsEmptyValue(reflect.ValueOf(totalIopsProp)) && (ok || !reflect.DeepEqual(v, totalIopsProp)) {
 		obj["totalIops"] = totalIopsProp
 	}
+	qosTypeProp, err := expandNetappStoragePoolQosType(d.Get("qos_type"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("qos_type"); !tpgresource.IsEmptyValue(reflect.ValueOf(qosTypeProp)) && (ok || !reflect.DeepEqual(v, qosTypeProp)) {
+		obj["qosType"] = qosTypeProp
+	}
 	effectiveLabelsProp, err := expandNetappStoragePoolEffectiveLabels(d.Get("effective_labels"), d, config)
 	if err != nil {
 		return err
@@ -441,6 +460,12 @@ func resourceNetappStoragePoolRead(d *schema.ResourceData, meta interface{}) err
 	if err := d.Set("total_iops", flattenNetappStoragePoolTotalIops(res["totalIops"], d, config)); err != nil {
 		return fmt.Errorf("Error reading StoragePool: %s", err)
 	}
+	if err := d.Set("qos_type", flattenNetappStoragePoolQosType(res["qosType"], d, config)); err != nil {
+		return fmt.Errorf("Error reading StoragePool: %s", err)
+	}
+	if err := d.Set("available_throughput_mibps", flattenNetappStoragePoolAvailableThroughputMibps(res["availableThroughputMibps"], d, config)); err != nil {
+		return fmt.Errorf("Error reading StoragePool: %s", err)
+	}
 	if err := d.Set("terraform_labels", flattenNetappStoragePoolTerraformLabels(res["labels"], d, config)); err != nil {
 		return fmt.Errorf("Error reading StoragePool: %s", err)
 	}
@@ -515,6 +540,12 @@ func resourceNetappStoragePoolUpdate(d *schema.ResourceData, meta interface{}) e
 	} else if v, ok := d.GetOkExists("total_iops"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, totalIopsProp)) {
 		obj["totalIops"] = totalIopsProp
 	}
+	qosTypeProp, err := expandNetappStoragePoolQosType(d.Get("qos_type"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("qos_type"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, qosTypeProp)) {
+		obj["qosType"] = qosTypeProp
+	}
 	effectiveLabelsProp, err := expandNetappStoragePoolEffectiveLabels(d.Get("effective_labels"), d, config)
 	if err != nil {
 		return err
@@ -563,6 +594,10 @@ func resourceNetappStoragePoolUpdate(d *schema.ResourceData, meta interface{}) e
 		updateMask = append(updateMask, "totalIops")
 	}
 
+	if d.HasChange("qos_type") {
+		updateMask = append(updateMask, "qosType")
+	}
+
 	if d.HasChange("effective_labels") {
 		updateMask = append(updateMask, "labels")
 	}
@@ -842,6 +877,14 @@ func flattenNetappStoragePoolTotalIops(v interface{}, d *schema.ResourceData, co
 	return v
 }
 
+func flattenNetappStoragePoolQosType(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenNetappStoragePoolAvailableThroughputMibps(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenNetappStoragePoolTerraformLabels(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return v
@@ -913,6 +956,10 @@ func expandNetappStoragePoolTotalIops(v interface{}, d tpgresource.TerraformReso
 	return v, nil
 }
 
+func expandNetappStoragePoolQosType(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandNetappStoragePoolEffectiveLabels(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
 	if v == nil {
 		return map[string]string{}, nil

google/services/netapp/resource_netapp_storage_pool_generated_meta.yaml

@@ -7,6 +7,7 @@ api_resource_type_kind: 'StoragePool'
 fields:
   - field: 'active_directory'
   - field: 'allow_auto_tiering'
+  - field: 'available_throughput_mibps'
   - field: 'capacity_gib'
   - field: 'custom_performance_enabled'
   - field: 'description'
@@ -21,6 +22,7 @@ fields:
   - field: 'name'
     provider_only: true
   - field: 'network'
+  - field: 'qos_type'
   - field: 'replica_zone'
   - field: 'service_level'
   - field: 'terraform_labels'

google/services/netapp/resource_netapp_volume.go

@@ -480,6 +480,12 @@ To disable automatic snapshot creation you have to remove the whole snapshot_pol
 					},
 				},
 			},
+			"throughput_mibps": {
+				Type:        schema.TypeFloat,
+				Computed:    true,
+				Optional:    true,
+				Description: `Optional. Custom Performance Total Throughput of the pool (in MiB/s).`,
+			},
 			"tiering_policy": {
 				Type:        schema.TypeList,
 				Optional:    true,
@@ -772,6 +778,12 @@ func resourceNetappVolumeCreate(d *schema.ResourceData, meta interface{}) error
 	} else if v, ok := d.GetOkExists("hybrid_replication_parameters"); !tpgresource.IsEmptyValue(reflect.ValueOf(hybridReplicationParametersProp)) && (ok || !reflect.DeepEqual(v, hybridReplicationParametersProp)) {
 		obj["hybridReplicationParameters"] = hybridReplicationParametersProp
 	}
+	throughputMibpsProp, err := expandNetappVolumeThroughputMibps(d.Get("throughput_mibps"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("throughput_mibps"); !tpgresource.IsEmptyValue(reflect.ValueOf(throughputMibpsProp)) && (ok || !reflect.DeepEqual(v, throughputMibpsProp)) {
+		obj["throughputMibps"] = throughputMibpsProp
+	}
 	effectiveLabelsProp, err := expandNetappVolumeEffectiveLabels(d.Get("effective_labels"), d, config)
 	if err != nil {
 		return err
@@ -988,6 +1000,9 @@ func resourceNetappVolumeRead(d *schema.ResourceData, meta interface{}) error {
 	if err := d.Set("hybrid_replication_parameters", flattenNetappVolumeHybridReplicationParameters(res["hybridReplicationParameters"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Volume: %s", err)
 	}
+	if err := d.Set("throughput_mibps", flattenNetappVolumeThroughputMibps(res["throughputMibps"], d, config)); err != nil {
+		return fmt.Errorf("Error reading Volume: %s", err)
+	}
 	if err := d.Set("terraform_labels", flattenNetappVolumeTerraformLabels(res["labels"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Volume: %s", err)
 	}
@@ -1092,6 +1107,12 @@ func resourceNetappVolumeUpdate(d *schema.ResourceData, meta interface{}) error
 	} else if v, ok := d.GetOkExists("hybrid_replication_parameters"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, hybridReplicationParametersProp)) {
 		obj["hybridReplicationParameters"] = hybridReplicationParametersProp
 	}
+	throughputMibpsProp, err := expandNetappVolumeThroughputMibps(d.Get("throughput_mibps"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("throughput_mibps"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, throughputMibpsProp)) {
+		obj["throughputMibps"] = throughputMibpsProp
+	}
 	effectiveLabelsProp, err := expandNetappVolumeEffectiveLabels(d.Get("effective_labels"), d, config)
 	if err != nil {
 		return err
@@ -1164,6 +1185,10 @@ func resourceNetappVolumeUpdate(d *schema.ResourceData, meta interface{}) error
 		updateMask = append(updateMask, "hybridReplicationParameters")
 	}
 
+	if d.HasChange("throughput_mibps") {
+		updateMask = append(updateMask, "throughputMibps")
+	}
+
 	if d.HasChange("effective_labels") {
 		updateMask = append(updateMask, "labels")
 	}
@@ -1958,6 +1983,10 @@ func flattenNetappVolumeHybridReplicationParametersLabels(v interface{}, d *sche
 	return v
 }
 
+func flattenNetappVolumeThroughputMibps(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenNetappVolumeTerraformLabels(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return v
@@ -2646,6 +2675,10 @@ func expandNetappVolumeHybridReplicationParametersLabels(v interface{}, d tpgres
 	return m, nil
 }
 
+func expandNetappVolumeThroughputMibps(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandNetappVolumeEffectiveLabels(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
 	if v == nil {
 		return map[string]string{}, nil

google/services/netapp/resource_netapp_volume_generated_meta.yaml

@@ -83,6 +83,7 @@ fields:
   - field: 'storage_pool'
   - field: 'terraform_labels'
     provider_only: true
+  - field: 'throughput_mibps'
   - field: 'tiering_policy.cooling_threshold_days'
   - field: 'tiering_policy.tier_action'
   - field: 'unix_permissions'

website/docs/r/netapp_storage_pool.html.markdown

@@ -191,6 +191,12 @@ The following arguments are supported:
   Flag indicating that the hot-tier threshold will be auto-increased by 10% of the hot-tier when it hits 100%. Default is true.
   The increment will kick in only if the new size after increment is still less than or equal to storage pool size.
 
+* `qos_type` -
+  (Optional)
+  QoS (Quality of Service) type of the storage pool.
+  Possible values are: AUTO, MANUAL.
+  Possible values are: `QOS_TYPE_UNSPECIFIED`, `AUTO`, `MANUAL`.
+
 * `project` - (Optional) The ID of the project in which the resource belongs.
     If it is not provided, the provider project is used.
 
@@ -211,6 +217,9 @@ In addition to the arguments listed above, the following computed attributes are
 * `encryption_type` -
   Reports if volumes in the pool are encrypted using a Google-managed encryption key or CMEK.
 
+* `available_throughput_mibps` -
+  Available throughput of the storage pool (in MiB/s).
+
 * `terraform_labels` -
   The combination of labels configured directly on the resource
    and default labels configured on the provider.

website/docs/r/netapp_volume.html.markdown

@@ -177,6 +177,10 @@ The following arguments are supported:
   The Hybrid Replication parameters for the volume.
   Structure is [documented below](#nested_hybrid_replication_parameters).
 
+* `throughput_mibps` -
+  (Optional)
+  Optional. Custom Performance Total Throughput of the pool (in MiB/s).
+
 * `project` - (Optional) The ID of the project in which the resource belongs.
     If it is not provided, the provider project is used.