Skip to content

Commit c7e11cc

Browse files
akinrosslhercot
authored andcommitted
[ignore] change relationship of monitoring policy for tenant to be consistent with other resources
1 parent 13562f7 commit c7e11cc

File tree

8 files changed

+76
-76
lines changed

8 files changed

+76
-76
lines changed

docs/data-sources/tenant.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ data "aci_tenant" "example" {
5050
* `name_alias` (nameAlias) - (string) The name alias of the Tenant object.
5151
* `owner_key` (ownerKey) - (string) The key for enabling clients to own their data for entity correlation.
5252
* `owner_tag` (ownerTag) - (string) A tag for enabling clients to add their own data. For example, to indicate who created this object.
53-
* `relation_to_tenant_monitoring_policy` - (map) A map of Relation To Tenant Monitoring Policy (ACI object [fvRsTenantMonPol](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fvRsTenantMonPol/overview)) pointing to Monitoring Policy (ACI Object [monEPGPol](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/monEPGPol/overview)).
54-
* `annotation` (annotation) - (string) The annotation of the Relation To Tenant Monitoring Policy object.
53+
* `relation_to_monitoring_policy` - (map) A map of Relation From Tenant To Monitoring Policy (ACI object [fvRsTenantMonPol](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fvRsTenantMonPol/overview)) pointing to Monitoring Policy (ACI Object [monEPGPol](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/monEPGPol/overview)).
54+
* `annotation` (annotation) - (string) The annotation of the Relation From Tenant To Monitoring Policy object.
5555
* `monitoring_policy_name` (tnMonEPGPolName) - (string) The name of the monitoring policy.
5656
* `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.
5757
* `key` (key) - (string) The key used to uniquely identify this configuration object.

docs/resources/tenant.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ resource "aci_tenant" "full_example" {
5252
name_alias = "name_alias_1"
5353
owner_key = "owner_key_1"
5454
owner_tag = "owner_tag_1"
55-
relation_to_tenant_monitoring_policy = {
55+
relation_to_monitoring_policy = {
5656
annotation = "annotation_1"
5757
monitoring_policy_name = aci_monitoring_policy.example.name
5858
annotations = [
@@ -104,10 +104,10 @@ All examples for the Tenant resource can be found in the [examples](https://gith
104104
* `name_alias` (nameAlias) - (string) The name alias of the Tenant object.
105105
* `owner_key` (ownerKey) - (string) The key for enabling clients to own their data for entity correlation.
106106
* `owner_tag` (ownerTag) - (string) A tag for enabling clients to add their own data. For example, to indicate who created this object.
107-
* `relation_to_tenant_monitoring_policy` - (map) A map of Relation To Tenant Monitoring Policy (ACI object [fvRsTenantMonPol](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fvRsTenantMonPol/overview)) pointing to Monitoring Policy (ACI Object [monEPGPol](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/monEPGPol/overview)) which can be configured using the [aci_monitoring_policy](https://registry.terraform.io/providers/CiscoDevNet/aci/latest/docs/resources/monitoring_policy) resource.
107+
* `relation_to_monitoring_policy` - (map) A map of Relation From Tenant To Monitoring Policy (ACI object [fvRsTenantMonPol](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fvRsTenantMonPol/overview)) pointing to Monitoring Policy (ACI Object [monEPGPol](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/monEPGPol/overview)) which can be configured using the [aci_monitoring_policy](https://registry.terraform.io/providers/CiscoDevNet/aci/latest/docs/resources/monitoring_policy) resource.
108108
#### Optional ####
109109

110-
* `annotation` (annotation) - (string) The annotation of the Relation To Tenant Monitoring Policy object.
110+
* `annotation` (annotation) - (string) The annotation of the Relation From Tenant To Monitoring Policy object.
111111
- Default: `orchestrator:terraform`
112112
* `monitoring_policy_name` (tnMonEPGPolName) - (string) The name of the monitoring policy.
113113
* `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.

examples/resources/aci_tenant/resource-all-attributes.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ resource "aci_tenant" "full_example" {
66
name_alias = "name_alias_1"
77
owner_key = "owner_key_1"
88
owner_tag = "owner_tag_1"
9-
relation_to_tenant_monitoring_policy = {
9+
relation_to_monitoring_policy = {
1010
annotation = "annotation_1"
1111
monitoring_policy_name = aci_monitoring_policy.example.name
1212
annotations = [

gen/definitions/classes.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ fvTenant:
1616
migration_version: 1
1717
migration_blocks:
1818
fvRsTenantMonPol:
19-
relation_fv_rs_tenant_mon_pol: relation_to_tenant_monitoring_policy.monitoring_policy_name
19+
relation_fv_rs_tenant_mon_pol: relation_from_tenant_to_monitoring_policy.monitoring_policy_name
2020

2121
fvRsTenantMonPol:
22-
resource_name: "relation_to_tenant_monitoring_policy"
22+
resource_name: "relation_from_tenant_to_monitoring_policy"
2323

2424
fvAEPg:
2525
resource_name: "application_epg"

gen/testvars/fvTenant.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ all:
2929
owner_tag: "owner_tag_1"
3030

3131
children:
32-
relation_to_tenant_monitoring_policy:
32+
relation_to_monitoring_policy:
3333
- annotation: "annotation_1"
3434
monitoring_policy_name: "default"
3535
deletable_child: false

internal/provider/data_source_aci_tenant.go

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

internal/provider/resource_aci_tenant.go

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

0 commit comments

Comments
 (0)