diff --git a/aci/data_source_aci_fvctx.go b/aci/data_source_aci_fvctx.go index d119a3eef..9c03b410e 100644 --- a/aci/data_source_aci_fvctx.go +++ b/aci/data_source_aci_fvctx.go @@ -27,6 +27,16 @@ func dataSourceAciVRF() *schema.Resource { Required: true, }, + "pc_tag": &schema.Schema{ + Type: schema.TypeString, + Computed: true, + }, + + "scope": &schema.Schema{ + Type: schema.TypeString, + Computed: true, + }, + "bd_enforced_enable": &schema.Schema{ Type: schema.TypeString, Optional: true, diff --git a/aci/resource_aci_fvctx.go b/aci/resource_aci_fvctx.go index 0788b8028..2b1f1be50 100644 --- a/aci/resource_aci_fvctx.go +++ b/aci/resource_aci_fvctx.go @@ -38,6 +38,16 @@ func resourceAciVRF() *schema.Resource { ForceNew: true, }, + "pc_tag": &schema.Schema{ + Type: schema.TypeString, + Computed: true, + }, + + "scope": &schema.Schema{ + Type: schema.TypeString, + Computed: true, + }, + "bd_enforced_enable": &schema.Schema{ Type: schema.TypeString, Optional: true, @@ -213,6 +223,8 @@ func setVRFAttributes(fvCtx *models.VRF, d *schema.ResourceData) (*schema.Resour d.Set("name", fvCtxMap["name"]) d.Set("annotation", fvCtxMap["annotation"]) + d.Set("scope", fvCtxMap["scope"]) + d.Set("pc_tag", fvCtxMap["pcTag"]) d.Set("bd_enforced_enable", fvCtxMap["bdEnforcedEnable"]) d.Set("ip_data_plane_learning", fvCtxMap["ipDataPlaneLearning"]) d.Set("knw_mcast_act", fvCtxMap["knwMcastAct"]) diff --git a/docs/data-sources/vrf.md b/docs/data-sources/vrf.md index 85c469fbf..876f0878f 100644 --- a/docs/data-sources/vrf.md +++ b/docs/data-sources/vrf.md @@ -29,6 +29,8 @@ data "aci_vrf" "dev_ctx" { - `id` - Attribute id set to the Dn of the VRF. - `annotation` - (Optional) Annotation tags for object VRF. +- `pc_tag` - (Read-Only) A numeric ID to represent a policy enforcement group. +- `scope` - (Read-Only) A numeric value for other APICs to identify a specific VRF. - `description` - (Optional) Description tags for object VRF. - `bd_enforced_enable` - (Optional) Flag to enable/disable enforced bridge domain for VRF. - `ip_data_plane_learning` - (Optional) Flag to enable/disable IP-data-plane learning for VRF. diff --git a/docs/resources/vrf.md b/docs/resources/vrf.md index b0aa0aea2..f0b42fcce 100644 --- a/docs/resources/vrf.md +++ b/docs/resources/vrf.md @@ -46,6 +46,8 @@ resource "aci_vrf" "foovrf" { - `tenant_dn` - (Required) Distinguished name of parent Tenant object. - `name` - (Required) Name of Object VRF. - `annotation` - (Optional) Annotation tags for object VRF. +- `pc_tag` - (Read-Only) A numeric ID to represent a policy enforcement group. +- `scope` - (Read-Only) A numeric value for other APICs to identify a specific VRF. - `description` - (Optional) Description tags for object VRF. - `bd_enforced_enable` - (Optional) Flag to enable/disable enforced bridge domain for VRF. Allowed values are "yes" and "no". Default is "no". - `ip_data_plane_learning` - (Optional) Flag to enable/disable IP-data-plane learning for VRF. Allowed values are "enabled" and "disabled". Default is "enabled". diff --git a/go.mod b/go.mod index 6f02b0ffb..a24d59f37 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21 toolchain go1.21.5 require ( - github.com/ciscoecosystem/aci-go-client/v2 v2.28.2 + github.com/ciscoecosystem/aci-go-client/v2 v2.29.0 github.com/ghodss/yaml v1.0.0 github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 github.com/hashicorp/hcl/v2 v2.20.0 diff --git a/go.sum b/go.sum index b359affe1..0a139a602 100644 --- a/go.sum +++ b/go.sum @@ -11,8 +11,8 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= -github.com/ciscoecosystem/aci-go-client/v2 v2.28.2 h1:qqglP7joOunBd4JWMKqbqenFfdQfwPAc1JlLzbRZdlI= -github.com/ciscoecosystem/aci-go-client/v2 v2.28.2/go.mod h1:NE95j9SraYejTJWqC1SzetCtQ306vQuFIPBbcvm+Hgk= +github.com/ciscoecosystem/aci-go-client/v2 v2.29.0 h1:OCZsWt5uFu7qAdf3YETqHukYTHrSGD23+bavknM7oC8= +github.com/ciscoecosystem/aci-go-client/v2 v2.29.0/go.mod h1:NE95j9SraYejTJWqC1SzetCtQ306vQuFIPBbcvm+Hgk= github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= diff --git a/legacy-docs/docs/d/vrf.html.markdown b/legacy-docs/docs/d/vrf.html.markdown index 85c469fbf..876f0878f 100644 --- a/legacy-docs/docs/d/vrf.html.markdown +++ b/legacy-docs/docs/d/vrf.html.markdown @@ -29,6 +29,8 @@ data "aci_vrf" "dev_ctx" { - `id` - Attribute id set to the Dn of the VRF. - `annotation` - (Optional) Annotation tags for object VRF. +- `pc_tag` - (Read-Only) A numeric ID to represent a policy enforcement group. +- `scope` - (Read-Only) A numeric value for other APICs to identify a specific VRF. - `description` - (Optional) Description tags for object VRF. - `bd_enforced_enable` - (Optional) Flag to enable/disable enforced bridge domain for VRF. - `ip_data_plane_learning` - (Optional) Flag to enable/disable IP-data-plane learning for VRF. diff --git a/legacy-docs/docs/r/vrf.html.markdown b/legacy-docs/docs/r/vrf.html.markdown index b0aa0aea2..f0b42fcce 100644 --- a/legacy-docs/docs/r/vrf.html.markdown +++ b/legacy-docs/docs/r/vrf.html.markdown @@ -46,6 +46,8 @@ resource "aci_vrf" "foovrf" { - `tenant_dn` - (Required) Distinguished name of parent Tenant object. - `name` - (Required) Name of Object VRF. - `annotation` - (Optional) Annotation tags for object VRF. +- `pc_tag` - (Read-Only) A numeric ID to represent a policy enforcement group. +- `scope` - (Read-Only) A numeric value for other APICs to identify a specific VRF. - `description` - (Optional) Description tags for object VRF. - `bd_enforced_enable` - (Optional) Flag to enable/disable enforced bridge domain for VRF. Allowed values are "yes" and "no". Default is "no". - `ip_data_plane_learning` - (Optional) Flag to enable/disable IP-data-plane learning for VRF. Allowed values are "enabled" and "disabled". Default is "enabled". diff --git a/vendor/github.com/ciscoecosystem/aci-go-client/v2/models/fv_ctx.go b/vendor/github.com/ciscoecosystem/aci-go-client/v2/models/fv_ctx.go index f1cbcf711..e94a70433 100644 --- a/vendor/github.com/ciscoecosystem/aci-go-client/v2/models/fv_ctx.go +++ b/vendor/github.com/ciscoecosystem/aci-go-client/v2/models/fv_ctx.go @@ -19,6 +19,10 @@ type VRFAttributes struct { Annotation string `json:",omitempty"` + PcTag string `json:",omitempty"` + + Scope string `json:",omitempty"` + BdEnforcedEnable string `json:",omitempty"` IpDataPlaneLearning string `json:",omitempty"` @@ -57,6 +61,10 @@ func (fvCtx *VRF) ToMap() (map[string]string, error) { A(fvCtxMap, "annotation", fvCtx.Annotation) + A(fvCtxMap, "pcTag", fvCtx.PcTag) + + A(fvCtxMap, "scope", fvCtx.Scope) + A(fvCtxMap, "bdEnforcedEnable", fvCtx.BdEnforcedEnable) A(fvCtxMap, "ipDataPlaneLearning", fvCtx.IpDataPlaneLearning) @@ -90,6 +98,10 @@ func VRFFromContainerList(cont *container.Container, index int) *VRF { Annotation: G(VRFCont, "annotation"), + PcTag: G(VRFCont, "pcTag"), + + Scope: G(VRFCont, "scope"), + BdEnforcedEnable: G(VRFCont, "bdEnforcedEnable"), IpDataPlaneLearning: G(VRFCont, "ipDataPlaneLearning"), diff --git a/vendor/modules.txt b/vendor/modules.txt index 1ddf8ba90..9100029e3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -28,7 +28,7 @@ github.com/agext/levenshtein # github.com/apparentlymart/go-textseg/v15 v15.0.0 ## explicit; go 1.16 github.com/apparentlymart/go-textseg/v15/textseg -# github.com/ciscoecosystem/aci-go-client/v2 v2.28.2 +# github.com/ciscoecosystem/aci-go-client/v2 v2.29.0 ## explicit; go 1.21 github.com/ciscoecosystem/aci-go-client/v2/client github.com/ciscoecosystem/aci-go-client/v2/container