Skip to content

Commit

Permalink
[minor_change] Add read-only pcTag, scope and segment attributes to a…
Browse files Browse the repository at this point in the history
…ci_bridge_domain resource and datasource and add scope to aci_endpoint_security_group and aci_application_epg resources and datasources
  • Loading branch information
akinross committed Nov 22, 2024
1 parent c0dbca1 commit 394b064
Show file tree
Hide file tree
Showing 22 changed files with 259 additions and 8 deletions.
1 change: 1 addition & 0 deletions docs/data-sources/application_epg.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ data "aci_application_epg" "example_application_profile" {
* `pc_tag` (pcTag) - (string) The classification tag used for policy enforcement and zoning.
* `preferred_group_member` (prefGrMemb) - (string) Parameter used to determine whether the EPG is part of the preferred group. Members of this group are allowed to communicate without contracts.
* `priority` (prio) - (string) The Quality of Service (QoS) priority class ID. QoS refers to the capability of a network to provide better service to selected network traffic over various technologies. The primary goal of QoS is to provide priority including dedicated bandwidth, controlled jitter and latency (required by some real-time and interactive traffic), and improved loss characteristics. You can configure the bandwidth of each QoS level using QoS profiles.
* `scope` (scope) - (string) The L3 scope ID of the Application EPG object.
* `admin_state` (shutdown) - (string) Withdraw AEPg Configuration from all Nodes in the Fabric.

* `epg_useg_block_statement` - (map) A map of EPG uSeg Block Statement (ACI object [fvCrtrn](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fvCrtrn/overview)). This attribute is supported in ACI versions: 1.1(1j) and later.
Expand Down
3 changes: 3 additions & 0 deletions docs/data-sources/bridge_domain.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ data "aci_bridge_domain" "example_tenant" {
* `name_alias` (nameAlias) - (string) The name alias of the Bridge Domain object.
* `owner_key` (ownerKey) - (string) The key for enabling clients to own their data for entity correlation.
* `owner_tag` (ownerTag) - (string) A tag for enabling clients to add their own data. For example, to indicate who created this object.
* `pc_tag` (pcTag) - (string) The classification tag used for policy enforcement and zoning.
* `scope` (scope) - (string) The L3 scope ID of the Bridge Domain object.
* `segment` (seg) - (string) The L2 segment ID of the Bridge Domain object.
* `bridge_domain_type` (type) - (string) The domain type of the Bridge Domain object.
* `unicast_routing` (unicastRoute) - (string) Enables L3 routing and endpoint IP learning for the Bridge Domain object.
* `l2_unknown_unicast_flooding` (unkMacUcastAct) - (string) The forwarding method for unknown layer 2 destinations.
Expand Down
1 change: 1 addition & 0 deletions docs/data-sources/endpoint_security_group.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ data "aci_endpoint_security_group" "example_application_profile" {
* `intra_esg_isolation` (pcEnfPref) - (string) Parameter used to determine whether communication between endpoints within the ESG is blocked.
* `pc_tag` (pcTag) - (string) The classification tag used for policy enforcement and zoning.
* `preferred_group_member` (prefGrMemb) - (string) Parameter used to determine whether the ESG is part of the preferred group. Members of this group are allowed to communicate without contracts.
* `scope` (scope) - (string) The L3 scope ID of the Endpoint Security Group object.
* `admin_state` (shutdown) - (string) Withdraw the ESG configuration from all nodes in the fabric.

* `relation_to_consumed_contracts` - (list) A list of Relation To Consumed Contracts (ACI object [fvRsCons](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fvRsCons/overview)) pointing to Contract (ACI Object [vzBrCP](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/vzBrCP/overview)). This attribute is supported in ACI versions: 1.0(1e) and later.
Expand Down
2 changes: 2 additions & 0 deletions docs/resources/application_epg.md
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,8 @@ All examples for the Application EPG resource can be found in the [examples](htt
* `priority` (prio) - (string) The Quality of Service (QoS) priority class ID. QoS refers to the capability of a network to provide better service to selected network traffic over various technologies. The primary goal of QoS is to provide priority including dedicated bandwidth, controlled jitter and latency (required by some real-time and interactive traffic), and improved loss characteristics. You can configure the bandwidth of each QoS level using QoS profiles.
- Default: `unspecified`
- Valid Values: `level1`, `level2`, `level3`, `level4`, `level5`, `level6`, `unspecified`.
* `scope` (scope) - (string) The L3 scope ID of the Application EPG object.
- Default: `0`
* `admin_state` (shutdown) - (string) Withdraw AEPg Configuration from all Nodes in the Fabric.
- Default: `no`
- Valid Values: `no`, `yes`.
Expand Down
5 changes: 5 additions & 0 deletions docs/resources/bridge_domain.md
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,11 @@ All examples for the Bridge Domain resource can be found in the [examples](https
* `name_alias` (nameAlias) - (string) The name alias of the Bridge Domain object.
* `owner_key` (ownerKey) - (string) The key for enabling clients to own their data for entity correlation.
* `owner_tag` (ownerTag) - (string) A tag for enabling clients to add their own data. For example, to indicate who created this object.
* `pc_tag` (pcTag) - (string) The classification tag used for policy enforcement and zoning.
- Valid Values: `any`.
* `scope` (scope) - (string) The L3 scope ID of the Bridge Domain object.
- Default: `0`
* `segment` (seg) - (string) The L2 segment ID of the Bridge Domain object.
* `bridge_domain_type` (type) - (string) The domain type of the Bridge Domain object.
- Default: `regular`
- Valid Values: `fc`, `regular`.
Expand Down
2 changes: 2 additions & 0 deletions docs/resources/endpoint_security_group.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ All examples for the Endpoint Security Group resource can be found in the [examp
* `preferred_group_member` (prefGrMemb) - (string) Parameter used to determine whether the ESG is part of the preferred group. Members of this group are allowed to communicate without contracts.
- Default: `exclude`
- Valid Values: `exclude`, `include`.
* `scope` (scope) - (string) The L3 scope ID of the Endpoint Security Group object.
- Default: `0`
* `admin_state` (shutdown) - (string) Withdraw the ESG configuration from all nodes in the fabric.
- Default: `no`
- Valid Values: `no`, `yes`.
Expand Down
12 changes: 12 additions & 0 deletions gen/definitions/properties.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ global:
lastMbrIntvl: "The last member interval (seconds) of the %s object. The group state is removed when no host responds before the timeout"
startQueryCnt: "The start query count of the %s object."
startQueryIntvl: "The query interval (seconds) of the %s object at start-up."
seg: "The L2 segment ID of the %s object."
pcTag: "The classification tag used for policy enforcement and zoning."
overwrites:
count: "apic_count" # count is a terraform reserved schema entry
provider: "prov" # provider is a terraform reserved schema entry
Expand All @@ -44,6 +46,7 @@ global:
netflow_pref: "enable_netflow"
num_ports: "number_of_ports"
class_pref: "class_preference"
seg: "segment"
resource_name_doc_overwrite:
Vrf: "VRF"
Sid: "SR-MPLS Segment ID"
Expand Down Expand Up @@ -424,6 +427,7 @@ netflowRecordPol:
fvESg:
read_only_properties:
- "pcTag"
- "scope"
remove_valid_values:
pcTag:
- "any"
Expand All @@ -437,6 +441,7 @@ fvESg:
prefGrMemb: "Parameter used to determine whether the ESG is part of the preferred group. Members of this group are allowed to communicate without contracts."
pcEnfPref: "Parameter used to determine whether communication between endpoints within the ESG is blocked."
shutdown: "Withdraw the ESG configuration from all nodes in the fabric."
scope: "The L3 scope ID of the %s object."
parents:
- class_name: "fvAp"
parent_dependency: "fvTenant"
Expand Down Expand Up @@ -712,6 +717,7 @@ fvIpAttr:
fvAEPg:
read_only_properties:
- "pcTag"
- "scope"
remove_valid_values:
pcTag:
- "any"
Expand Down Expand Up @@ -740,6 +746,7 @@ fvAEPg:
isAttrBasedEPg: "The %s object is microsegmented (uSeg)."
pcEnfPref: "Parameter used to determine whether communication between endpoints within the EPG is blocked."
prefGrMemb: "Parameter used to determine whether the EPG is part of the preferred group. Members of this group are allowed to communicate without contracts."
scope: "The L3 scope ID of the %s object."
test_values:
default:
forwarding_control: "none"
Expand Down Expand Up @@ -1313,6 +1320,10 @@ pkiKeyRing:
certificate_authority: "test_name"

fvBD:
read_only_properties:
- "pcTag"
- "seg"
- "scope"
remove_valid_values:
vmac:
- "not-applicable"
Expand Down Expand Up @@ -1368,6 +1379,7 @@ fvBD:
unkMcastAct: "The forwarding method for unknown layer 3 multicast destinations."
v6unkMcastAct: "The forwarding method for unknown IPv6 multicast destinations."
vmac: "The virtual MAC address of the %s object. This is used when the the BD/SVI is extended to multiple sites using a L2 Outside."
scope: "The L3 scope ID of the %s object."
type_overwrites:
epMoveDetectMode: "string"
test_values:
Expand Down
5 changes: 5 additions & 0 deletions gen/testvars/fvAEPg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ default:
4.0(1h):
has_multicast_source: "no"
admin_state: "no"
4.1(1i):
scope: "0"

datasource_non_existing:
name: "non_existing_name"
Expand All @@ -35,6 +37,7 @@ custom_type:

read_only:
- "pc_tag"
- "scope"

all:
annotation: "annotation"
Expand All @@ -52,6 +55,8 @@ all:
4.0(1h):
has_multicast_source: "no"
admin_state: "no"
4.1(1i):
scope: "0"

children:
epg_useg_block_statement:
Expand Down
5 changes: 5 additions & 0 deletions gen/testvars/fvBD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ datasource_required:
resource_required:
name: "test_name"

read_only:
- "pc_tag"
- "scope"
- "segment"

all:
optimize_wan_bandwidth: "no"
annotation: "annotation"
Expand Down
1 change: 1 addition & 0 deletions gen/testvars/fvESg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ resource_required:

read_only:
- "pc_tag"
- "scope"

all:
annotation: "annotation"
Expand Down
4 changes: 4 additions & 0 deletions internal/provider/data_source_aci_application_epg.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions internal/provider/data_source_aci_application_epg_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions internal/provider/data_source_aci_bridge_domain.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions internal/provider/data_source_aci_bridge_domain_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions internal/provider/data_source_aci_endpoint_security_group.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions internal/provider/resource_aci_application_epg.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 394b064

Please sign in to comment.