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

[ignore] fix plan does not detect read-only attributes changed when nothing else is changed in plan (DCNE-266) #1310

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
dae84c9
[ignore] fix plan does not detect read-only attributes changed when n…
akinross Jan 20, 2025
61705c6
[ignore] add support for null to plan when state is null and plan unk…
akinross Jan 21, 2025
a8cc8aa
[ignore] fix test dependencies for templates with legacy attributes, …
akinross Jan 24, 2025
95ff302
[ignore] change modify plan to never set legacy attributes
akinross Jan 28, 2025
559ad71
[ignore] fix plan modification to only set to unknown when not provid…
akinross Jan 28, 2025
85a0dcc
[ignore] fix annotation in children from legacy attribute input
akinross Jan 29, 2025
bdc7a72
[ignore] fix annotation in children from legacy attribute input
akinross Jan 29, 2025
cf031b4
[ignore] remove update to null when set is unknown
akinross Jan 29, 2025
a082133
[ignore] remove logic for deprecated attribute relation_fv_rs_path_att
akinross Jan 29, 2025
c0cd67d
[ignore] add code commet for the SetToSetNullWhenStateIsNullPlanIsUnk…
akinross Jan 30, 2025
9d2014e
[ignore] add legacy testvars with dependecies for all legacy attributes
akinross Jan 31, 2025
ca5a708
[ignore] add test configuration for legacy attributes
akinross Jan 31, 2025
77eb159
[ignore] fix setting of singlenested attributes to null in plan modif…
akinross Jan 31, 2025
ed697f2
[ignore] add test for legacy attributes to resource tests
akinross Jan 31, 2025
c3084aa
[ignore] deprecate relation_fv_rs_bd_to_profile because the configura…
akinross Jan 31, 2025
31c4cd5
[ignore] add test case for creation of bd/epg/esg with legacy attributes
akinross Feb 3, 2025
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
5 changes: 0 additions & 5 deletions gen/definitions/classes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ fvAEPg:
relation_fv_rs_aepg_mon_pol: relation_to_application_epg_monitoring_policy.monitoring_policy_name
fvRsIntraEpg:
relation_fv_rs_intra_epg: relation_to_intra_epg_contracts.contract_name
fvRsPathAtt:
relation_fv_rs_path_att: relation_to_static_paths.target_dn
fvRsNodeAtt:
relation_fv_rs_node_att: relation_to_static_leafs
node_dn: relation_to_static_leafs.target_dn
Expand Down Expand Up @@ -128,7 +126,6 @@ qosDot1PClass:
- "Tenants -> Policies -> Protocol -> Custom QoS -> Dot1p Classifiers"
sub_category: "Tenant Policies"


fhsTrustCtrlPol:
ui_locations:
- "Tenants -> Policies -> Protocol -> First Hop Security -> Trust Control Policies"
Expand Down Expand Up @@ -729,8 +726,6 @@ fvBD:
flt_type: relation_to_netflow_monitor_policies.filter_type
fvRsBDToOut:
relation_fv_rs_bd_to_out: relation_to_l3_outsides.l3_outside_name
fvRsBDToProfile:
relation_fv_rs_bd_to_profile: relation_to_route_control_profile.route_control_profile_name
fvRsBDToRelayP:
relation_fv_rs_bd_to_relay_p: relation_to_dhcp_relay_policy.dhcp_relay_policy_name
fvRsCtx:
Expand Down
212 changes: 206 additions & 6 deletions gen/definitions/properties.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,21 @@ fvRsScope:
parents:
- class_name: "fvESg"
parent_dependency: "fvAp"
- class_name: "fvAEPg"
parent_dependency: "fvAp"
targets:
- class_name: "fvCtx"
parent_dependency: "fvTenant"
overwrite_parent_dn_key: "tenant_dn"
target_dn: "uni/tn-test_tenant/ctx-vrf_name_1"
relation_resource_name: "vrf"
properties:
name: "vrf_name_1"
- class_name: "fvCtx"
parent_dependency: "fvTenant"
overwrite_parent_dn_key: "tenant_dn"
target_dn: "uni/tn-test_tenant/ctx-vrf_name_0"
relation_resource_name: "vrf"
properties:
name: "vrf_name_0"

fvRsCons:
ignores:
Expand All @@ -476,6 +489,23 @@ fvRsCons:
parent_dependency: "fvAp"
- class_name: "fvAEPg"
parent_dependency: "fvAp"
targets:
- class_name: "vzBrCP"
shared_classes:
- "fvRsProv"
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 @@ -487,6 +517,7 @@ fvRsProv:
parent_dependency: "fvAp"
- class_name: "fvAEPg"
parent_dependency: "fvAp"


