From 14bd5e1738838af6698c6f35e51637f55b1fbec2 Mon Sep 17 00:00:00 2001 From: Gaspard Micol Date: Tue, 13 Aug 2024 08:56:48 -0400 Subject: [PATCH] [ignore] Modify properties for fvDnsAttr. --- gen/definitions/properties.yaml | 3 ++- gen/testvars/fvDnsAttr.yaml | 3 +-- .../resource_aci_epg_useg_dns_attribute_test.go | 16 ++++------------ 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/gen/definitions/properties.yaml b/gen/definitions/properties.yaml index d4986d49e..ac1145f6c 100644 --- a/gen/definitions/properties.yaml +++ b/gen/definitions/properties.yaml @@ -586,11 +586,12 @@ fvDnsAttr: test_values: resource_required: name: "dns_attribute" - filter: "test_filter" datasource_required: name: "dns_attribute" datasource_non_existing: name: "dns_attribute_non_existing" + all: + filter: "test_filter" parents: - class_name: "fvCrtrn" parent_dependency: "fvAEPg" diff --git a/gen/testvars/fvDnsAttr.yaml b/gen/testvars/fvDnsAttr.yaml index 8e77966dc..da35bd0af 100644 --- a/gen/testvars/fvDnsAttr.yaml +++ b/gen/testvars/fvDnsAttr.yaml @@ -17,13 +17,12 @@ datasource_required: name: "dns_attribute" resource_required: - filter: "test_filter" name: "dns_attribute" all: annotation: "annotation" description: "description_1" - filter: "filter_1" + filter: "test_filter" name_alias: "name_alias_1" owner_key: "owner_key_1" owner_tag: "owner_tag_1" diff --git a/internal/provider/resource_aci_epg_useg_dns_attribute_test.go b/internal/provider/resource_aci_epg_useg_dns_attribute_test.go index 452c9ff12..ccbb9653e 100644 --- a/internal/provider/resource_aci_epg_useg_dns_attribute_test.go +++ b/internal/provider/resource_aci_epg_useg_dns_attribute_test.go @@ -109,7 +109,7 @@ func TestAccResourceFvDnsAttrWithFvCrtrn(t *testing.T) { resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "name", "dns_attribute"), resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "annotation", "annotation"), resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "description", "description_1"), - resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "filter", "filter_1"), + resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "filter", "test_filter"), resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "name_alias", "name_alias_1"), resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "owner_key", "owner_key_1"), resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "owner_tag", "owner_tag_1"), @@ -120,7 +120,6 @@ func TestAccResourceFvDnsAttrWithFvCrtrn(t *testing.T) { Config: testConfigFvDnsAttrMinDependencyWithFvCrtrn, ExpectNonEmptyPlan: false, Check: resource.ComposeAggregateTestCheckFunc( - resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "filter", "test_filter"), resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "name", "dns_attribute"), ), }, @@ -129,10 +128,10 @@ func TestAccResourceFvDnsAttrWithFvCrtrn(t *testing.T) { Config: testConfigFvDnsAttrResetDependencyWithFvCrtrn, ExpectNonEmptyPlan: false, Check: resource.ComposeAggregateTestCheckFunc( - resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "filter", "test_filter"), resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "name", "dns_attribute"), resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "annotation", "orchestrator:terraform"), resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "description", ""), + resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "filter", ""), resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "name_alias", ""), resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "owner_key", ""), resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "owner_tag", ""), @@ -149,10 +148,10 @@ func TestAccResourceFvDnsAttrWithFvCrtrn(t *testing.T) { Config: testConfigFvDnsAttrChildrenDependencyWithFvCrtrn, ExpectNonEmptyPlan: false, Check: resource.ComposeAggregateTestCheckFunc( - resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "filter", "test_filter"), resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "name", "dns_attribute"), resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "annotation", "orchestrator:terraform"), resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "description", ""), + resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "filter", ""), resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "name_alias", ""), resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "owner_key", ""), resource.TestCheckResourceAttr("aci_epg_useg_dns_attribute.test", "owner_tag", ""), @@ -218,12 +217,10 @@ func TestAccResourceFvDnsAttrWithFvCrtrn(t *testing.T) { const testConfigFvDnsAttrMinDependencyWithFvCrtrnAllowExisting = testConfigFvCrtrnMinDependencyWithFvAEPg + ` resource "aci_epg_useg_dns_attribute" "allow_test" { parent_dn = aci_epg_useg_block_statement.test.id - filter = "test_filter" name = "dns_attribute" } resource "aci_epg_useg_dns_attribute" "allow_test_2" { parent_dn = aci_epg_useg_block_statement.test.id - filter = "test_filter" name = "dns_attribute" depends_on = [aci_epg_useg_dns_attribute.allow_test] } @@ -232,7 +229,6 @@ resource "aci_epg_useg_dns_attribute" "allow_test_2" { const testConfigFvDnsAttrMinDependencyWithFvCrtrn = testConfigFvCrtrnMinDependencyWithFvAEPg + ` resource "aci_epg_useg_dns_attribute" "test" { parent_dn = aci_epg_useg_block_statement.test.id - filter = "test_filter" name = "dns_attribute" } ` @@ -243,7 +239,7 @@ resource "aci_epg_useg_dns_attribute" "test" { name = "dns_attribute" annotation = "annotation" description = "description_1" - filter = "filter_1" + filter = "test_filter" name_alias = "name_alias_1" owner_key = "owner_key_1" owner_tag = "owner_tag_1" @@ -265,7 +261,6 @@ resource "aci_epg_useg_dns_attribute" "test" { const testConfigFvDnsAttrChildrenDependencyWithFvCrtrn = testConfigFvCrtrnMinDependencyWithFvAEPg + ` resource "aci_epg_useg_dns_attribute" "test" { parent_dn = aci_epg_useg_block_statement.test.id - filter = "test_filter" name = "dns_attribute" annotations = [ { @@ -293,7 +288,6 @@ resource "aci_epg_useg_dns_attribute" "test" { const testConfigFvDnsAttrChildrenRemoveFromConfigDependencyWithFvCrtrn = testConfigFvCrtrnMinDependencyWithFvAEPg + ` resource "aci_epg_useg_dns_attribute" "test" { parent_dn = aci_epg_useg_block_statement.test.id - filter = "test_filter" name = "dns_attribute" } ` @@ -301,7 +295,6 @@ resource "aci_epg_useg_dns_attribute" "test" { const testConfigFvDnsAttrChildrenRemoveOneDependencyWithFvCrtrn = testConfigFvCrtrnMinDependencyWithFvAEPg + ` resource "aci_epg_useg_dns_attribute" "test" { parent_dn = aci_epg_useg_block_statement.test.id - filter = "test_filter" name = "dns_attribute" annotations = [ { @@ -321,7 +314,6 @@ resource "aci_epg_useg_dns_attribute" "test" { const testConfigFvDnsAttrChildrenRemoveAllDependencyWithFvCrtrn = testConfigFvCrtrnMinDependencyWithFvAEPg + ` resource "aci_epg_useg_dns_attribute" "test" { parent_dn = aci_epg_useg_block_statement.test.id - filter = "test_filter" name = "dns_attribute" annotations = [] tags = []