Skip to content

Commit

Permalink
[ignore] fix plan does not detect read-only attributes changed when n…
Browse files Browse the repository at this point in the history
…othing else is changed in plan
  • Loading branch information
akinross committed Jan 23, 2025
1 parent 3e11e79 commit 7702431
Show file tree
Hide file tree
Showing 16 changed files with 978 additions and 247 deletions.
68 changes: 68 additions & 0 deletions gen/definitions/properties.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,21 @@ fvRsCons:
parent_dependency: "fvAp"
- class_name: "fvAEPg"
parent_dependency: "fvAp"
targets:
- class_name: "vzBrCP"
parent_dependency: "fvTenant"
overwrite_parent_dn_key: "tenant_dn"
target_dn: "uni/tn-test_tenant/brc-contract_name_0"
relation_resource_name: "contract"
properties:
name: "contract_name_0"
- class_name: "vzBrCP"
parent_dependency: "fvTenant"
overwrite_parent_dn_key: "tenant_dn"
target_dn: "uni/tn-test_tenant/brc-contract_name_1"
relation_resource_name: "contract"
properties:
name: "contract_name_1"

fvRsProv:
ignores:
Expand All @@ -490,13 +505,43 @@ fvRsConsIf:
parent_dependency: "fvAp"
- class_name: "fvAEPg"
parent_dependency: "fvAp"
targets:
- class_name: "vzCPIf"
parent_dependency: "fvTenant"
overwrite_parent_dn_key: "tenant_dn"
target_dn: "uni/tn-test_tenant/cif-imported_contract_name_0"
relation_resource_name: "imported_contract"
properties:
name: "imported_contract_name_0"
- class_name: "vzCPIf"
parent_dependency: "fvTenant"
overwrite_parent_dn_key: "tenant_dn"
target_dn: "uni/tn-test_tenant/cif-imported_contract_name_1"
relation_resource_name: "imported_contract"
properties:
name: "imported_contract_name_1"

fvRsProtBy:
parents:
- class_name: "fvESg"
parent_dependency: "fvAp"
- class_name: "fvAEPg"
parent_dependency: "fvAp"
targets:
- class_name: "vzTaboo"
parent_dependency: "fvTenant"
overwrite_parent_dn_key: "tenant_dn"
target_dn: "uni/tn-test_tenant/taboo-taboo_contract_name_0"
relation_resource_name: "taboo_contract"
properties:
name: "taboo_contract_name_0"
- class_name: "vzTaboo"
parent_dependency: "fvTenant"
overwrite_parent_dn_key: "tenant_dn"
target_dn: "uni/tn-test_tenant/taboo-taboo_contract_name_1"
relation_resource_name: "taboo_contract"
properties:
name: "taboo_contract_name_1"

fvRsIntraEpg:
documentation:
Expand Down Expand Up @@ -759,6 +804,29 @@ fvAEPg:
fvRsAEPgMonPol:
documentation:
tnMonEPGPolName: "The name of the monitoring policy."
test_values:
all:
monitoring_policy_name: "default"

fvRsCustQosPol:
test_values:
all:
custom_qos_policy_name: "default"

fvRsTrustCtrl:
test_values:
all:
trust_control_policy_name: "default"

fvRsDppPol:
test_values:
all:
data_plane_policing_policy_name: "default"

fvRsBd:
test_values:
all:
bridge_domain_name: "default"

fvRsFcPathAtt:
default_values:
Expand Down
286 changes: 209 additions & 77 deletions gen/templates/resource.go.tmpl

Large diffs are not rendered by default.

76 changes: 71 additions & 5 deletions gen/testvars/fvAEPg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ children:

relation_to_application_epg_monitoring_policy:
- annotation: "annotation_1"
monitoring_policy_name: "monitoring_policy_name_1"
monitoring_policy_name: "default"
deletable_child: true
children:
annotations:
Expand All @@ -103,7 +103,7 @@ children:

relation_to_bridge_domain:
- annotation: "annotation_1"
bridge_domain_name: "bridge_domain_name_1"
bridge_domain_name: "default"
deletable_child: false

children:
Expand Down Expand Up @@ -201,7 +201,7 @@ children:

relation_to_custom_qos_policy:
- annotation: "annotation_1"
custom_qos_policy_name: "custom_qos_policy_name_1"
custom_qos_policy_name: "default"
deletable_child: false

children:
Expand Down Expand Up @@ -304,7 +304,7 @@ children:

relation_to_data_plane_policing_policy:
- annotation: "annotation_1"
data_plane_policing_policy_name: "data_plane_policing_policy_name_1"
data_plane_policing_policy_name: "default"
deletable_child: true
children:
annotations:
Expand Down Expand Up @@ -610,7 +610,7 @@ children:

