Merge pull request #514 from NetApp/496-enhancement-netapp-ontap_lun

496 - enhancement - netapp-ontap_lun

Author: suhasbshekar

CHANGELOG.md

@@ -1,7 +1,8 @@
-# 2.2.1
+# 2.3.0
 
 ENHANCEMENTS:
 
+- **netapp-ontap_lun**: added `space.scsi_thin_provisioning_support_enabled` option. ([#496](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/496))
 - **netapp-ontap_volume**, **netapp-ontap_volumes**: added `autosize.*` options to data sources. ([#509](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/509))
 
 # 2.2.0 (2025-05-01)

docs/data-sources/lun.md

@@ -91,5 +91,6 @@ Read-Only:
 
 Read-Only:
 
+- `scsi_thin_provisioning_support_enabled` (Boolean) Specifies the value for the space allocation attribute, which determines if the LUN supports the SCSI Thin Provisioning features
 - `size` (Number) Size of the lun
 - `used` (Number) Used space of the lun

docs/data-sources/luns.md

@@ -101,5 +101,6 @@ Read-Only:
 
 Read-Only:
 
+- `scsi_thin_provisioning_support_enabled` (Boolean) Specifies the value for the space allocation attribute, which determines if the LUN supports the SCSI Thin Provisioning features
 - `size` (Number) Size of lun in bytes
 - `used` (Number) Used space of lun in bytes

docs/resources/lun.md

@@ -34,7 +34,6 @@ resource "netapp-ontap_lun" "storage_lun" {
   volume_name = "lunTest"
   os_type = "linux"
   size = 1048576
-
 }
 
 ```
@@ -54,6 +53,7 @@ resource "netapp-ontap_lun" "storage_lun" {
 ### Optional
 
 - `qos_policy_name` (String) QoS policy name
+- `scsi_thin_provisioning_support_enabled` (Boolean) Specifies the value for the space allocation attribute, which determines if the LUN supports the SCSI Thin Provisioning features
 - `size_unit` (String) The unit used to interpret the size parameter
 
 ### Read-Only

internal/interfaces/storage_lun.go

@@ -42,8 +42,9 @@ type LunQoSPolicy struct {
 
 // LunSpace describes the data model for space.
 type LunSpace struct {
-	Size int64 `mapstructure:"size,omitempty"`
-	Used int64 `mapstructure:"used,omitempty"`
+	Size       int64 `mapstructure:"size,omitempty"`
+	Used       int64 `mapstructure:"used,omitempty"`
+	Allocation *bool  `mapstructure:"scsi_thin_provisioning_support_enabled,omitempty"`
 }
 
 // StorageLunResourceBodyDataModelONTAP describes the body data model using go types for mapping.
@@ -66,7 +67,8 @@ type volume struct {
 }
 
 type space struct {
-	Size int64 `mapstructure:"size,omitempty"`
+	Size       int64 `mapstructure:"size,omitempty"`
+	Allocation *bool  `mapstructure:"scsi_thin_provisioning_support_enabled,omitempty"`
 }
 
 // StorageLunDataSourceFilterModel describes the data source data model for queries.

internal/provider/storage/storage_lun_data_source.go

@@ -73,8 +73,9 @@ type StorageLunDataSourceQoSPolicyModel struct {
 
 // StorageLunDataSourceSpaceModel describes the data source data model for queries.
 type StorageLunDataSourceSpaceModel struct {
-	Size types.Int64 `tfsdk:"size"`
-	Used types.Int64 `tfsdk:"used"`
+	Size       types.Int64 `tfsdk:"size"`
+	Used       types.Int64 `tfsdk:"used"`
+	Allocation types.Bool  `tfsdk:"scsi_thin_provisioning_support_enabled"`
 }
 
 // Metadata returns the data source type name.
@@ -162,6 +163,10 @@ func (d *StorageLunDataSource) Schema(ctx context.Context, req datasource.Schema
 						MarkdownDescription: "Used space of the lun",
 						Computed:            true,
 					},
+					"scsi_thin_provisioning_support_enabled": schema.BoolAttribute{
+						MarkdownDescription: "Specifies the value for the space allocation attribute, which determines if the LUN supports the SCSI Thin Provisioning features",
+						Computed:            true,
+					},
 				},
 			},
 			"id": schema.StringAttribute{
@@ -227,8 +232,9 @@ func (d *StorageLunDataSource) Read(ctx context.Context, req datasource.ReadRequ
 		data.QoSPolicy.UUID = types.StringValue(restInfo.QoSPolicy.UUID)
 	}
 	data.Space = &StorageLunDataSourceSpaceModel{
-		Size: types.Int64Value(restInfo.Space.Size),
-		Used: types.Int64Value(restInfo.Space.Used),
+		Size:       types.Int64Value(restInfo.Space.Size),
+		Used:       types.Int64Value(restInfo.Space.Used),
+		Allocation: types.BoolPointerValue(restInfo.Space.Allocation),
 	}
 	data.ID = types.StringValue(restInfo.UUID)
 

internal/provider/storage/storage_lun_resource.go

@@ -11,6 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
@@ -57,6 +58,7 @@ type StorageLunResourceModel struct {
 	QoSPolicyName types.String `tfsdk:"qos_policy_name"`
 	SerialNumber  types.String `tfsdk:"serial_number"`
 	LogicalUnit   types.String `tfsdk:"logical_unit"`
+	Allocation    types.Bool   `tfsdk:"scsi_thin_provisioning_support_enabled"`
 	ID            types.String `tfsdk:"id"`
 }
 
@@ -123,6 +125,14 @@ func (r *StorageLunResource) Schema(ctx context.Context, req resource.SchemaRequ
 					stringplanmodifier.UseStateForUnknown(),
 				},
 			},
+			"scsi_thin_provisioning_support_enabled": schema.BoolAttribute{
+				MarkdownDescription: "Specifies the value for the space allocation attribute, which determines if the LUN supports the SCSI Thin Provisioning features",
+				Optional:            true,
+				Computed:			 true,
+				PlanModifiers: []planmodifier.Bool{
+					boolplanmodifier.UseStateForUnknown(),
+				},
+			},
 			"id": schema.StringAttribute{
 				MarkdownDescription: "StorageLun UUID",
 				Computed:            true,
@@ -196,6 +206,7 @@ func (r *StorageLunResource) Read(ctx context.Context, req resource.ReadRequest,
 	data.VolumeName = types.StringValue(restInfo.Location.Volume.Name)
 	data.OSType = types.StringValue(restInfo.OSType)
 	data.SerialNumber = types.StringValue(restInfo.SerialNumber)
+	data.Allocation = types.BoolPointerValue(restInfo.Space.Allocation)
 	if !data.SizeUnit.IsNull() {
 		var sizeUnit string
 		var size int64
@@ -253,6 +264,9 @@ func (r *StorageLunResource) Create(ctx context.Context, req resource.CreateRequ
 	if !data.QoSPolicyName.IsNull() {
 		body.QosPolicy = data.QoSPolicyName.ValueString()
 	}
+	if !data.Allocation.IsNull() {
+		body.Space.Allocation = data.Allocation.ValueBoolPointer()
+	}
 
 	client, err := connection.GetRestClient(errorHandler, r.config, data.CxProfileName)
 	if err != nil {
@@ -269,6 +283,7 @@ func (r *StorageLunResource) Create(ctx context.Context, req resource.CreateRequ
 	data.SerialNumber = types.StringValue(resource.SerialNumber)
 	data.LogicalUnit = types.StringValue(resource.Location.LogicalUnit)
 	data.Name = types.StringValue(resource.Name)
+	data.Allocation = types.BoolPointerValue(resource.Space.Allocation)
 
 	tflog.Trace(ctx, "created a resource")
 
@@ -323,6 +338,9 @@ func (r *StorageLunResource) Update(ctx context.Context, req resource.UpdateRequ
 	if !plan.QoSPolicyName.Equal(state.QoSPolicyName) {
 		request.QosPolicy = plan.QoSPolicyName.ValueString()
 	}
+	if !plan.Allocation.Equal(state.Allocation) {
+		request.Space.Allocation = plan.Allocation.ValueBoolPointer()
+	}
 	err = interfaces.UpdateStorageLun(errorHandler, *client, state.ID.ValueString(), request)
 	if err != nil {
 		return

internal/provider/storage/storage_lun_resource_alias_test.go

@@ -51,7 +51,7 @@ func TestAccStorageLunResouceAlias(t *testing.T) {
 			{
 				ResourceName:  "netapp-ontap_storage_lun_resource.example",
 				ImportState:   true,
-				ImportStateId: fmt.Sprintf("%s,%s,%s,%s", "/vol/tf_acc_volume/tf_acc_lun", "tf_acc_volume", "tf_acc_svm", "cluster4"),
+				ImportStateId: fmt.Sprintf("%s,%s,%s,%s", "/vol/tf_acc_volume/tf_acc_lun", "tf_acc_volume", "tf_acc_svm", "cluster5"),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("netapp-ontap_storage_lun_resource.example", "name", "tf_acc_lun"),
 					resource.TestCheckResourceAttr("netapp-ontap_storage_lun_resource.example", "os_type", "linux"),
@@ -60,31 +60,33 @@ func TestAccStorageLunResouceAlias(t *testing.T) {
 			},
 			// create storage lun with size_unit
 			{
-				Config: testAccStorageLunResourceWithSizeUnitConfigAlias("ACC-lun-size", "tf_acc_svm", "tf_acc_volume", "linux", 4, "kb"),
+				Config: testAccStorageLunResourceWithSizeUnitConfigAlias("ACC-lun-size", "tf_acc_svm", "tf_acc_volume", "linux", 4, "kb", true),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("netapp-ontap_storage_lun_resource.example_size", "name", "/vol/tf_acc_volume/ACC-lun-size"),
 					resource.TestCheckResourceAttr("netapp-ontap_storage_lun_resource.example_size", "svm_name", "tf_acc_svm"),
 					resource.TestCheckResourceAttr("netapp-ontap_storage_lun_resource.example_size", "volume_name", "tf_acc_volume"),
 					resource.TestCheckResourceAttr("netapp-ontap_storage_lun_resource.example_size", "os_type", "linux"),
 					resource.TestCheckResourceAttr("netapp-ontap_storage_lun_resource.example_size", "size", "4"),
 					resource.TestCheckResourceAttr("netapp-ontap_storage_lun_resource.example_size", "size_unit", "kb"),
+					resource.TestCheckResourceAttr("netapp-ontap_storage_lun_resource.example_size", "scsi_thin_provisioning_support_enabled", "true"),
 				),
 			},
 			// update storage lun with size_unit
 			{
-				Config: testAccStorageLunResourceWithSizeUnitConfigAlias("ACC-lun-size", "tf_acc_svm", "tf_acc_volume", "linux", 5, "kb"),
+				Config: testAccStorageLunResourceWithSizeUnitConfigAlias("ACC-lun-size", "tf_acc_svm", "tf_acc_volume", "linux", 5, "kb", false),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("netapp-ontap_storage_lun_resource.example_size", "name", "/vol/tf_acc_volume/ACC-lun-size"),
 					resource.TestCheckResourceAttr("netapp-ontap_storage_lun_resource.example_size", "svm_name", "tf_acc_svm"),
 					resource.TestCheckResourceAttr("netapp-ontap_storage_lun_resource.example_size", "volume_name", "tf_acc_volume"),
 					resource.TestCheckResourceAttr("netapp-ontap_storage_lun_resource.example_size", "os_type", "linux"),
 					resource.TestCheckResourceAttr("netapp-ontap_storage_lun_resource.example_size", "size", "5"),
 					resource.TestCheckResourceAttr("netapp-ontap_storage_lun_resource.example_size", "size_unit", "kb"),
+					resource.TestCheckResourceAttr("netapp-ontap_storage_lun_resource.example_size", "scsi_thin_provisioning_support_enabled", "false"),
 				),
 			},
 			// update storage lun size_unit
 			{
-				Config: testAccStorageLunResourceWithSizeUnitConfigAlias("ACC-lun-size", "tf_acc_svm", "tf_acc_volume", "linux", 5, "mb"),
+				Config: testAccStorageLunResourceWithSizeUnitConfigAlias("ACC-lun-size", "tf_acc_svm", "tf_acc_volume", "linux", 5, "mb", true),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("netapp-ontap_storage_lun_resource.example_size", "name", "/vol/tf_acc_volume/ACC-lun-size"),
 					resource.TestCheckResourceAttr("netapp-ontap_storage_lun_resource.example_size", "svm_name", "tf_acc_svm"),
@@ -110,7 +112,7 @@ func testAccStorageLunResourceConfigAlias(logicalUnit string, svmname string, vo
 provider "netapp-ontap" {
  connection_profiles = [
     {
-      name = "cluster4"
+      name = "cluster5"
       hostname = "%s"
       username = "%s"
       password = "%s"
@@ -121,7 +123,7 @@ provider "netapp-ontap" {
 
 resource "netapp-ontap_storage_lun_resource" "example" {
   # required to know which system to interface with
-  cx_profile_name = "cluster4"
+  cx_profile_name = "cluster5"
   logical_unit = "%s"
   svm_name = "%s"
   volume_name = "%s"
@@ -130,7 +132,7 @@ resource "netapp-ontap_storage_lun_resource" "example" {
 }`, host, admin, password, logicalUnit, svmname, volumeName, osType, size)
 }
 
-func testAccStorageLunResourceWithSizeUnitConfigAlias(logicalUnit string, svmname string, volumeName string, osType string, size int64, size_unit string) string {
+func testAccStorageLunResourceWithSizeUnitConfigAlias(logicalUnit string, svmname string, volumeName string, osType string, size int64, sizeUnit string, spaceAllocation bool) string {
 	host := os.Getenv("TF_ACC_NETAPP_HOST")
 	admin := os.Getenv("TF_ACC_NETAPP_USER")
 	password := os.Getenv("TF_ACC_NETAPP_PASS")
@@ -142,7 +144,7 @@ func testAccStorageLunResourceWithSizeUnitConfigAlias(logicalUnit string, svmnam
 provider "netapp-ontap" {
  connection_profiles = [
     {
-      name = "cluster4"
+      name = "cluster5"
       hostname = "%s"
       username = "%s"
       password = "%s"
@@ -153,12 +155,13 @@ provider "netapp-ontap" {
 
 resource "netapp-ontap_storage_lun_resource" "example_size" {
   # required to know which system to interface with
-  cx_profile_name = "cluster4"
+  cx_profile_name = "cluster5"
   logical_unit = "%s"
   svm_name = "%s"
   volume_name = "%s"
   os_type = "%s"
   size = "%d"
   size_unit = "%s"
-}`, host, admin, password, logicalUnit, svmname, volumeName, osType, size, size_unit)
+  scsi_thin_provisioning_support_enabled = "%t"
+}`, host, admin, password, logicalUnit, svmname, volumeName, osType, size, sizeUnit, spaceAllocation)
 }

internal/provider/storage/storage_lun_resource_test.go

@@ -51,40 +51,42 @@ func TestAccStorageLunResouce(t *testing.T) {
 			{
 				ResourceName:  "netapp-ontap_lun.example",
 				ImportState:   true,
-				ImportStateId: fmt.Sprintf("%s,%s,%s,%s", "/vol/tf_acc_volume/tf_acc_lun", "tf_acc_volume", "tf_acc_svm", "cluster4"),
+				ImportStateId: fmt.Sprintf("%s,%s,%s,%s", "/vol/tf_acc_volume/tf_acc_lun", "tf_acc_volume", "tf_acc_svm", "cluster5"),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("netapp-ontap_lun.example", "name", "ACC-import-lun"),
+					resource.TestCheckResourceAttr("netapp-ontap_lun.example", "name", "tf_acc_lun"),
 					resource.TestCheckResourceAttr("netapp-ontap_lun.example", "os_type", "linux"),
 					resource.TestCheckResourceAttr("netapp-ontap_lun.example", "size", "1048576"),
 				),
 			},
 			// create storage lun with size_unit
 			{
-				Config: testAccStorageLunResourceWithSizeUnitConfig("ACC-lun-size", "tf_acc_svm", "tf_acc_volume", "linux", 4, "kb"),
+				Config: testAccStorageLunResourceWithSizeUnitConfig("ACC-lun-size", "tf_acc_svm", "tf_acc_volume", "linux", 4, "kb", true),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("netapp-ontap_lun.example_size", "name", "/vol/tf_acc_volume/ACC-lun-size"),
 					resource.TestCheckResourceAttr("netapp-ontap_lun.example_size", "svm_name", "tf_acc_svm"),
 					resource.TestCheckResourceAttr("netapp-ontap_lun.example_size", "volume_name", "tf_acc_volume"),
 					resource.TestCheckResourceAttr("netapp-ontap_lun.example_size", "os_type", "linux"),
 					resource.TestCheckResourceAttr("netapp-ontap_lun.example_size", "size", "4"),
 					resource.TestCheckResourceAttr("netapp-ontap_lun.example_size", "size_unit", "kb"),
+					resource.TestCheckResourceAttr("netapp-ontap_lun.example_size", "scsi_thin_provisioning_support_enabled", "true"),
 				),
 			},
 			// update storage lun with size_unit
 			{
-				Config: testAccStorageLunResourceWithSizeUnitConfig("ACC-lun-size", "tf_acc_svm", "tf_acc_volume", "linux", 5, "kb"),
+				Config: testAccStorageLunResourceWithSizeUnitConfig("ACC-lun-size", "tf_acc_svm", "tf_acc_volume", "linux", 5, "kb", false),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("netapp-ontap_lun.example_size", "name", "/vol/tf_acc_volume/ACC-lun-size"),
 					resource.TestCheckResourceAttr("netapp-ontap_lun.example_size", "svm_name", "tf_acc_svm"),
 					resource.TestCheckResourceAttr("netapp-ontap_lun.example_size", "volume_name", "tf_acc_volume"),
 					resource.TestCheckResourceAttr("netapp-ontap_lun.example_size", "os_type", "linux"),
 					resource.TestCheckResourceAttr("netapp-ontap_lun.example_size", "size", "5"),
 					resource.TestCheckResourceAttr("netapp-ontap_lun.example_size", "size_unit", "kb"),
+					resource.TestCheckResourceAttr("netapp-ontap_lun.example_size", "scsi_thin_provisioning_support_enabled", "false"),
 				),
 			},
 			// update storage lun size_unit
 			{
-				Config: testAccStorageLunResourceWithSizeUnitConfig("ACC-lun-size", "tf_acc_svm", "tf_acc_volume", "linux", 5, "mb"),
+				Config: testAccStorageLunResourceWithSizeUnitConfig("ACC-lun-size", "tf_acc_svm", "tf_acc_volume", "linux", 5, "mb", true),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("netapp-ontap_lun.example_size", "name", "/vol/tf_acc_volume/ACC-lun-size"),
 					resource.TestCheckResourceAttr("netapp-ontap_lun.example_size", "svm_name", "tf_acc_svm"),
@@ -110,7 +112,7 @@ func testAccStorageLunResourceConfig(logicalUnit string, svmname string, volumeN
 provider "netapp-ontap" {
  connection_profiles = [
     {
-      name = "cluster4"
+      name = "cluster5"
       hostname = "%s"
       username = "%s"
       password = "%s"
@@ -121,7 +123,7 @@ provider "netapp-ontap" {
 
 resource "netapp-ontap_lun" "example" {
   # required to know which system to interface with
-  cx_profile_name = "cluster4"
+  cx_profile_name = "cluster5"
   logical_unit = "%s"
   svm_name = "%s"
   volume_name = "%s"
@@ -130,7 +132,7 @@ resource "netapp-ontap_lun" "example" {
 }`, host, admin, password, logicalUnit, svmname, volumeName, osType, size)
 }
 
-func testAccStorageLunResourceWithSizeUnitConfig(logicalUnit string, svmname string, volumeName string, osType string, size int64, size_unit string) string {
+func testAccStorageLunResourceWithSizeUnitConfig(logicalUnit string, svmname string, volumeName string, osType string, size int64, sizeUnit string, spaceAllocation bool) string {
 	host := os.Getenv("TF_ACC_NETAPP_HOST")
 	admin := os.Getenv("TF_ACC_NETAPP_USER")
 	password := os.Getenv("TF_ACC_NETAPP_PASS")
@@ -142,7 +144,7 @@ func testAccStorageLunResourceWithSizeUnitConfig(logicalUnit string, svmname str
 provider "netapp-ontap" {
  connection_profiles = [
     {
-      name = "cluster4"
+      name = "cluster5"
       hostname = "%s"
       username = "%s"
       password = "%s"
@@ -153,12 +155,13 @@ provider "netapp-ontap" {
 
 resource "netapp-ontap_lun" "example_size" {
   # required to know which system to interface with
-  cx_profile_name = "cluster4"
+  cx_profile_name = "cluster5"
   logical_unit = "%s"
   svm_name = "%s"
   volume_name = "%s"
   os_type = "%s"
   size = "%d"
   size_unit = "%s"
-}`, host, admin, password, logicalUnit, svmname, volumeName, osType, size, size_unit)
+  scsi_thin_provisioning_support_enabled = "%t"
+}`, host, admin, password, logicalUnit, svmname, volumeName, osType, size, sizeUnit, spaceAllocation)
 }

internal/provider/storage/storage_luns_data_source.go

@@ -159,6 +159,10 @@ func (d *StorageLunsDataSource) Schema(ctx context.Context, req datasource.Schem
 									MarkdownDescription: "Used space of lun in bytes",
 									Computed:            true,
 								},
+								"scsi_thin_provisioning_support_enabled": schema.BoolAttribute{
+									MarkdownDescription: "Specifies the value for the space allocation attribute, which determines if the LUN supports the SCSI Thin Provisioning features",
+									Computed:            true,
+								},
 							},
 						},
 						"id": schema.StringAttribute{
@@ -244,8 +248,9 @@ func (d *StorageLunsDataSource) Read(ctx context.Context, req datasource.ReadReq
 				UUID: types.StringValue(record.QoSPolicy.UUID),
 			},
 			Space: &StorageLunDataSourceSpaceModel{
-				Size: types.Int64Value(record.Space.Size),
-				Used: types.Int64Value(record.Space.Used),
+				Size:       types.Int64Value(record.Space.Size),
+				Used:       types.Int64Value(record.Space.Used),
+				Allocation: types.BoolPointerValue(record.Space.Allocation),
 			},
 			ID: types.StringValue(record.UUID),
 		}