diff --git a/aci/resource_aci_fvbd.go b/aci/resource_aci_fvbd.go index 26d5455a5..e718e5424 100644 --- a/aci/resource_aci_fvbd.go +++ b/aci/resource_aci_fvbd.go @@ -234,7 +234,7 @@ func resourceAciBridgeDomain() *schema.Resource { Optional: true, }, "relation_fv_rs_mldsn": &schema.Schema{ - Type: schema.TypeString, + Type: schema.TypeString, Optional: true, }, @@ -244,7 +244,7 @@ func resourceAciBridgeDomain() *schema.Resource { Optional: true, }, "relation_fv_rs_bd_to_nd_p": &schema.Schema{ - Type: schema.TypeString, + Type: schema.TypeString, Optional: true, }, @@ -265,7 +265,7 @@ func resourceAciBridgeDomain() *schema.Resource { Optional: true, }, "relation_fv_rs_ctx": &schema.Schema{ - Type: schema.TypeString, + Type: schema.TypeString, Optional: true, }, @@ -286,12 +286,12 @@ func resourceAciBridgeDomain() *schema.Resource { }, }, "relation_fv_rs_igmpsn": &schema.Schema{ - Type: schema.TypeString, + Type: schema.TypeString, Optional: true, }, "relation_fv_rs_bd_to_ep_ret": &schema.Schema{ - Type: schema.TypeString, + Type: schema.TypeString, Optional: true, }, @@ -338,7 +338,11 @@ func setBridgeDomainAttributes(fvBD *models.BridgeDomain, d *schema.ResourceData d.Set("annotation", fvBDMap["annotation"]) d.Set("arp_flood", fvBDMap["arpFlood"]) d.Set("ep_clear", fvBDMap["epClear"]) - d.Set("ep_move_detect_mode", fvBDMap["epMoveDetectMode"]) + if fvBDMap["epMoveDetectMode"] == "" { + d.Set("ep_move_detect_mode", "disable") + } else { + d.Set("ep_move_detect_mode", fvBDMap["epMoveDetectMode"]) + } d.Set("host_based_routing", fvBDMap["hostBasedRouting"]) d.Set("intersite_bum_traffic_allow", fvBDMap["intersiteBumTrafficAllow"]) d.Set("intersite_l2_stretch", fvBDMap["intersiteL2Stretch"]) diff --git a/aci/resource_aci_fvesg.go b/aci/resource_aci_fvesg.go index b16d748b2..b72c066b4 100644 --- a/aci/resource_aci_fvesg.go +++ b/aci/resource_aci_fvesg.go @@ -205,13 +205,13 @@ func setEndpointSecurityGroupAttributes(fvESg *models.EndpointSecurityGroup, d * return d, err } d.Set("annotation", fvESgMap["annotation"]) - d.Set("flood_on_encap", fvESgMap["floodOnEncap"]) + d.Set("match_t", fvESgMap["matchT"]) d.Set("name", fvESgMap["name"]) d.Set("application_profile_dn", GetParentDn(fvESg.DistinguishedName, fmt.Sprintf("/esg-%s", fvESgMap["name"]))) d.Set("pc_enf_pref", fvESgMap["pcEnfPref"]) d.Set("pref_gr_memb", fvESgMap["prefGrMemb"]) - d.Set("prio", fvESgMap["prio"]) + d.Set("name_alias", fvESgMap["nameAlias"]) return d, nil } @@ -251,10 +251,6 @@ func resourceAciEndpointSecurityGroupCreate(ctx context.Context, d *schema.Resou fvESgAttr.Annotation = "{}" } - if FloodOnEncap, ok := d.GetOk("flood_on_encap"); ok { - fvESgAttr.FloodOnEncap = FloodOnEncap.(string) - } - if MatchT, ok := d.GetOk("match_t"); ok { fvESgAttr.MatchT = MatchT.(string) } @@ -271,9 +267,6 @@ func resourceAciEndpointSecurityGroupCreate(ctx context.Context, d *schema.Resou fvESgAttr.PrefGrMemb = PrefGrMemb.(string) } - if Prio, ok := d.GetOk("prio"); ok { - fvESgAttr.Prio = Prio.(string) - } fvESg := models.NewEndpointSecurityGroup(fmt.Sprintf("esg-%s", name), ApplicationProfileDn, desc, nameAlias, fvESgAttr) err := aciClient.Save(fvESg) @@ -450,10 +443,6 @@ func resourceAciEndpointSecurityGroupUpdate(ctx context.Context, d *schema.Resou fvESgAttr.Annotation = "{}" } - if FloodOnEncap, ok := d.GetOk("flood_on_encap"); ok { - fvESgAttr.FloodOnEncap = FloodOnEncap.(string) - } - if MatchT, ok := d.GetOk("match_t"); ok { fvESgAttr.MatchT = MatchT.(string) } @@ -470,9 +459,6 @@ func resourceAciEndpointSecurityGroupUpdate(ctx context.Context, d *schema.Resou fvESgAttr.PrefGrMemb = PrefGrMemb.(string) } - if Prio, ok := d.GetOk("prio"); ok { - fvESgAttr.Prio = Prio.(string) - } fvESg := models.NewEndpointSecurityGroup(fmt.Sprintf("esg-%s", name), ApplicationProfileDn, desc, nameAlias, fvESgAttr) fvESg.Status = "modified" diff --git a/testacc/data_source_aci_fvesg_test.go b/testacc/data_source_aci_fvesg_test.go index 8eb3f2060..3e224242d 100644 --- a/testacc/data_source_aci_fvesg_test.go +++ b/testacc/data_source_aci_fvesg_test.go @@ -36,11 +36,9 @@ func TestAccAciEndpointSecurityGroupDataSource_Basic(t *testing.T) { resource.TestCheckResourceAttrPair(dataSourceName, "annotation", resourceName, "annotation"), resource.TestCheckResourceAttrPair(dataSourceName, "description", resourceName, "description"), resource.TestCheckResourceAttrPair(dataSourceName, "name_alias", resourceName, "name_alias"), - resource.TestCheckResourceAttrPair(dataSourceName, "flood_on_encap", resourceName, "flood_on_encap"), resource.TestCheckResourceAttrPair(dataSourceName, "match_t", resourceName, "match_t"), resource.TestCheckResourceAttrPair(dataSourceName, "pc_enf_pref", resourceName, "pc_enf_pref"), resource.TestCheckResourceAttrPair(dataSourceName, "pref_gr_memb", resourceName, "pref_gr_memb"), - resource.TestCheckResourceAttrPair(dataSourceName, "prio", resourceName, "prio"), ), }, { diff --git a/testacc/resource_aci_fvany_test.go b/testacc/resource_aci_fvany_test.go index 3d5ea1205..dec9f2073 100644 --- a/testacc/resource_aci_fvany_test.go +++ b/testacc/resource_aci_fvany_test.go @@ -66,7 +66,7 @@ func TestAccAciAny_Basic(t *testing.T) { ), }, { - Config: CreateAccAnyConfigUpdateWithoutVRFdn(rName), + Config: CreateAccAnyConfigUpdateWithoutVRFdn(), ExpectError: regexp.MustCompile(`Missing required argument`), }, { @@ -315,7 +315,7 @@ func CreateAccAnyWithoutVRFdn(rName string) string { `, rName, rName) return resource } -func CreateAccAnyConfigUpdateWithoutVRFdn(rName string) string { +func CreateAccAnyConfigUpdateWithoutVRFdn() string { fmt.Println("=== STEP Basic: testing any update without required argument") resource := fmt.Sprintln(` resource "aci_any" "test" { @@ -325,7 +325,7 @@ func CreateAccAnyConfigUpdateWithoutVRFdn(rName string) string { name_alias = "alias_any" pref_gr_memb = "enabled" } - `, rName, rName) + `) return resource } func CreateAccAnyConfigWithAnotherVRFdn(rName, rOther string) string { @@ -361,7 +361,7 @@ func CreateAccAnyConfigWithInvaliVRFdn(rName string) string { return resource } func CreateAccAnyConfig(rName string) string { - fmt.Println("=== STEP testing any creation with required argument") + fmt.Println("=== STEP testing any creation with required argument") resource := fmt.Sprintf(` resource "aci_tenant" "test" { name = "%s" diff --git a/testacc/resource_aci_fvbd_test.go b/testacc/resource_aci_fvbd_test.go index 88318d98c..e43b0a2e1 100644 --- a/testacc/resource_aci_fvbd_test.go +++ b/testacc/resource_aci_fvbd_test.go @@ -43,7 +43,7 @@ func TestAccAciBridgeDomain_Basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "annotation", "orchestrator:terraform"), resource.TestCheckResourceAttr(resourceName, "arp_flood", "no"), resource.TestCheckResourceAttr(resourceName, "ep_clear", "no"), - //resource.TestCheckResourceAttr(resourceName, "ep_move_detect_mode", ""), no need to check these parameter for now will look into it in regression testing + resource.TestCheckResourceAttr(resourceName, "ep_move_detect_mode", "disable"), resource.TestCheckResourceAttr(resourceName, "host_based_routing", "no"), resource.TestCheckResourceAttr(resourceName, "intersite_bum_traffic_allow", "no"), resource.TestCheckResourceAttr(resourceName, "intersite_l2_stretch", "no"), @@ -79,7 +79,7 @@ func TestAccAciBridgeDomain_Basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "annotation", "test_annotation"), resource.TestCheckResourceAttr(resourceName, "arp_flood", "yes"), resource.TestCheckResourceAttr(resourceName, "ep_clear", "yes"), - //resource.TestCheckResourceAttr(resourceName, "ep_move_detect_mode", ""), + resource.TestCheckResourceAttr(resourceName, "ep_move_detect_mode", "garp"), resource.TestCheckResourceAttr(resourceName, "host_based_routing", "yes"), resource.TestCheckResourceAttr(resourceName, "intersite_bum_traffic_allow", "yes"), resource.TestCheckResourceAttr(resourceName, "intersite_l2_stretch", "yes"), @@ -516,7 +516,7 @@ func CreateAccBridgeDomainRelConfigFinal(rName, relName1, relName2 string) strin } func CreateAccBridgeDomainRelConfigInitial(rName, relName string) string { - fmt.Println("=== STEP testing bridge domain with final relational parameters") + fmt.Println("=== STEP testing bridge domain with initial relational parameters") resource := fmt.Sprintf(` resource "aci_tenant" "test" { name = "%s" @@ -641,6 +641,7 @@ func CreateAccBridgeDomainConfigWithOptionalValues(rName string) string { arp_flood= "yes" description= "test_desc" ep_clear="yes" + ep_move_detect_mode = "garp" host_based_routing="yes" intersite_bum_traffic_allow="yes" intersite_l2_stretch="yes" diff --git a/testacc/resource_aci_fvesg_test.go b/testacc/resource_aci_fvesg_test.go index 24d32dd76..c8abc752a 100644 --- a/testacc/resource_aci_fvesg_test.go +++ b/testacc/resource_aci_fvesg_test.go @@ -40,13 +40,11 @@ func TestAccAciEndpointSecurityGroup_Basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "annotation", "orchestrator:terraform"), resource.TestCheckResourceAttr(resourceName, "application_profile_dn", fmt.Sprintf("uni/tn-%s/ap-%s", rName, rName)), resource.TestCheckResourceAttr(resourceName, "description", ""), - resource.TestCheckResourceAttr(resourceName, "flood_on_encap", "disabled"), resource.TestCheckResourceAttr(resourceName, "match_t", "AtleastOne"), resource.TestCheckResourceAttr(resourceName, "name", rName), resource.TestCheckResourceAttr(resourceName, "name_alias", ""), resource.TestCheckResourceAttr(resourceName, "pc_enf_pref", "unenforced"), resource.TestCheckResourceAttr(resourceName, "pref_gr_memb", "exclude"), - resource.TestCheckResourceAttr(resourceName, "prio", "unspecified"), resource.TestCheckResourceAttr(resourceName, "relation_fv_rs_cons.#", "0"), resource.TestCheckResourceAttr(resourceName, "relation_fv_rs_cons_if.#", "0"), resource.TestCheckResourceAttr(resourceName, "relation_fv_rs_prov.#", "0"), @@ -59,13 +57,11 @@ func TestAccAciEndpointSecurityGroup_Basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "annotation", "test_annotation"), resource.TestCheckResourceAttr(resourceName, "application_profile_dn", fmt.Sprintf("uni/tn-%s/ap-%s", rName, rName)), resource.TestCheckResourceAttr(resourceName, "description", "test_description"), - resource.TestCheckResourceAttr(resourceName, "flood_on_encap", "enabled"), resource.TestCheckResourceAttr(resourceName, "match_t", "All"), resource.TestCheckResourceAttr(resourceName, "name", rName), resource.TestCheckResourceAttr(resourceName, "name_alias", "test_name_alias"), resource.TestCheckResourceAttr(resourceName, "pc_enf_pref", "enforced"), resource.TestCheckResourceAttr(resourceName, "pref_gr_memb", "include"), - resource.TestCheckResourceAttr(resourceName, "prio", "level1"), resource.TestCheckResourceAttr(resourceName, "relation_fv_rs_cons.#", "0"), resource.TestCheckResourceAttr(resourceName, "relation_fv_rs_cons_if.#", "0"), resource.TestCheckResourceAttr(resourceName, "relation_fv_rs_intra_epg.#", "0"), @@ -137,46 +133,6 @@ func TestAccAciEndpointSecurityGroup_Update(t *testing.T) { testAccCheckAciEndpointSecurityGroupIdEqual(&esg_default, &esg_updated), ), }, - { - Config: CreateAccEndpointSecurityGroupConfigWithUpdatedAttr(rName, "prio", "level2"), - Check: resource.ComposeTestCheckFunc( - testAccCheckAciEndpointSecurityGroupExists(resourceName, &esg_updated), - resource.TestCheckResourceAttr(resourceName, "prio", "level2"), - testAccCheckAciEndpointSecurityGroupIdEqual(&esg_default, &esg_updated), - ), - }, - { - Config: CreateAccEndpointSecurityGroupConfigWithUpdatedAttr(rName, "prio", "level3"), - Check: resource.ComposeTestCheckFunc( - testAccCheckAciEndpointSecurityGroupExists(resourceName, &esg_updated), - resource.TestCheckResourceAttr(resourceName, "prio", "level3"), - testAccCheckAciEndpointSecurityGroupIdEqual(&esg_default, &esg_updated), - ), - }, - { - Config: CreateAccEndpointSecurityGroupConfigWithUpdatedAttr(rName, "prio", "level4"), - Check: resource.ComposeTestCheckFunc( - testAccCheckAciEndpointSecurityGroupExists(resourceName, &esg_updated), - resource.TestCheckResourceAttr(resourceName, "prio", "level4"), - testAccCheckAciEndpointSecurityGroupIdEqual(&esg_default, &esg_updated), - ), - }, - { - Config: CreateAccEndpointSecurityGroupConfigWithUpdatedAttr(rName, "prio", "level5"), - Check: resource.ComposeTestCheckFunc( - testAccCheckAciEndpointSecurityGroupExists(resourceName, &esg_updated), - resource.TestCheckResourceAttr(resourceName, "prio", "level5"), - testAccCheckAciEndpointSecurityGroupIdEqual(&esg_default, &esg_updated), - ), - }, - { - Config: CreateAccEndpointSecurityGroupConfigWithUpdatedAttr(rName, "prio", "level6"), - Check: resource.ComposeTestCheckFunc( - testAccCheckAciEndpointSecurityGroupExists(resourceName, &esg_updated), - resource.TestCheckResourceAttr(resourceName, "prio", "level6"), - testAccCheckAciEndpointSecurityGroupIdEqual(&esg_default, &esg_updated), - ), - }, }, }) } @@ -211,10 +167,6 @@ func TestAccAciEndpointSecurityGroup_NegativeCases(t *testing.T) { Config: CreateAccEndpointSecurityGroupConfigWithUpdatedAttr(rName, "name_alias", longNameAlias), ExpectError: regexp.MustCompile(`property nameAlias of (.)+ failed validation for value '(.)+'`), }, - { - Config: CreateAccEndpointSecurityGroupConfigWithUpdatedAttr(rName, "flood_on_encap", randomValue), - ExpectError: regexp.MustCompile(`expected flood_on_encap to be one of (.)+, got (.)+`), - }, { Config: CreateAccEndpointSecurityGroupConfigWithUpdatedAttr(rName, "match_t", randomValue), ExpectError: regexp.MustCompile(`expected match_t to be one of (.)+, got (.)+`), @@ -227,10 +179,6 @@ func TestAccAciEndpointSecurityGroup_NegativeCases(t *testing.T) { Config: CreateAccEndpointSecurityGroupConfigWithUpdatedAttr(rName, "pref_gr_memb", randomValue), ExpectError: regexp.MustCompile(`expected pref_gr_memb to be one of (.)+, got (.)+`), }, - { - Config: CreateAccEndpointSecurityGroupConfigWithUpdatedAttr(rName, "prio", randomValue), - ExpectError: regexp.MustCompile(`expected prio to be one of (.)+, got (.)+`), - }, { Config: CreateAccEndpointSecurityGroupConfigWithUpdatedAttr(rName, randomParameter, randomValue), ExpectError: regexp.MustCompile(`An argument named (.)+ is not expected here.`), @@ -336,12 +284,10 @@ func CreateAccEndpointSecurityGroupConfigWithParentAndName(prName, rName string) application_profile_dn = aci_application_profile.test.id annotation = "test_annotation" description = "test_description" - flood_on_encap = "enabled" match_t = "All" name_alias = "test_name_alias" pc_enf_pref = "enforced" pref_gr_memb = "include" - prio = "level1" } `, prName, prName, rName) return resource @@ -358,7 +304,6 @@ func CreateAccEndpointSecurityGroupRemovingRequiredField() string { name_alias = "test_name_alias" pc_enf_pref = "enforced" pref_gr_memb = "include" - prio = "level1" } `) return resource @@ -402,12 +347,10 @@ func CreateAccEndpointSecurityGroupConfigWithOptionalValues(rName string) string application_profile_dn = aci_application_profile.test.id annotation = "test_annotation" description = "test_description" - flood_on_encap = "enabled" match_t = "All" name_alias = "test_name_alias" pc_enf_pref = "enforced" pref_gr_memb = "include" - prio = "level1" } `, rName, rName, rName) return resource diff --git a/testacc/resource_aci_fvtenant_test.go b/testacc/resource_aci_fvtenant_test.go index 57c756bdf..b521a9311 100644 --- a/testacc/resource_aci_fvtenant_test.go +++ b/testacc/resource_aci_fvtenant_test.go @@ -117,56 +117,56 @@ func TestAccAciTenant_NegativeCases(t *testing.T) { }) } -func TestAccAciTenant_reltionalParameters(t *testing.T) { - var tenant_default models.Tenant - var tenant_rel1 models.Tenant - var tenant_rel2 models.Tenant - resourceName := "aci_tenant.test" - rName := makeTestVariable(acctest.RandString(5)) - rsRelName1 := acctest.RandString(5) - rsRelName2 := acctest.RandString(5) - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - ProviderFactories: testAccProviders, - CheckDestroy: testAccCheckAciTenantDestroy, - Steps: []resource.TestStep{ - { - Config: CreateAccTenantConfig(rName), - Check: resource.ComposeTestCheckFunc( - testAccCheckAciTenantExists(resourceName, &tenant_default), - // resource.TestCheckResourceAttr(resourceName, "relation_tenant_rs_ap_mon_pol", ""), // checking value of relation_fv_rs_ap_mon_pol parameter for given configuration - ), - }, - { - Config: CreateAccTenanttUpdatedTenantIntial(rName, rsRelName1, rsRelName2), - Check: resource.ComposeTestCheckFunc( - testAccCheckAciTenantExists(resourceName, &tenant_rel1), - resource.TestCheckResourceAttr(resourceName, "relation_fv_rs_tenant_mon_pol", fmt.Sprintf("uni/tn-%s/monepg-%s", rsRelName1, rsRelName1)), - resource.TestCheckResourceAttr(resourceName, "relation_fv_rs_tn_deny_rule.#", "1"), - resource.TestCheckTypeSetElemAttr(resourceName, "relation_fv_rs_tn_deny_rule.*", fmt.Sprintf("uni/tn-%s/flt-%s", rsRelName1, rsRelName2)), - testAccCheckAciTenantIdEqual(&tenant_default, &tenant_rel1), - ), - }, - { - Config: CreateAccTenantUpdatedTenantFinal(rName, rsRelName2, rsRelName1, rsRelName2), - Check: resource.ComposeTestCheckFunc( - testAccCheckAciTenantExists(resourceName, &tenant_rel2), - resource.TestCheckResourceAttr(resourceName, "relation_fv_rs_tenant_mon_pol", fmt.Sprintf("uni/tn-%s/monepg-%s", rsRelName2, rsRelName2)), - resource.TestCheckResourceAttr(resourceName, "relation_fv_rs_tn_deny_rule.#", "2"), - resource.TestCheckTypeSetElemAttr(resourceName, "relation_fv_rs_tn_deny_rule.*", fmt.Sprintf("uni/tn-%s/flt-%s", rsRelName2, rsRelName1)), - resource.TestCheckTypeSetElemAttr(resourceName, "relation_fv_rs_tn_deny_rule.*", fmt.Sprintf("uni/tn-%s/flt-%s", rsRelName2, rsRelName2)), - testAccCheckAciTenantIdEqual(&tenant_default, &tenant_rel2), - ), - }, - { - Config: CreateAccTenantConfig(rName), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceName, "relation_fv_rs_tenant_mon_pol", ""), - ), - }, - }, - }) -} +// func TestAccAciTenant_reltionalParameters(t *testing.T) { +// var tenant_default models.Tenant +// var tenant_rel1 models.Tenant +// var tenant_rel2 models.Tenant +// resourceName := "aci_tenant.test" +// rName := makeTestVariable(acctest.RandString(5)) +// rsRelName1 := acctest.RandString(5) +// rsRelName2 := acctest.RandString(5) +// resource.ParallelTest(t, resource.TestCase{ +// PreCheck: func() { testAccPreCheck(t) }, +// ProviderFactories: testAccProviders, +// CheckDestroy: testAccCheckAciTenantDestroy, +// Steps: []resource.TestStep{ +// { +// Config: CreateAccTenantConfig(rName), +// Check: resource.ComposeTestCheckFunc( +// testAccCheckAciTenantExists(resourceName, &tenant_default), +// // resource.TestCheckResourceAttr(resourceName, "relation_tenant_rs_ap_mon_pol", ""), // checking value of relation_fv_rs_ap_mon_pol parameter for given configuration +// ), +// }, +// { +// Config: CreateAccTenanttUpdatedTenantIntial(rName, rsRelName1, rsRelName2), +// Check: resource.ComposeTestCheckFunc( +// testAccCheckAciTenantExists(resourceName, &tenant_rel1), +// resource.TestCheckResourceAttr(resourceName, "relation_fv_rs_tenant_mon_pol", fmt.Sprintf("uni/tn-%s/monepg-%s", rsRelName1, rsRelName1)), +// resource.TestCheckResourceAttr(resourceName, "relation_fv_rs_tn_deny_rule.#", "1"), +// resource.TestCheckTypeSetElemAttr(resourceName, "relation_fv_rs_tn_deny_rule.*", fmt.Sprintf("uni/tn-%s/flt-%s", rsRelName1, rsRelName2)), +// testAccCheckAciTenantIdEqual(&tenant_default, &tenant_rel1), +// ), +// }, +// { +// Config: CreateAccTenantUpdatedTenantFinal(rName, rsRelName2, rsRelName1, rsRelName2), +// Check: resource.ComposeTestCheckFunc( +// testAccCheckAciTenantExists(resourceName, &tenant_rel2), +// resource.TestCheckResourceAttr(resourceName, "relation_fv_rs_tenant_mon_pol", fmt.Sprintf("uni/tn-%s/monepg-%s", rsRelName2, rsRelName2)), +// resource.TestCheckResourceAttr(resourceName, "relation_fv_rs_tn_deny_rule.#", "2"), +// resource.TestCheckTypeSetElemAttr(resourceName, "relation_fv_rs_tn_deny_rule.*", fmt.Sprintf("uni/tn-%s/flt-%s", rsRelName2, rsRelName1)), +// resource.TestCheckTypeSetElemAttr(resourceName, "relation_fv_rs_tn_deny_rule.*", fmt.Sprintf("uni/tn-%s/flt-%s", rsRelName2, rsRelName2)), +// testAccCheckAciTenantIdEqual(&tenant_default, &tenant_rel2), +// ), +// }, +// { +// Config: CreateAccTenantConfig(rName), +// Check: resource.ComposeTestCheckFunc( +// resource.TestCheckResourceAttr(resourceName, "relation_fv_rs_tenant_mon_pol", ""), +// ), +// }, +// }, +// }) +// } func TestAccAciTenant_MultipleCreateDelete(t *testing.T) { rName := makeTestVariable(acctest.RandString(5)) @@ -279,7 +279,7 @@ func CreateAccTenantConfigWithName(rOther string) string { } func CreateAccTenantConfig(rName string) string { - fmt.Println("=== STEP testing tenant creation with name") + fmt.Println("=== STEP testing tenant creation with name") resource := fmt.Sprintf(` resource "aci_tenant" "test" { name = "%s" diff --git a/testacc/resource_aci_l3extinstp_test.go b/testacc/resource_aci_l3extinstp_test.go index 6bf3924d9..a0767aec0 100644 --- a/testacc/resource_aci_l3extinstp_test.go +++ b/testacc/resource_aci_l3extinstp_test.go @@ -387,14 +387,6 @@ func TestAccAciExternalNetworkInstanceProfile_Negative(t *testing.T) { Config: CreateAccExternalNetworkInstanceProfileConfigWithInvalidL3Out(rName), ExpectError: regexp.MustCompile(`unknown property value (.)+, name dn, class l3extInstP (.)+`), }, - { - Config: CreateAccExternalNetworkInstanceProfileUpdatedAttr(rName, "exception_tag", "-1"), - ExpectError: regexp.MustCompile(`property is out of range`), - }, - { - Config: CreateAccExternalNetworkInstanceProfileUpdatedAttr(rName, "exception_tag", "513"), - ExpectError: regexp.MustCompile(`property is out of range`), - }, { Config: CreateAccExternalNetworkInstanceProfileUpdatedAttr(rName, "annotation", longAnnotationDesc), ExpectError: regexp.MustCompile(`property annotation of (.)+ failed validation for value '(.)+'`), diff --git a/testacc/resource_aci_l3extsubnet_test.go b/testacc/resource_aci_l3extsubnet_test.go index 2f4a93017..482aced88 100644 --- a/testacc/resource_aci_l3extsubnet_test.go +++ b/testacc/resource_aci_l3extsubnet_test.go @@ -44,7 +44,7 @@ func TestAccAciL3ExtSubnet_Basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "annotation", "orchestrator:terraform"), resource.TestCheckResourceAttr(resourceName, "description", ""), resource.TestCheckResourceAttr(resourceName, "name_alias", ""), - resource.TestCheckResourceAttr(resourceName, "aggregate", ""), + resource.TestCheckResourceAttr(resourceName, "aggregate", "none"), resource.TestCheckResourceAttr(resourceName, "scope.#", "1"), resource.TestCheckResourceAttr(resourceName, "scope.0", "import-security"), resource.TestCheckResourceAttr(resourceName, "relation_l3ext_rs_subnet_to_profile.#", "0"),