relation_to_trust_control_policy:
- annotation: "annotation_1"
trust_control_policy_name: "trust_control_policy_name_1"
trust_control_policy_name: "default"
deletable_child: true
children:
annotations:
Expand Down Expand Up @@ -648,6 +648,50 @@ parents:
class_in_parent: false
test_type: apic
child_targets:
- class_name: "vzBrCP"
target_dn: "uni/tn-test_tenant/brc-contract_name_0"
relation_resource_name: "contract"
static: false
target_dn_ref: "aci_contract.test_contract_0.id"
parent_dependency: "fvTenant"
parent_dependency_dn_ref: "aci_tenant.test.id"
target_resource_name: "contract"
parent_dn_key: "tenant_dn"
properties:
name: "contract_name_0"
- class_name: "vzBrCP"
target_dn: "uni/tn-test_tenant/brc-contract_name_1"
relation_resource_name: "contract"
static: false
target_dn_ref: "aci_contract.test_contract_1.id"
parent_dependency: "fvTenant"
parent_dependency_dn_ref: "aci_tenant.test.id"
target_resource_name: "contract"
parent_dn_key: "tenant_dn"
properties:
name: "contract_name_1"
- class_name: "vzCPIf"
target_dn: "uni/tn-test_tenant/cif-imported_contract_name_0"
relation_resource_name: "imported_contract"
static: false
target_dn_ref: "aci_imported_contract.test_imported_contract_0.id"
parent_dependency: "fvTenant"
parent_dependency_dn_ref: "aci_tenant.test.id"
target_resource_name: "imported_contract"
parent_dn_key: "tenant_dn"
properties:
name: "imported_contract_name_0"
- class_name: "vzCPIf"
target_dn: "uni/tn-test_tenant/cif-imported_contract_name_1"
relation_resource_name: "imported_contract"
static: false
target_dn_ref: "aci_imported_contract.test_imported_contract_1.id"
parent_dependency: "fvTenant"
parent_dependency_dn_ref: "aci_tenant.test.id"
target_resource_name: "imported_contract"
parent_dn_key: "tenant_dn"
properties:
name: "imported_contract_name_1"
- class_name: "vmmDomP"
target_dn: "uni/vmmp-VMware/dom-domain_1"
relation_resource_name: "domain"
Expand Down Expand Up @@ -680,6 +724,28 @@ child_targets:
target_dn: "topology/pod-1/paths-101/pathep-[eth1/2]"
relation_resource_name: "static_path"
static: true
- class_name: "vzTaboo"
target_dn: "uni/tn-test_tenant/taboo-taboo_contract_name_0"
relation_resource_name: "taboo_contract"
static: false
target_dn_ref: "aci_taboo_contract.test_taboo_contract_0.id"
parent_dependency: "fvTenant"
parent_dependency_dn_ref: "aci_tenant.test.id"
target_resource_name: "taboo_contract"
parent_dn_key: "tenant_dn"
properties:
name: "taboo_contract_name_0"
- class_name: "vzTaboo"
target_dn: "uni/tn-test_tenant/taboo-taboo_contract_name_1"
relation_resource_name: "taboo_contract"
static: false
target_dn_ref: "aci_taboo_contract.test_taboo_contract_1.id"
parent_dependency: "fvTenant"
parent_dependency_dn_ref: "aci_tenant.test.id"
target_resource_name: "taboo_contract"
parent_dn_key: "tenant_dn"
properties:
name: "taboo_contract_name_1"
- class_name: "fvAEPg"
target_dn: "uni/tn-test_tenant/ap-test_ap/epg-epg_2"
relation_resource_name: "contract_master"
Expand Down
44 changes: 44 additions & 0 deletions gen/testvars/fvESg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,50 @@ parents:
class_in_parent: false
test_type: apic
child_targets:
- class_name: "vzBrCP"
target_dn: "uni/tn-test_tenant/brc-contract_name_0"
relation_resource_name: "contract"
static: false
target_dn_ref: "aci_contract.test_contract_0.id"
parent_dependency: "fvTenant"
parent_dependency_dn_ref: "aci_tenant.test.id"
target_resource_name: "contract"
parent_dn_key: "tenant_dn"
properties:
name: "contract_name_0"
- class_name: "vzBrCP"
target_dn: "uni/tn-test_tenant/brc-contract_name_1"
relation_resource_name: "contract"
static: false
target_dn_ref: "aci_contract.test_contract_1.id"
parent_dependency: "fvTenant"
parent_dependency_dn_ref: "aci_tenant.test.id"
target_resource_name: "contract"
parent_dn_key: "tenant_dn"
properties:
name: "contract_name_1"
- class_name: "vzCPIf"
target_dn: "uni/tn-test_tenant/cif-imported_contract_name_0"
relation_resource_name: "imported_contract"
static: false
target_dn_ref: "aci_imported_contract.test_imported_contract_0.id"
parent_dependency: "fvTenant"
parent_dependency_dn_ref: "aci_tenant.test.id"
target_resource_name: "imported_contract"
parent_dn_key: "tenant_dn"
properties:
name: "imported_contract_name_0"
- class_name: "vzCPIf"
target_dn: "uni/tn-test_tenant/cif-imported_contract_name_1"
relation_resource_name: "imported_contract"
static: false
target_dn_ref: "aci_imported_contract.test_imported_contract_1.id"
parent_dependency: "fvTenant"
parent_dependency_dn_ref: "aci_tenant.test.id"
target_resource_name: "imported_contract"
parent_dn_key: "tenant_dn"
properties:
name: "imported_contract_name_1"
- class_name: "fvESg"
target_dn: "uni/tn-test_tenant/ap-test_ap/esg-esg_0"
relation_resource_name: "contract_master"
Expand Down
23 changes: 23 additions & 0 deletions gen/testvars/fvRsCons.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,27 @@ parents:
parent_dn: "aci_endpoint_security_group.test.id"
class_in_parent: false
test_type: both
targets:
- class_name: "vzBrCP"
target_dn: "uni/tn-test_tenant/brc-contract_name_0"
target_dn_ref: "aci_contract.test_contract_0.id"
parent_dependency: "fvTenant"
parent_dependency_dn_ref: "aci_tenant.test.id"
target_resource_name: "contract"
relation_resource_name: "contract"
parent_dn_key: "tenant_dn"
static: false
properties:
name: "contract_name_0"
- class_name: "vzBrCP"
target_dn: "uni/tn-test_tenant/brc-contract_name_1"
target_dn_ref: "aci_contract.test_contract_1.id"
parent_dependency: "fvTenant"
parent_dependency_dn_ref: "aci_tenant.test.id"
target_resource_name: "contract"
relation_resource_name: "contract"
parent_dn_key: "tenant_dn"
static: false
properties:
name: "contract_name_1"
class_version: 1.0(1e)-
23 changes: 23 additions & 0 deletions gen/testvars/fvRsConsIf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,27 @@ parents:
parent_dn: "aci_endpoint_security_group.test.id"
class_in_parent: false
test_type: both
targets:
- class_name: "vzCPIf"
target_dn: "uni/tn-test_tenant/cif-imported_contract_name_0"
target_dn_ref: "aci_imported_contract.test_imported_contract_0.id"
parent_dependency: "fvTenant"
parent_dependency_dn_ref: "aci_tenant.test.id"
target_resource_name: "imported_contract"
relation_resource_name: "imported_contract"
parent_dn_key: "tenant_dn"
static: false
properties:
name: "imported_contract_name_0"
- class_name: "vzCPIf"
target_dn: "uni/tn-test_tenant/cif-imported_contract_name_1"
target_dn_ref: "aci_imported_contract.test_imported_contract_1.id"
parent_dependency: "fvTenant"
parent_dependency_dn_ref: "aci_tenant.test.id"
target_resource_name: "imported_contract"
relation_resource_name: "imported_contract"
parent_dn_key: "tenant_dn"
static: false
properties:
name: "imported_contract_name_1"
class_version: 1.0(1e)-
23 changes: 23 additions & 0 deletions gen/testvars/fvRsProtBy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,27 @@ parents:
parent_dn: "aci_application_epg.test.id"
class_in_parent: false
test_type: both
targets:
- class_name: "vzTaboo"
target_dn: "uni/tn-test_tenant/taboo-taboo_contract_name_0"
target_dn_ref: "aci_taboo_contract.test_taboo_contract_0.id"
parent_dependency: "fvTenant"
parent_dependency_dn_ref: "aci_tenant.test.id"
target_resource_name: "taboo_contract"
relation_resource_name: "taboo_contract"
parent_dn_key: "tenant_dn"
static: false
properties:
name: "taboo_contract_name_0"
- class_name: "vzTaboo"
target_dn: "uni/tn-test_tenant/taboo-taboo_contract_name_1"
target_dn_ref: "aci_taboo_contract.test_taboo_contract_1.id"
parent_dependency: "fvTenant"
parent_dependency_dn_ref: "aci_tenant.test.id"
target_resource_name: "taboo_contract"
relation_resource_name: "taboo_contract"
parent_dn_key: "tenant_dn"
static: false
properties:
name: "taboo_contract_name_1"
class_version: 1.0(1e)-
Loading

0 comments on commit 7702431

Please sign in to comment.