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

Create catalog renaming tests #992

Merged
merged 17 commits into from
Feb 15, 2023
Merged

Create catalog renaming tests #992

Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d4ae683
create catalog renaming tests
Feb 2, 2023
69ed17e
merge main
Feb 2, 2023
39e5af0
move rename to the last test step
Feb 3, 2023
0409050
new test created
Feb 6, 2023
9a6171f
improve renaming test
Feb 7, 2023
56c578d
fix staticcheck unused code warning
Feb 7, 2023
78583e8
improve rename test more
Feb 7, 2023
459d3e4
fix mistype
Feb 7, 2023
24a7cc9
remove leftovers from org_user test
Feb 7, 2023
89f96da
cache ids of vms, media file and vApp template
Feb 8, 2023
a1231df
fix duplicate cached ids
Feb 8, 2023
b884fb6
address comments
Feb 8, 2023
7c919c7
check if resources exist and are deleted properly
Feb 8, 2023
022f6b3
check for catalog existence earlier
Feb 8, 2023
f145c78
address comments
Feb 9, 2023
cecb38f
update changelog entry
Feb 15, 2023
69d9a80
update changelog entry
Feb 15, 2023
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
33 changes: 26 additions & 7 deletions vcd/resource_vcd_catalog_org_user_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ func TestAccVcdCatalogOrgUser(t *testing.T) {
testParamsNotEmpty(t, params)

configText := templateFill(testAccCatalogCreation, params)

params["FuncName"] = t.Name() + "-rename"
catalogUpdatedName := catalogName + "_updated"
params["CatalogName"] = catalogUpdatedName
renameText := templateFill(testAccCatalogCreation, params)

params["FuncName"] = t.Name() + "-access"
// Remove skip: the full script will run fine in binary tests
params["SkipNotice"] = " "
Expand All @@ -78,8 +84,8 @@ func TestAccVcdCatalogOrgUser(t *testing.T) {
resource.Test(t, resource.TestCase{
ProviderFactories: buildMultipleProviders(),
CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckCatalogEntityState("vcd_catalog", org1Name, catalogName, false),
testAccCheckCatalogEntityState("vcd_catalog", org2Name, catalogName, false),
testAccCheckCatalogEntityState("vcd_catalog", org1Name, catalogUpdatedName, false),
testAccCheckCatalogEntityState("vcd_catalog", org2Name, catalogUpdatedName, false),
),
Steps: []resource.TestStep{
// Test creation
Expand All @@ -106,24 +112,37 @@ func TestAccVcdCatalogOrgUser(t *testing.T) {
resource.TestCheckResourceAttrPair(resourceMedia1, "catalog_id", resourceCatalogOrg1, "id"),
),
},
{
Config: renameText,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(resourceCatalogOrg1, "name", catalogUpdatedName),
resource.TestCheckResourceAttr(resourceCatalogOrg1, "org", org1Name),
resource.TestCheckResourceAttr(resourceCatalogOrg1, "description", descriptionOrg1),
resource.TestCheckResourceAttr(resourceCatalogOrg2, "name", catalogUpdatedName),
resource.TestCheckResourceAttr(resourceCatalogOrg2, "org", org2Name),
resource.TestCheckResourceAttr(resourceCatalogOrg2, "description", descriptionOrg2),
resource.TestCheckResourceAttrPair(resourcevAppTemplate1, "catalog_id", resourceCatalogOrg1, "id"),
resource.TestCheckResourceAttrPair(resourceMedia1, "catalog_id", resourceCatalogOrg1, "id"),
),
},
{
Config: accessText,
Check: resource.ComposeTestCheckFunc(
logState("catalog-related-data-sources"),
resource.TestCheckResourceAttr(dataSourceCatalogOrg1, "name", catalogName),
resource.TestCheckResourceAttr(dataSourceCatalogOrg1, "name", catalogUpdatedName),
resource.TestCheckResourceAttr(dataSourceCatalogOrg1, "org", org1Name),
resource.TestCheckResourceAttr(dataSourceCatalogOrg1, "description", descriptionOrg1),
resource.TestCheckResourceAttr(dataSourceCatalogOrg2, "name", catalogName),
resource.TestCheckResourceAttr(dataSourceCatalogOrg2, "name", catalogUpdatedName),
resource.TestCheckResourceAttr(dataSourceCatalogOrg2, "org", org2Name),
resource.TestCheckResourceAttr(dataSourceCatalogOrg2, "description", descriptionOrg2),

resource.TestCheckResourceAttr("data.vcd_catalog.catalog_org1_from_org2", "name", catalogName),
resource.TestCheckResourceAttr("data.vcd_catalog.catalog_org1_from_org2", "name", catalogUpdatedName),
resource.TestCheckResourceAttr("data.vcd_catalog.catalog_org1_from_org2", "org", org1Name),
resource.TestCheckResourceAttr("data.vcd_catalog.catalog_org1_from_org2", "description", descriptionOrg1),
resource.TestCheckResourceAttr("data.vcd_catalog_media.test_media_by_catalog_name", "name", catalogMediaName),
resource.TestCheckResourceAttr("data.vcd_catalog_media.test_media_by_catalog_name", "org", org1Name),
resource.TestCheckResourceAttr("data.vcd_catalog_media.test_media_by_catalog_name", "catalog", catalogName),
resource.TestCheckResourceAttr("data.vcd_catalog_media.test_media_by_catalog_id", "catalog", catalogName),
resource.TestCheckResourceAttr("data.vcd_catalog_media.test_media_by_catalog_name", "catalog", catalogUpdatedName),
resource.TestCheckResourceAttr("data.vcd_catalog_media.test_media_by_catalog_id", "catalog", catalogUpdatedName),
resource.TestCheckResourceAttr("data.vcd_catalog_media.test_media_by_catalog_id", "description", descriptionOrg1),
resource.TestCheckResourceAttr("data.vcd_catalog_vapp_template.test_vapp_template1", "name", vappTemplateName),
resource.TestCheckResourceAttr("data.vcd_catalog_vapp_template.test_vapp_template1", "org", org1Name),
Expand Down