fvRsConsIf:
ignore_custom_type_docs:
Expand All @@ -496,13 +527,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 @@ -543,17 +604,17 @@ fvRsSecInherited:
- class_name: "fvAEPg"
parent_dependency: "fvAp"
overwrite_parent_dn_key: "application_profile_dn"
target_dn: "uni/tn-test_tenant/ap-test_ap/epg-epg_2"
target_dn: "uni/tn-test_tenant/ap-test_ap/epg-epg_0"
relation_resource_name: "contract_master"
properties:
name: "epg_2"
name: "epg_0"
- class_name: "fvAEPg"
parent_dependency: "fvAp"
overwrite_parent_dn_key: "application_profile_dn"
target_dn: "uni/tn-test_tenant/ap-test_ap/epg-epg_3"
target_dn: "uni/tn-test_tenant/ap-test_ap/epg-epg_1"
relation_resource_name: "contract_master"
properties:
name: "epg_3"
name: "epg_1"

fvCrtrn:
overwrites:
Expand Down Expand Up @@ -767,6 +828,50 @@ fvAEPg:
fvRsAEPgMonPol:
documentation:
tnMonEPGPolName: "The name of the monitoring policy."
targets:
- class_name: "monEPGPol"
parent_dependency: "fvTenant"
overwrite_parent_dn_key: "tenant_dn"
target_dn: "uni/tn-test_tenant/monepg-monitoring_policy_name_1"
relation_resource_name: "monitoring_policy"
properties:
name: "monitoring_policy_name_1"

fvRsCustQosPol:
targets:
- class_name: "qosCustomPol"
parent_dependency: "fvTenant"
target_dn: "uni/tn-test_tenant/qoscustom-custom_qos_policy_name_1"
relation_resource_name: "custom_qos_policy"
properties:
name: "custom_qos_policy_name_1"

fvRsTrustCtrl:
targets:
- class_name: "fhsTrustCtrlPol"
parent_dependency: "fvTenant"
target_dn: "uni/tn-test_tenant/trustctrlpol-trust_control_policy_name_1"
relation_resource_name: "trust_control_policy"
properties:
name: "trust_control_policy_name_1"

fvRsDppPol:
targets:
- class_name: "qosDppPol"
parent_dependency: "fvTenant"
target_dn: "uni/tn-test_tenant/qosdpppol-data_plane_policing_policy_name_1"
relation_resource_name: "data_plane_policing_policy"
properties:
name: "data_plane_policing_policy_name_1"

fvRsBd:
targets:
- class_name: "fvBD"
parent_dependency: "fvTenant"
target_dn: "uni/tn-test_tenant/BD-bridge_domain_name_1"
relation_resource_name: "bridge_domain_name"
properties:
name: "bridge_domain_name_1"

fvRsFcPathAtt:
default_values:
Expand Down Expand Up @@ -1448,6 +1553,11 @@ fvBD:
endpoint_move_detection_mode: "garp"
l2_unknown_unicast_flooding: "proxy"
limit_ip_learn_to_subnets: "yes"
legacy:
custom_mac_address: "00:22:BD:F8:19:FE"
virtual_mac_address: "00:22:BD:F8:19:FB"
link_local_ipv6_address: "fe80::1"
unicast_routing: "yes"
parents:
- class_name: "fvTenant"
parent_dependency: ""
Expand All @@ -1458,6 +1568,14 @@ fvRsABDPolMonPol:
relation_from_bridge_domain_to_monitoring_policy: "relation_to_monitor_policy"
documentation:
tnMonEPGPolName: "The name of the Monitoring Policy object."
targets:
- class_name: "monEPGPol"
parent_dependency: "fvTenant"
overwrite_parent_dn_key: "tenant_dn"
target_dn: "uni/tn-test_tenant/monepg-monitoring_policy_name_1"
relation_resource_name: "monitoring_policy"
properties:
name: "monitoring_policy_name_1"

fvRsBdToEpRet:
overwrites:
Expand All @@ -1466,18 +1584,40 @@ fvRsBdToEpRet:
documentation:
tnFvEpRetPolName: "The name of the Endpoint Retention Policy object."
resolveAct: "The action to take for resolving the Endpoint Retention Policy object."
targets:
- class_name: "fvEpRetPol"
parent_dependency: "fvTenant"
overwrite_parent_dn_key: "tenant_dn"
target_dn: "uni/tn-test_tenant/epRPol-end_point_retention_policy_name_1"
relation_resource_name: "end_point_retention_policy"
properties:
name: "end_point_retention_policy_name_1"

