Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding PreReqs for AccessZone, NfsZoneSettings and SmbShareSettings ATs #270

Merged
merged 5 commits into from
Dec 23, 2024
Merged

Adding PreReqs for AccessZone, NfsZoneSettings and SmbShareSettings ATs #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2befcfb
Adding Access Zone PreReq for access zone Ds, Nfs zone settings Rs an…
akshay-sripriya Dec 12, 2024
19af7d4
Updated Prereq data
akshay-sripriya Dec 13, 2024
7c9b38d
fixed test order for Nfs zone settings
akshay-sripriya Dec 17, 2024
7ebebd0
Adding PreReqs for AccessZone AT
akshay-sripriya Dec 18, 2024
be3fd06
Fixed AccessZone PreReqs
akshay-sripriya Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions powerscale/provider/access_zone_datasource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ import (
"context"
powerscale "dell/powerscale-go-client"
"fmt"
"github.com/hashicorp/terraform-plugin-testing/terraform"
"github.com/stretchr/testify/assert"
"regexp"
"terraform-provider-powerscale/powerscale/helper"
"testing"

"github.com/hashicorp/terraform-plugin-testing/terraform"
"github.com/stretchr/testify/assert"

"github.com/bytedance/mockey"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
)
Expand Down Expand Up @@ -140,34 +141,40 @@ func TestQueryZoneNameByID(t *testing.T) {
assert.Equal(t, "Zone0", name)
}

var AzDataSourceConfig = `
var AzDataSourceConfig = tfaccAccessZoneConfig + `
data "powerscale_accesszone" "test" {
filter {
names = ["tfaccAccessZone"]
}

depends_on = [powerscale_accesszone.tfaccAccessZone]
}
output "powerscale_accesszone" {
value = data.powerscale_accesszone.test
}
`

var AzDataSourceConfigErr = `
var AzDataSourceConfigErr = tfaccAccessZoneConfig + `
data "powerscale_accesszone" "test" {
filter {
names = ["BadName"]
}

depends_on = [powerscale_accesszone.tfaccAccessZone]
}
output "powerscale_accesszone" {
value = data.powerscale_accesszone.test
}
`

var AzDataSourceConfigErrFilter = `
var AzDataSourceConfigErrFilter = tfaccAccessZoneConfig + `
data "powerscale_accesszone" "test" {
filter {
names = ["BadName"]
invalidFilter = "badFilter"
}

depends_on = [powerscale_accesszone.tfaccAccessZone]
}
output "powerscale_accesszone" {
value = data.powerscale_accesszone.test
Expand Down
27 changes: 26 additions & 1 deletion powerscale/provider/access_zone_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ func TestAccAccessZoneResourceGetImportSpecificErr(t *testing.T) {
},
{
PreConfig: func() {
mocker = mockey.Mock(helper.GetSpecificZone).Return(nil, fmt.Errorf("access zone read specific mock error")).Build()
FunctionMocker = mockey.Mock(helper.GetSpecificZone).Return(nil, fmt.Errorf("access zone read specific mock error")).Build()
},
ResourceName: accessZoneResourceName,
ImportState: true,
Expand All @@ -270,6 +270,19 @@ func TestAccAccessZoneResourceGetImportSpecificErr(t *testing.T) {
})
}

var tfaccAccessZoneConfig = `
resource "powerscale_accesszone" "tfaccAccessZone" {
# Required fields
name = "tfaccAccessZone"
groupnet = "groupnet0"
path = "/ifs"

# Optional to apply Auth Providers

custom_auth_providers = ["lsa-file-provider:System", "lsa-local-provider:System"]
}
`

