Skip to content

Commit 34a362d

Browse files
committed
[ignore] make encapsulation a required attribute for aci_relation_from_application_epg_to_attachable_access_entity_profile
1 parent 7514110 commit 34a362d

15 files changed

+54
-45
lines changed

docs/data-sources/application_epg.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ data "aci_application_epg" "example_application_profile" {
8989
* `key` (key) - (string) The key used to uniquely identify this configuration object.
9090
* `value` (value) - (string) The value of the property.
9191
* `relation_to_attachable_access_entity_profiles` - (list) A list of Relation From Application EPG To Attachable Access Entity Profiles (ACI object [fvRsAepAtt](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fvRsAepAtt/overview)) pointing to Attachable Access Entity Profile (ACI Object [infraAttEntityP](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/infraAttEntityP/overview)). This attribute is supported in ACI versions: 6.1(3f) and later.
92-
* `encapsulation` (encap) - (string) The encapsulation of the Relation From Application EPG To Attachable Access Entity Profile object. The encapsulation refers to the EPG VLAN when class preference is set to 'encap', or to the Secondary VLAN when class preference is set to 'useg'.
92+
* `encapsulation` (encap) - (string) The encapsulation of the Relation From Application EPG To Attachable Access Entity Profile object.
9393
* `deployment_immediacy` (instrImedcy) - (string) The deployment immediacy of the Relation From Application EPG To Attachable Access Entity Profile object. Specifies when the policy is pushed into the hardware policy content-addressable memory (CAM).
9494
* `mode` (mode) - (string) The mode of the Relation From Application EPG To Attachable Access Entity Profile object.
95-
* `primary_encapsulation` (primaryEncap) - (string) The primary encapsulation of the Relation From Application EPG To Attachable Access Entity Profile object. This is used when the class preference is set to 'useg'.
95+
* `primary_encapsulation` (primaryEncap) - (string) The primary encapsulation of the Relation From Application EPG To Attachable Access Entity Profile object.
9696
* `attachable_access_entity_profile_name` (tnInfraAttEntityPName) - (string) The name of the Attachable Access Entity Profile object.
9797
* `annotations` - (list) A list of Annotations (ACI object [tagAnnotation](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/tagAnnotation/overview)). This attribute is supported in ACI versions: 3.2(1l) and later.
9898
* `key` (key) - (string) The key used to uniquely identify this configuration object.

docs/data-sources/relation_from_application_epg_to_attachable_access_entity_profile.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ data "aci_relation_from_application_epg_to_attachable_access_entity_profile" "ex
4848
### Read-Only ###
4949

5050
* `id` - (string) The distinguished name (DN) of the Relation From Application EPG To Attachable Access Entity Profile object.
51-
* `encapsulation` (encap) - (string) The encapsulation of the Relation From Application EPG To Attachable Access Entity Profile object. The encapsulation refers to the EPG VLAN when class preference is set to 'encap', or to the Secondary VLAN when class preference is set to 'useg'.
51+
* `encapsulation` (encap) - (string) The encapsulation of the Relation From Application EPG To Attachable Access Entity Profile object.
5252
* `deployment_immediacy` (instrImedcy) - (string) The deployment immediacy of the Relation From Application EPG To Attachable Access Entity Profile object. Specifies when the policy is pushed into the hardware policy content-addressable memory (CAM).
5353
* `mode` (mode) - (string) The mode of the Relation From Application EPG To Attachable Access Entity Profile object.
54-
* `primary_encapsulation` (primaryEncap) - (string) The primary encapsulation of the Relation From Application EPG To Attachable Access Entity Profile object. This is used when the class preference is set to 'useg'.
54+
* `primary_encapsulation` (primaryEncap) - (string) The primary encapsulation of the Relation From Application EPG To Attachable Access Entity Profile object.
5555
* `annotations` - (list) A list of Annotations (ACI object [tagAnnotation](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/tagAnnotation/overview)). This attribute is supported in ACI versions: 3.2(1l) and later.
5656
* `key` (key) - (string) The key used to uniquely identify this configuration object.
5757
* `value` (value) - (string) The value of the property.

docs/resources/application_epg.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -541,19 +541,17 @@ All examples for the Application EPG resource can be found in the [examples](htt
541541
* `relation_to_attachable_access_entity_profiles` - (list) A list of Relation From Application EPG To Attachable Access Entity Profiles (ACI object [fvRsAepAtt](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fvRsAepAtt/overview)) pointing to Attachable Access Entity Profile (ACI Object [infraAttEntityP](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/infraAttEntityP/overview)) which can be configured using the [aci_attachable_access_entity_profile](https://registry.terraform.io/providers/CiscoDevNet/aci/latest/docs/resources/attachable_access_entity_profile) resource. This attribute is supported in ACI versions: 6.1(3f) and later.
542542
#### Required ####
543543

544+
* `encapsulation` (encap) - (string) The encapsulation of the Relation From Application EPG To Attachable Access Entity Profile object.
544545
* `attachable_access_entity_profile_name` (tnInfraAttEntityPName) - (string) The name of the Attachable Access Entity Profile object. This attribute can be referenced from a [resource](https://registry.terraform.io/providers/CiscoDevNet/aci/latest/docs/resources/attachable_access_entity_profile) with `aci_attachable_access_entity_profile.example.name` or from a [datasource](https://registry.terraform.io/providers/CiscoDevNet/aci/latest/docs/data-sources/attachable_access_entity_profile) with `data.aci_attachable_access_entity_profile.example.name`.
545546
#### Optional ####
546547

547-
* `encapsulation` (encap) - (string) The encapsulation of the Relation From Application EPG To Attachable Access Entity Profile object. The encapsulation refers to the EPG VLAN when class preference is set to 'encap', or to the Secondary VLAN when class preference is set to 'useg'.
548-
- Default: `"unknown"`
549548
* `deployment_immediacy` (instrImedcy) - (string) The deployment immediacy of the Relation From Application EPG To Attachable Access Entity Profile object. Specifies when the policy is pushed into the hardware policy content-addressable memory (CAM).
550549
- Default: `"lazy"`
551550
- Valid Values: `"immediate"`, `"lazy"`.
552551
* `mode` (mode) - (string) The mode of the Relation From Application EPG To Attachable Access Entity Profile object.
553552
- Default: `"regular"`
554553
- Valid Values: `"native"`, `"regular"`, `"untagged"`.
555-
* `primary_encapsulation` (primaryEncap) - (string) The primary encapsulation of the Relation From Application EPG To Attachable Access Entity Profile object. This is used when the class preference is set to 'useg'.
556-
- Default: `"unknown"`
554+
* `primary_encapsulation` (primaryEncap) - (string) The primary encapsulation of the Relation From Application EPG To Attachable Access Entity Profile object.
557555
* `annotations` - (list) A list of Annotations (ACI object [tagAnnotation](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/tagAnnotation/overview)). Annotations can also be configured using a separate [aci_annotation](https://registry.terraform.io/providers/CiscoDevNet/aci/latest/docs/resources/annotation) resource. This attribute is supported in ACI versions: 3.2(1l) and later.
558556
#### Required ####
559557

docs/resources/relation_from_application_epg_to_attachable_access_entity_profile.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ The configuration snippet below creates a Relation From Application EPG To Attac
3636
3737
resource "aci_relation_from_application_epg_to_attachable_access_entity_profile" "example_application_epg" {
3838
parent_dn = aci_application_epg.example.id
39+
encapsulation = "vlan-100"
3940
attachable_access_entity_profile_name = aci_attachable_access_entity_profile.example.name
4041
}
4142
@@ -77,6 +78,7 @@ All examples for the Relation From Application EPG To Attachable Access Entity P
7778

7879
* `parent_dn` - (string) The distinguished name (DN) of the parent object, possible resources:
7980
- [aci_application_epg](https://registry.terraform.io/providers/CiscoDevNet/aci/latest/docs/resources/application_epg) ([fvAEPg](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fvAEPg/overview))
81+
* `encapsulation` (encap) - (string) The encapsulation of the Relation From Application EPG To Attachable Access Entity Profile object.
8082
* `attachable_access_entity_profile_name` (tnInfraAttEntityPName) - (string) The name of the Attachable Access Entity Profile object. This attribute can be referenced from a [resource](https://registry.terraform.io/providers/CiscoDevNet/aci/latest/docs/resources/attachable_access_entity_profile) with `aci_attachable_access_entity_profile.example.name` or from a [datasource](https://registry.terraform.io/providers/CiscoDevNet/aci/latest/docs/data-sources/attachable_access_entity_profile) with `data.aci_attachable_access_entity_profile.example.name`.
8183

8284
### Read-Only ###
@@ -85,16 +87,13 @@ All examples for the Relation From Application EPG To Attachable Access Entity P
8587

8688
### Optional ###
8789

88-
* `encapsulation` (encap) - (string) The encapsulation of the Relation From Application EPG To Attachable Access Entity Profile object. The encapsulation refers to the EPG VLAN when class preference is set to 'encap', or to the Secondary VLAN when class preference is set to 'useg'.
89-
- Default: `"unknown"`
9090
* `deployment_immediacy` (instrImedcy) - (string) The deployment immediacy of the Relation From Application EPG To Attachable Access Entity Profile object. Specifies when the policy is pushed into the hardware policy content-addressable memory (CAM).
9191
- Default: `"lazy"`
9292
- Valid Values: `"immediate"`, `"lazy"`.
9393
* `mode` (mode) - (string) The mode of the Relation From Application EPG To Attachable Access Entity Profile object.
9494
- Default: `"regular"`
9595
- Valid Values: `"native"`, `"regular"`, `"untagged"`.
96-
* `primary_encapsulation` (primaryEncap) - (string) The primary encapsulation of the Relation From Application EPG To Attachable Access Entity Profile object. This is used when the class preference is set to 'useg'.
97-
- Default: `"unknown"`
96+
* `primary_encapsulation` (primaryEncap) - (string) The primary encapsulation of the Relation From Application EPG To Attachable Access Entity Profile object.
9897
* `annotations` - (list) A list of Annotations (ACI object [tagAnnotation](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/tagAnnotation/overview)). Annotations can also be configured using a separate [aci_annotation](https://registry.terraform.io/providers/CiscoDevNet/aci/latest/docs/resources/annotation) resource. This attribute is supported in ACI versions: 3.2(1l) and later.
9998
#### Required ####
10099

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

22
resource "aci_relation_from_application_epg_to_attachable_access_entity_profile" "example_application_epg" {
33
parent_dn = aci_application_epg.example.id
4+
encapsulation = "vlan-100"
45
attachable_access_entity_profile_name = aci_attachable_access_entity_profile.example.name
56
}

gen/definitions/properties.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -840,23 +840,24 @@ infraRsDomP:
840840
fvRsAepAtt:
841841
overwrites:
842842
relation_from_application_epg_to_attachable_access_entity_profiles: "relation_to_attachable_access_entity_profiles"
843+
resource_required:
844+
- "encapsulation"
843845
ignores:
844846
- "annotation"
845-
default_values:
846-
encap: "unknown"
847-
primaryEncap: "unknown"
848847
documentation:
849-
encap: "The encapsulation of the %s object. The encapsulation refers to the EPG VLAN when class preference is set to 'encap', or to the Secondary VLAN when class preference is set to 'useg'."
850-
primaryEncap: "The primary encapsulation of the %s object. This is used when the class preference is set to 'useg'."
848+
encap: "The encapsulation of the %s object."
849+
primaryEncap: "The primary encapsulation of the %s object."
851850
tnInfraAttEntityPName: "The name of the Attachable Access Entity Profile object"
852851
mode: "The mode of the %s object."
853852
test_values:
854853
default:
855-
encapsulation: "unknown"
854+
encapsulation: "vlan-100"
856855
primary_encapsulation: "unknown"
857856
all:
858857
encapsulation: "vlan-100"
859858
primary_encapsulation: "vlan-200"
859+
resource_required:
860+
encapsulation: "vlan-100"
860861

861862
fvAEPg:
862863
read_only_properties:

gen/testvars/fvAEPg.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ children:
158158
- key: "key_1"
159159
value: "test_value"
160160

161-
- encapsulation: "unknown"
161+
- encapsulation: "vlan-100"
162162
deployment_immediacy: "lazy"
163163
mode: "regular"
164164
primary_encapsulation: "unknown"

gen/testvars/fvRsAepAtt.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
default:
7-
encapsulation: "unknown"
7+
encapsulation: "vlan-100"
88
deployment_immediacy: "lazy"
99
mode: "regular"
1010
primary_encapsulation: "unknown"
@@ -16,6 +16,7 @@ datasource_required:
1616
attachable_access_entity_profile_name: "test_tn_infra_att_entity_p_name"
1717

1818
resource_required:
19+
encapsulation: "vlan-100"
1920
attachable_access_entity_profile_name: "test_tn_infra_att_entity_p_name"
2021

2122
all:

internal/provider/data_source_aci_application_epg.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/provider/data_source_aci_relation_from_application_epg_to_attachable_access_entity_profile.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)