fvRsBDToFhs:
overwrites:
relation_from_bridge_domain_to_first_hop_security_policy: "relation_to_first_hop_security_policy"
documentation:
tnFhsBDPolName: "The name of the First Hop Security Policy object."
targets:
- class_name: "fhsBDPol"
parent_dependency: "fvTenant"
target_dn: "uni/tn-test_tenant/bdpol-first_hop_security_policy_name_1"
relation_resource_name: "first_hop_security_policy"
properties:
name: "first_hop_security_policy_name_1"

fvRsBDToNdP:
overwrites:
relation_from_bridge_domain_to_neighbor_discovery_interface_policy: "relation_to_neighbor_discovery_interface_policy"
documentation:
tnNdIfPolName: "The name of the Neighbor Discovery Interface Policy object."
targets:
- class_name: "ndIfPol"
parent_dependency: "fvTenant"
target_dn: "uni/tn-test_tenant/ndifpol-neighbor_discovery_interface_policy_name_1"
relation_resource_name: "neighbor_discovery_interface_policy"
properties:
name: "neighbor_discovery_interface_policy_name_1"

fvRsBDToNetflowMonitorPol:
overwrites:
Expand All @@ -1501,6 +1641,13 @@ fvRsBDToNetflowMonitorPol:
- class_name: "fvBD"
parent_dependency: "fvTenant"
parent_dn: "aci_bridge_domain.test.id"
targets:
- class_name: "netflowMonitorPol"
parent_dependency: "fvTenant"
target_dn: "uni/tn-test_tenant/monitorpol-netflow_monitor_policy_name_1"
relation_resource_name: "netflow_monitor_policy_name"
properties:
name: "netflow_monitor_policy_name_1"

fvRsBDToOut:
overwrites:
Expand All @@ -1513,12 +1660,51 @@ fvRsBDToOut:
fvRsBDToProfile:
overwrites:
relation_from_bridge_domain_to_route_control_profile: "relation_to_route_control_profile"
targets:
- class_name: "fvCtx"
parent_dependency: "fvTenant"
overwrite_parent_dn_key: "tenant_dn"
target_dn: "uni/tn-test_tenant/ctx-vrf_name_1"
relation_resource_name: "vrf"
properties:
name: "vrf_name_1"
- class_name: "l3extOut"
parent_dependency: "fvTenant"
overwrite_parent_dn_key: "tenant_dn"
target_dn: "uni/tn-test_tenant/out-abr_l3_outside_name_1"
relation_resource_name: "l3_outside"
properties:
name: "l3_outside_name_1"
relation_l3ext_rs_ectx: aci_vrf.test_vrf_0.id
- class_name: "l3extOut"
parent_dependency: "fvTenant"
overwrite_parent_dn_key: "tenant_dn"
target_dn: "uni/tn-test_tenant/out-abr_l3_outside_name_0"
relation_resource_name: "l3_outside"
properties:
name: "l3_outside_name_0"
relation_l3ext_rs_ectx: aci_vrf.test_vrf_0.id
- class_name: "rtctrlProfile"
parent_dependency: "l3extOut"
target_dn: "uni/tn-test_tenant/out-abr_l3_outside_name_0/prof-route_control_profile_name_1"
parent_dependency_dn_ref: aci_l3_outside.test_l3_outside_0.id
relation_resource_name: "route_control_profile"
properties:
name: "route_control_profile_name_1"

fvRsBDToRelayP:
overwrites:
relation_from_bridge_domain_to_dhcp_relay_policy: "relation_to_dhcp_relay_policy"
documentation:
tnDhcpRelayPName: "The name of the DHCP Relay Policy object."
targets:
- class_name: "dhcpRelayP"
parent_dependency: "fvTenant"
overwrite_parent_dn_key: "tenant_dn"
target_dn: "uni/tn-test_tenant/relayp-dhcp_relay_policy_name_1"
relation_resource_name: "dhcp_relay_policy"
properties:
name: "dhcp_relay_policy_name_1"

fvRsCtx:
documentation:
Expand All @@ -1527,10 +1713,24 @@ fvRsCtx:
fvRsIgmpsn:
documentation:
tnIgmpSnoopPolName: "The name of the IGMP Snooping Policy object."
targets:
- class_name: "igmpSnoopPol"
parent_dependency: "fvTenant"
target_dn: "uni/tn-test_tenant/snPol-igmp_snooping_policy_name_1"
relation_resource_name: "igmp_snooping_policy"
properties:
name: "igmp_snooping_policy_name_1"

fvRsMldsn:
documentation:
tnMldSnoopPolName: "The name of the MLD Snooping Policy object."
targets:
- class_name: "mldSnoopPol"
parent_dependency: "fvTenant"
target_dn: "uni/tn-test_tenant/mldsnoopPol-mld_snooping_policy_name_1"
relation_resource_name: "mld_snooping_policy"
properties:
name: "mld_snooping_policy_name_1"

fvRogueExceptionMac:
test_values:
Expand Down
Loading
Loading