var AccessZoneResourceConfig = `
resource "powerscale_accesszone" "zone" {
# Required fields
Expand Down Expand Up @@ -328,6 +341,18 @@ resource "powerscale_accesszone" "zone" {
# Optional to apply Auth Providers
custom_auth_providers = ["System"]
}

resource "powerscale_accesszone" "zoneCopy" {
# Required fields
name = "tfaccAccessZoneError"
groupnet = "groupnet0"
path = "/ifs"

# Optional to apply Auth Providers
custom_auth_providers = ["System"]

depends_on = [powerscale_accesszone.zone]
}
`
var AccessZoneUpdateResourceConfigError = `
resource "powerscale_accesszone" "zone" {
Expand Down
45 changes: 22 additions & 23 deletions powerscale/provider/nfs_zone_settings_datasource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,29 +73,6 @@ func TestAccNfsZoneSettingsDataSourceReadWithFilter(t *testing.T) {
})
}

func TestAccNfsZoneSettingsDataSourceReadWithEmptyFilter(t *testing.T) {
dataSourceName := "data.powerscale_nfs_zone_settings.empty"
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
// read testing
{
Config: ProviderConfig + nfsZoneSettingsDataSourceConfigWithEmptyFilter,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttrSet(dataSourceName, "id"),
resource.TestCheckResourceAttrSet(dataSourceName, "nfs_zone_settings.nfsv4_no_domain"),
resource.TestCheckResourceAttrSet(dataSourceName, "nfs_zone_settings.nfsv4_no_domain_uids"),
resource.TestCheckResourceAttrSet(dataSourceName, "nfs_zone_settings.nfsv4_allow_numeric_ids"),
resource.TestCheckResourceAttrSet(dataSourceName, "nfs_zone_settings.nfsv4_no_names"),
resource.TestCheckResourceAttrSet(dataSourceName, "nfs_zone_settings.nfsv4_replace_domain"),
resource.TestCheckResourceAttrSet(dataSourceName, "nfs_zone_settings.nfsv4_domain"),
),
},
},
})
}

func TestAccNfsZoneSettingsDataSourceReadMockErr(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -121,6 +98,28 @@ func TestAccNfsZoneSettingsDataSourceReadMockErr(t *testing.T) {
},
})
}
func TestAccNfsZoneSettingsDataSourceReadEmptyFilter(t *testing.T) {
dataSourceName := "data.powerscale_nfs_zone_settings.empty"
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
// read testing
{
Config: ProviderConfig + nfsZoneSettingsDataSourceConfigWithEmptyFilter,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttrSet(dataSourceName, "id"),
resource.TestCheckResourceAttrSet(dataSourceName, "nfs_zone_settings.nfsv4_no_domain"),
resource.TestCheckResourceAttrSet(dataSourceName, "nfs_zone_settings.nfsv4_no_domain_uids"),
resource.TestCheckResourceAttrSet(dataSourceName, "nfs_zone_settings.nfsv4_allow_numeric_ids"),
resource.TestCheckResourceAttrSet(dataSourceName, "nfs_zone_settings.nfsv4_no_names"),
resource.TestCheckResourceAttrSet(dataSourceName, "nfs_zone_settings.nfsv4_replace_domain"),
resource.TestCheckResourceAttrSet(dataSourceName, "nfs_zone_settings.nfsv4_domain"),
),
},
},
})
}

var nfsZoneSettingsDataSourceConfigWithoutFilter = `
data "powerscale_nfs_zone_settings" "all" {
Expand Down
12 changes: 9 additions & 3 deletions powerscale/provider/nfs_zone_settings_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,20 +256,24 @@ func TestAccNfsZoneSettingsImportMockErr(t *testing.T) {
})
}

var nfsZoneSettingsResourceConfigBasic = `
var nfsZoneSettingsResourceConfigBasic = tfaccAccessZoneConfig + `
resource "powerscale_nfs_zone_settings" "example" {
zone = "tfaccAccessZone"

depends_on = [powerscale_accesszone.tfaccAccessZone]
}
`

var nfsZoneSettingsResourceConfigNewDomain = `
var nfsZoneSettingsResourceConfigNewDomain = tfaccAccessZoneConfig + `
resource "powerscale_nfs_zone_settings" "example" {
zone = "tfaccAccessZone"
nfsv4_domain = "localdomain_New"

depends_on = [powerscale_accesszone.tfaccAccessZone]
}
`

var nfsZoneSettingsResourceConfigUpdatedDomain = `
var nfsZoneSettingsResourceConfigUpdatedDomain = tfaccAccessZoneConfig + `
resource "powerscale_nfs_zone_settings" "example" {
zone = "tfaccAccessZone"
nfsv4_no_names = false
Expand All @@ -278,5 +282,7 @@ resource "powerscale_nfs_zone_settings" "example" {
nfsv4_domain = "localdomain_Updated"
nfsv4_no_domain = false
nfsv4_no_domain_uids = true

depends_on = [powerscale_accesszone.tfaccAccessZone]
}
`
4 changes: 3 additions & 1 deletion powerscale/provider/smb_share_settings_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,12 +279,14 @@ access_based_enumeration = false
zone = "System"
}
`
var SmbShareSettingsUpdatedResourceConfig = `
var SmbShareSettingsUpdatedResourceConfig = tfaccAccessZoneConfig + `
resource "powerscale_smb_share_settings" "share_settings_test" {
access_based_enumeration = true
access_based_enumeration_root_only = true
allow_delete_readonly = false
ca_timeout = 60
zone = "tfaccAccessZone"

depends_on = [powerscale_accesszone.tfaccAccessZone]
}
`
Loading