azurerm_netapp_volume - support NFSv4.1, vol sizing issue

azurerm/internal/services/netapp/client/client.go

@@ -1,7 +1,7 @@
 package client
 
 import (
- "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp"
+ "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp"
  "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
 )
 

azurerm/internal/services/netapp/data_source_netapp_volume.go

@@ -61,6 +61,12 @@ func dataSourceArmNetAppVolume() *schema.Resource {
  Type: schema.TypeInt,
  Computed: true,
  },
+
+ "protocols": {
+ Type: schema.TypeList,
+ Computed: true,
+ Elem: &schema.Schema{Type: schema.TypeString},
+ },
  },
  }
 }
@@ -101,6 +107,12 @@ func dataSourceArmNetAppVolumeRead(d *schema.ResourceData, meta interface{}) err
  d.Set("service_level", props.ServiceLevel)
  d.Set("subnet_id", props.SubnetID)
 
+ protocolTypes := make([]string, 0)
+ if prtclTypes := props.ProtocolTypes; prtclTypes != nil {
+ protocolTypes = append(protocolTypes, *prtclTypes...)
+ }
+ d.Set("protocols", protocolTypes)
+
  if props.UsageThreshold != nil {
  d.Set("storage_quota_in_gb", *props.UsageThreshold/1073741824)
  }

azurerm/internal/services/netapp/resource_arm_netapp_account.go

