Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ACI Metadata Update PR (DCNE-248) #1295

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/data-sources/bridge_domain.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ 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.
* `service_bd_routing_disable` (serviceBdRoutingDisable) - (string) Disable Routing on service BD.
* `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
4 changes: 4 additions & 0 deletions docs/resources/bridge_domain.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ resource "aci_bridge_domain" "full_example_tenant" {
name_alias = "name_alias_1"
owner_key = "owner_key_1"
owner_tag = "owner_tag_1"
service_bd_routing_disable = "no"
bridge_domain_type = "fc"
unicast_routing = "no"
l2_unknown_unicast_flooding = "proxy"
Expand Down Expand Up @@ -383,6 +384,9 @@ 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.
* `service_bd_routing_disable` (serviceBdRoutingDisable) - (string) Disable Routing on service BD.
- Default: `no`
- Valid Values: `no`, `yes`.
* `bridge_domain_type` (type) - (string) The domain type of the Bridge Domain object.
- Default: `regular`
- Valid Values: `fc`, `regular`.
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/key_ring.md
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ All examples for the Key Ring resource can be found in the [examples](https://gi
* `key` (key) - (string) The private key of the certificate. This sensitive value is excluded from the resource's lifecycle configuration and is not tracked by Terraform.
* `key_type` (keyType) - (string) The type used by the provided key.
- Default: `RSA`
- Valid Values: `ECC`, `RSA`, `indeterminate`.
- Valid Values: `ECC`, `RSA`.
* `modulus` (modulus) - (string) The length of the encryption keys. A longer key length increases the difficulty of breaking the key.
- Default: `mod2048`
- Valid Values: `mod1024`, `mod1536`, `mod2048`, `mod3072`, `mod4096`, `mod512`, `none`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ resource "aci_bridge_domain" "full_example_tenant" {
name_alias = "name_alias_1"
owner_key = "owner_key_1"
owner_tag = "owner_tag_1"
service_bd_routing_disable = "no"
bridge_domain_type = "fc"
unicast_routing = "no"
l2_unknown_unicast_flooding = "proxy"
Expand Down
26 changes: 25 additions & 1 deletion gen/meta/fvAEPg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2322,6 +2322,14 @@

],
"label": " "},
{ "value": "0x80000", "localName": "dynamic-port-binding-deprecated",
"platformFlavors": [

],
"comment": [
"Port Binding Validation"
],
"label": "Dynamic port binding (lateBinding) is deprecated. Please choose a different port binding policy. "},
{ "value": "8", "localName": "encap-assignment",
"platformFlavors": [

Expand Down Expand Up @@ -2364,6 +2372,14 @@

],
"label": "IDs Not Allocated "},
{ "value": "0x20000", "localName": "incorrect-active-standby-uplink-order",
"platformFlavors": [

],
"comment": [
"Active/Standby Uplink Config Validations"
],
"label": "incorrect active/standby config. Active uplink cannot be empty or null if standby uplink is configured OR Active uplink cannot be 0 as no uplink get assigned in the vCenter. "},
{ "value": "1024", "localName": "instrimedcy-unsupported",
"platformFlavors": [

Expand Down Expand Up @@ -2399,7 +2415,15 @@
"platformFlavors": [

],
"label": "Not Associated With Management Zone "}
"label": "Not Associated With Management Zone "},
{ "value": "0x40000", "localName": "unsupported-vrf-enforcement-direction",
"platformFlavors": [

],
"comment": [
"VRF Enforce Direction Validations"
],
"label": "Unsupported VRF enforcement directon. Only egress direction is supported for common policy config "}
],
"default": "none",
"platformFlavors": [
Expand Down
72 changes: 61 additions & 11 deletions gen/meta/fvBD.json
Original file line number Diff line number Diff line change
Expand Up @@ -2046,7 +2046,7 @@
"isConfigurable": true,
"propGlobalId": "34472",
"propLocalId": "8158",
"label": "Optimize Wan Bandwidth between sites",
"label": "Optimize Wan Bandwidth Between Sites",
"baseType": "scalar:Bool",
"modelType": "scalar:Bool",
"needsPropDelimiters": false,
Expand Down Expand Up @@ -2176,7 +2176,7 @@
"isConfigurable": false,
"propGlobalId": "1691",
"propLocalId": "859",
"label": "bcastP",
"label": "Broadcast Policy",
"baseType": "address:IPv4",
"modelType": "mcast:Group",
"needsPropDelimiters": false,
Expand Down Expand Up @@ -2251,7 +2251,7 @@
"isConfigurable": false,
"propGlobalId": "26448",
"propLocalId": "153",
"label": "configIssues",
"label": "Configuration Issues",
"baseType": "scalar:Bitmask64",
"modelType": "fv:BDConfIssuesType",
"needsPropDelimiters": false,
Expand Down Expand Up @@ -2606,7 +2606,7 @@
"isConfigurable": true,
"propGlobalId": "30545",
"propLocalId": "7595",
"label": "Allow BUM traffic between sites",
"label": "Allow BUM Traffic Between Sites",
"baseType": "scalar:Bool",
"modelType": "scalar:Bool",
"needsPropDelimiters": false,
Expand Down Expand Up @@ -2653,7 +2653,7 @@
"isConfigurable": true,
"propGlobalId": "33178",
"propLocalId": "7928",
"label": "Allow l2Stretch between sites",
"label": "Allow L2Stretch Between Sites",
"baseType": "scalar:Bool",
"modelType": "scalar:Bool",
"needsPropDelimiters": false,
Expand Down Expand Up @@ -2697,7 +2697,7 @@
"isConfigurable": true,
"propGlobalId": "21254",
"propLocalId": "5433",
"label": "Ip Learning",
"label": "IP Learning",
"baseType": "scalar:Bool",
"modelType": "scalar:Bool",
"needsPropDelimiters": false,
Expand Down Expand Up @@ -2744,7 +2744,7 @@
"isConfigurable": true,
"propGlobalId": "47406",
"propLocalId": "10834",
"label": "ipv6 Multicast Allow",
"label": "IPv6 Multicast Allow",
"baseType": "scalar:Bool",
"modelType": "scalar:Bool",
"needsPropDelimiters": false,
Expand Down Expand Up @@ -2854,7 +2854,7 @@
"isConfigurable": true,
"propGlobalId": "20851",
"propLocalId": "5375",
"label": "Limit IP learning to BD subnets only",
"label": "Limit IP Learning to BD Subnets",
"baseType": "scalar:Bool",
"modelType": "scalar:Bool",
"needsPropDelimiters": false,
Expand Down Expand Up @@ -3380,7 +3380,7 @@
"isConfigurable": false,
"propGlobalId": "1695",
"propLocalId": "551",
"label": "pcTag",
"label": "PC Tag",
"baseType": "scalar:Uint32",
"modelType": "vz:GPCTag",
"needsPropDelimiters": false,
Expand Down Expand Up @@ -3445,7 +3445,7 @@
"isConfigurable": false,
"propGlobalId": "1694",
"propLocalId": "1",
"label": "scope",
"label": "Scope",
"baseType": "scalar:Uint32",
"modelType": "fv:ScopeId",
"needsPropDelimiters": false,
Expand Down Expand Up @@ -3503,6 +3503,56 @@
"isDeprecated": false,
"isHidden": false
},
"serviceBdRoutingDisable": {
"versions": "6.0(4c)-",
"comment": [
"Disable Routing on service BD"
],
"isConfigurable": true,
"propGlobalId": "70465",
"propLocalId": "15461",
"label": "Disable Routing on Service BD",
"baseType": "scalar:Bool",
"modelType": "scalar:Bool",
"needsPropDelimiters": false,
"uitype": "boolean",
"createOnly": false,
"readWrite": true,
"readOnly": false,
"isNaming": false,
"secure": false,
"implicit": false,
"mandatory": false,
"isOverride": false,
"isLike": false,
"validValues": [
{ "value": "no", "localName": "defaultValue",
"platformFlavors": [

],
"comment": [
"By default, routing is enabled on service BD"
],
"label": " "},
{ "value": "false", "localName": "no",
"platformFlavors": [

],
"label": "No "},
{ "value": "true", "localName": "yes",
"platformFlavors": [

],
"label": "Yes "}
],
"default": "no",
"platformFlavors": [

],
"isNxosConverged": false,
"isDeprecated": false,
"isHidden": false
},
"status": {
"versions": "1.0(1e)-",
"comment": [
Expand Down Expand Up @@ -3689,7 +3739,7 @@
"isConfigurable": true,
"propGlobalId": "1696",
"propLocalId": "886",
"label": "Unknown Mac Unicast Action",
"label": "Unknown MAC Unicast Action",
"baseType": "scalar:Enum8",
"modelType": "l2:UnkMacUcastAct",
"needsPropDelimiters": false,
Expand Down
26 changes: 25 additions & 1 deletion gen/meta/fvESg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2251,6 +2251,14 @@

],
"label": " "},
{ "value": "0x80000", "localName": "dynamic-port-binding-deprecated",
"platformFlavors": [

],
"comment": [
"Port Binding Validation"
],
"label": "Dynamic port binding (lateBinding) is deprecated. Please choose a different port binding policy. "},
{ "value": "8", "localName": "encap-assignment",
"platformFlavors": [

Expand Down Expand Up @@ -2293,6 +2301,14 @@

],
"label": "IDs Not Allocated "},
{ "value": "0x20000", "localName": "incorrect-active-standby-uplink-order",
"platformFlavors": [

],
"comment": [
"Active/Standby Uplink Config Validations"
],
"label": "incorrect active/standby config. Active uplink cannot be empty or null if standby uplink is configured OR Active uplink cannot be 0 as no uplink get assigned in the vCenter. "},
{ "value": "1024", "localName": "instrimedcy-unsupported",
"platformFlavors": [

Expand Down Expand Up @@ -2328,7 +2344,15 @@
"platformFlavors": [

],
"label": "Not Associated With Management Zone "}
"label": "Not Associated With Management Zone "},
{ "value": "0x40000", "localName": "unsupported-vrf-enforcement-direction",
"platformFlavors": [

],
"comment": [
"VRF Enforce Direction Validations"
],
"label": "Unsupported VRF enforcement directon. Only egress direction is supported for common policy config "}
],
"default": "none",
"platformFlavors": [
Expand Down
Loading