@@ -7,7 +7,7 @@ import (
  "strings"
  "time"
 
- "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp"
+ "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp"
  "github.com/hashicorp/go-azure-helpers/response"
  "github.com/hashicorp/terraform-plugin-sdk/helper/schema"
  "github.com/hashicorp/terraform-plugin-sdk/helper/validation"

azurerm/internal/services/netapp/resource_arm_netapp_pool.go

@@ -7,7 +7,7 @@ import (
  "strconv"
  "time"
 
- "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp"
+ "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp"
  "github.com/hashicorp/terraform-plugin-sdk/helper/resource"
  "github.com/hashicorp/terraform-plugin-sdk/helper/schema"
  "github.com/hashicorp/terraform-plugin-sdk/helper/validation"

azurerm/internal/services/netapp/resource_arm_netapp_snapshot.go

@@ -5,7 +5,7 @@ import (
  "log"
  "time"
 
- "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp"
+ "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp"
  "github.com/hashicorp/go-azure-helpers/response"
  "github.com/hashicorp/terraform-plugin-sdk/helper/schema"
  "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"

azurerm/internal/services/netapp/resource_arm_netapp_volume.go

@@ -8,7 +8,7 @@ import (
  "strings"
  "time"
 
- "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-06-01/netapp"
+ "github.com/Azure/azure-sdk-for-go/services/netapp/mgmt/2019-10-01/netapp"
  "github.com/hashicorp/terraform-plugin-sdk/helper/resource"
  "github.com/hashicorp/terraform-plugin-sdk/helper/schema"
  "github.com/hashicorp/terraform-plugin-sdk/helper/validation"
@@ -36,7 +36,7 @@ func resourceArmNetAppVolume() *schema.Resource {
  Create: schema.DefaultTimeout(30 * time.Minute),
  Read: schema.DefaultTimeout(5 * time.Minute),
  Update: schema.DefaultTimeout(30 * time.Minute),
- Delete: schema.DefaultTimeout(30 * time.Minute),
+ Delete: schema.DefaultTimeout(60 * time.Minute),
  },
 
  Schema: map[string]*schema.Schema{
@@ -75,6 +75,7 @@ func resourceArmNetAppVolume() *schema.Resource {
  "service_level": {
  Type: schema.TypeString,
  Required: true,
+ ForceNew: true,
  ValidateFunc: validation.StringInSlice([]string{
  string(netapp.Premium),
  string(netapp.Standard),
@@ -89,14 +90,28 @@ func resourceArmNetAppVolume() *schema.Resource {
  ValidateFunc: azure.ValidateResourceID,
  },
 
+ "protocols": {
+ Type: schema.TypeSet,
+ ForceNew: true,
+ Optional: true,
+ Computed: true,
+ MaxItems: 2,
+ Elem: &schema.Schema{Type: schema.TypeString,
+ ValidateFunc: validation.StringInSlice([]string{
+ "NFSv3",
+ "NFSv4.1",
+ "CIFS",
+ }, false)},
+ },
+
  "storage_quota_in_gb": {
  Type: schema.TypeInt,
  Required: true,
  ValidateFunc: validation.IntBetween(100, 4096),
  },
 
  "export_policy_rule": {
- Type: schema.TypeSet,
+ Type: schema.TypeList,
  Optional: true,
  MaxItems: 5,
  Elem: &schema.Resource{
@@ -106,6 +121,7 @@ func resourceArmNetAppVolume() *schema.Resource {
  Required: true,
  ValidateFunc: validation.IntBetween(1, 5),
  },
+
  "allowed_clients": {
  Type: schema.TypeSet,
  Required: true,
@@ -114,22 +130,47 @@ func resourceArmNetAppVolume() *schema.Resource {
  ValidateFunc: validate.CIDR,
  },
  },
+
+ "protocols_enabled": {
+ Type: schema.TypeList,
+ Optional: true,
+ Computed: true,
+ MaxItems: 1,
+ MinItems: 1,
+ Elem: &schema.Schema{Type: schema.TypeString,
+ ValidateFunc: validation.StringInSlice([]string{
+ "NFSv3",
+ "NFSv4.1",
+ "CIFS",
+ }, false)},
+ },
+
  "cifs_enabled": {
- Type: schema.TypeBool,
- Required: true,
+ Type: schema.TypeBool,
+ Optional: true,
+ Computed: true,
+ Deprecated: "Deprecated in favor of `protocols_enabled`",
  },
+
  "nfsv3_enabled": {
- Type: schema.TypeBool,
- Required: true,
+ Type: schema.TypeBool,
+ Optional: true,
+ Computed: true,
+ Deprecated: "Deprecated in favor of `protocols_enabled`",
  },
+
  "nfsv4_enabled": {
- Type: schema.TypeBool,
- Required: true,
+ Type: schema.TypeBool,
+ Optional: true,
+ Computed: true,
+ Deprecated: "Deprecated in favor of `protocols_enabled`",
  },
+
  "unix_read_only": {
  Type: schema.TypeBool,
  Optional: true,
  },
+
  "unix_read_write": {
  Type: schema.TypeBool,
  Optional: true,
@@ -167,15 +208,21 @@ func resourceArmNetAppVolumeCreateUpdate(d *schema.ResourceData, meta interface{
  volumePath := d.Get("volume_path").(string)
  serviceLevel := d.Get("service_level").(string)
  subnetId := d.Get("subnet_id").(string)
+ protocols := d.Get("protocols").(*schema.Set).List()
+ if len(protocols) == 0 {
+ protocols = append(protocols, "NFSv3")
+ }
+
  storageQuotaInGB := int64(d.Get("storage_quota_in_gb").(int) * 1073741824)
- exportPolicyRule := d.Get("export_policy_rule").(*schema.Set).List()
+ exportPolicyRule := d.Get("export_policy_rule").([]interface{})
 
  parameters := netapp.Volume{
  Location: utils.String(location),
  VolumeProperties: &netapp.VolumeProperties{
  CreationToken: utils.String(volumePath),
  ServiceLevel: netapp.ServiceLevel(serviceLevel),
  SubnetID: utils.String(subnetId),
+ ProtocolTypes: utils.ExpandStringSlice(protocols),
  UsageThreshold: utils.Int64(storageQuotaInGB),
  ExportPolicy: expandArmNetAppVolumeExportPolicyRule(exportPolicyRule),
  },
@@ -236,7 +283,7 @@ func resourceArmNetAppVolumeRead(d *schema.ResourceData, meta interface{}) error
  d.Set("volume_path", props.CreationToken)
  d.Set("service_level", props.ServiceLevel)
  d.Set("subnet_id", props.SubnetID)
-
+ d.Set("protocols", props.ProtocolTypes)
  if props.UsageThreshold != nil {
  d.Set("storage_quota_in_gb", *props.UsageThreshold/1073741824)
  }
@@ -310,17 +357,42 @@ func expandArmNetAppVolumeExportPolicyRule(input []interface{}) *netapp.VolumePr
  v := item.(map[string]interface{})
  ruleIndex := int32(v["rule_index"].(int))
  allowedClients := strings.Join(*utils.ExpandStringSlice(v["allowed_clients"].(*schema.Set).List()), ",")
- cifsEnabled := v["cifs_enabled"].(bool)
- nfsv3Enabled := v["nfsv3_enabled"].(bool)
- nfsv4Enabled := v["nfsv4_enabled"].(bool)
+
+ cifsEnabled := false
+ nfsv3Enabled := false
+ nfsv41Enabled := false
+
+ if vpe := v["protocols_enabled"]; vpe != nil {
+ protocolsEnabled := vpe.([]interface{})
+ if len(protocolsEnabled) != 0 {
+ for _, protocol := range protocolsEnabled {
+ if protocol != nil {
+ switch strings.ToLower(protocol.(string)) {
+ case "cifs":
+ cifsEnabled = true
+ case "nfsv3":
+ nfsv3Enabled = true
+ case "nfsv4.1":
+ nfsv41Enabled = true
+ }
+ }
+ }
+ } else {
+ // TODO: Remove in next major version
+ cifsEnabled = v["cifs_enabled"].(bool)
+ nfsv3Enabled = v["nfsv3_enabled"].(bool)
+ nfsv41Enabled = v["nfsv4_enabled"].(bool)
+ }
+ }
+
  unixReadOnly := v["unix_read_only"].(bool)
  unixReadWrite := v["unix_read_write"].(bool)
 
  result := netapp.ExportPolicyRule{
  AllowedClients: utils.String(allowedClients),
  Cifs: utils.Bool(cifsEnabled),
  Nfsv3: utils.Bool(nfsv3Enabled),
- Nfsv4:  utils.Bool(nfsv4Enabled),
+ Nfsv41: utils.Bool(nfsv41Enabled),
  RuleIndex: utils.Int32(ruleIndex),
  UnixReadOnly: utils.Bool(unixReadOnly),
  UnixReadWrite: utils.Bool(unixReadWrite),
@@ -350,17 +422,29 @@ func flattenArmNetAppVolumeExportPolicyRule(input *netapp.VolumePropertiesExport
  if v := item.AllowedClients; v != nil {
  allowedClients = strings.Split(*v, ",")
  }
+ //TODO: Start - Remove in next major version
  cifsEnabled := false
+ nfsv3Enabled := false
+ nfsv4Enabled := false
+ // End - Remove in next major version
+ protocolsEnabled := []string{}
  if v := item.Cifs; v != nil {
- cifsEnabled = *v
+ if *v {
+ protocolsEnabled = append(protocolsEnabled, "CIFS")
+ }
+ cifsEnabled = *v //TODO: Remove in next major version
  }
- nfsv3Enabled := false
  if v := item.Nfsv3; v != nil {
- nfsv3Enabled = *v
+ if *v {
+ protocolsEnabled = append(protocolsEnabled, "NFSv3")
+ }
+ nfsv3Enabled = *v //TODO: Remove in next major version
  }
- nfsv4Enabled := false
- if v := item.Nfsv4; v != nil {
- nfsv4Enabled = *v
+ if v := item.Nfsv41; v != nil {
+ if *v {
+ protocolsEnabled = append(protocolsEnabled, "NFSv4.1")
+ }
+ nfsv4Enabled = *v //TODO: Remove in next major version
  }
  unixReadOnly := false
  if v := item.UnixReadOnly; v != nil {
@@ -372,13 +456,15 @@ func flattenArmNetAppVolumeExportPolicyRule(input *netapp.VolumePropertiesExport
  }
 
  results = append(results, map[string]interface{}{
- "rule_index": ruleIndex,
- "allowed_clients": utils.FlattenStringSlice(&allowedClients),
- "cifs_enabled": cifsEnabled,
- "nfsv3_enabled": nfsv3Enabled,
- "nfsv4_enabled": nfsv4Enabled,
- "unix_read_only": unixReadOnly,
- "unix_read_write": unixReadWrite,
+ "rule_index": ruleIndex,
+ "allowed_clients": utils.FlattenStringSlice(&allowedClients),
+ "unix_read_only": unixReadOnly,
+ "unix_read_write": unixReadWrite,
+ "protocols_enabled": utils.FlattenStringSlice(&protocolsEnabled),
+ //TODO: Remove in next major version
+ "cifs_enabled": cifsEnabled,
+ "nfsv3_enabled": nfsv3Enabled,
+ "nfsv4_enabled": nfsv4Enabled,
  })
  }
 

azurerm/internal/services/netapp/tests/data_source_netapp_volume_test.go

@@ -22,6 +22,7 @@ func TestAccDataSourceAzureRMNetAppVolume_basic(t *testing.T) {
  resource.TestCheckResourceAttrSet(data.ResourceName, "service_level"),
  resource.TestCheckResourceAttrSet(data.ResourceName, "subnet_id"),
  resource.TestCheckResourceAttrSet(data.ResourceName, "storage_quota_in_gb"),
+ resource.TestCheckResourceAttrSet(data.ResourceName, "protocols.0"),
  ),
  },
  },

azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go

@@ -91,7 +91,7 @@ func TestAccAzureRMNetAppPool_update(t *testing.T) {
  Config: testAccAzureRMNetAppPool_basic(data),
  Check: resource.ComposeTestCheckFunc(
  testCheckAzureRMNetAppPoolExists(data.ResourceName),
- resource.TestCheckResourceAttr(data.ResourceName, "service_level", "Premium"),
+ resource.TestCheckResourceAttr(data.ResourceName, "service_level", "Standard"),
  resource.TestCheckResourceAttr(data.ResourceName, "size_in_tb", "4"),
  ),
  },
@@ -181,7 +181,7 @@ resource "azurerm_netapp_pool" "test" {
  account_name = azurerm_netapp_account.test.name
  location = azurerm_resource_group.test.location
  resource_group_name = azurerm_resource_group.test.name
- service_level = "Premium"
+ service_level = "Standard"
  size_in_tb = 4
 }
 `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger)

azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go

@@ -222,8 +222,10 @@ resource "azurerm_subnet" "update" {
  resource_group_name = azurerm_resource_group.test.name
  virtual_network_name = azurerm_virtual_network.update.name
  address_prefix = "10.0.2.0/24"
+
  delegation {
  name = "netapp"
+
  service_delegation {
  name = "Microsoft.Netapp/volumes"
  actions = ["Microsoft.Network/networkinterfaces/*", "Microsoft.Network/virtualNetworks/subnets/join/action"]