diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-custom-default-policy.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-custom-default-policy.cfg index ac82e74791a..c93505a7ed6 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-custom-default-policy.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-custom-default-policy.cfg @@ -3,13 +3,13 @@ agent KernelFib environment KERNELFIB_PROGRAM_ALL_ECMP=1 ! flow tracking hardware - tracker WAN-FLOW-TRACKER - record export on inactive timeout 70000 + tracker custom_flow_track_name + record export on inactive timeout 50000 record export on interval 5000 - exporter DPI-EXPORTER + exporter ayush_exporter collector 127.0.0.1 local interface Loopback0 - template interval 5000 + template interval 40000 no shutdown ! service routing protocols model multi-agent @@ -150,14 +150,14 @@ ip security interface Dps1 description DPS Interface mtu 9214 - flow tracker hardware WAN-FLOW-TRACKER + flow tracker hardware custom_flow_track_name ip address 192.168.255.1/32 ! interface Ethernet1 description ATT_666 no shutdown no switchport - flow tracker hardware WAN-FLOW-TRACKER + flow tracker hardware custom_flow_track_name ip address dhcp dhcp client accept default-route ! @@ -165,14 +165,14 @@ interface Ethernet2 description Colt_10555 no shutdown no switchport - flow tracker hardware WAN-FLOW-TRACKER + flow tracker hardware custom_flow_track_name ip address 172.15.5.5/31 ! interface Ethernet3 description Comcast-5G_AF830 no shutdown no switchport - flow tracker hardware WAN-FLOW-TRACKER + flow tracker hardware custom_flow_track_name ip address 172.20.20.20/31 ! interface Loopback0 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-common-path-group.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-common-path-group.cfg index 7116ebfb920..f8c97c5a5fc 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-common-path-group.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-common-path-group.cfg @@ -9,7 +9,7 @@ flow tracking hardware exporter DPI-EXPORTER collector 127.0.0.1 local interface Loopback0 - template interval 5000 + template interval 3000000 no shutdown ! service routing protocols model multi-agent diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-default-policy.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-default-policy.cfg index 76812d5decd..52e5089ec03 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-default-policy.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-default-policy.cfg @@ -9,7 +9,7 @@ flow tracking hardware exporter DPI-EXPORTER collector 127.0.0.1 local interface Loopback0 - template interval 5000 + template interval 3000000 no shutdown ! service routing protocols model multi-agent diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg index 3dcfd09791f..ab8307f6185 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg @@ -9,7 +9,7 @@ flow tracking hardware exporter DPI-EXPORTER collector 127.0.0.1 local interface Loopback0 - template interval 5000 + template interval 3000000 no shutdown ! service routing protocols model multi-agent diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2A.cfg index 656b1d9843c..504aa45d9f8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2A.cfg @@ -9,7 +9,7 @@ flow tracking hardware exporter DPI-EXPORTER collector 127.0.0.1 local interface Loopback0 - template interval 5000 + template interval 3000000 no shutdown ! service routing protocols model multi-agent diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2B.cfg index dc935ef05e2..0885f310fac 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2B.cfg @@ -9,7 +9,7 @@ flow tracking hardware exporter DPI-EXPORTER collector 127.0.0.1 local interface Loopback0 - template interval 5000 + template interval 3000000 no shutdown ! service routing protocols model multi-agent diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder.cfg index 601641517c7..4654efb51c5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder.cfg @@ -9,7 +9,7 @@ flow tracking hardware exporter DPI-EXPORTER collector 127.0.0.1 local interface Loopback0 - template interval 5000 + template interval 3000000 no shutdown ! service routing protocols model multi-agent diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder1.cfg index 3242f8571f6..c7404e665cf 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder1.cfg @@ -9,7 +9,7 @@ flow tracking hardware exporter DPI-EXPORTER collector 127.0.0.1 local interface Loopback0 - template interval 5000 + template interval 3000000 no shutdown ! service routing protocols model multi-agent diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder2.cfg index 74c36e42643..ff9a5c545da 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder2.cfg @@ -9,7 +9,7 @@ flow tracking hardware exporter DPI-EXPORTER collector 127.0.0.1 local interface Loopback0 - template interval 5000 + template interval 3000000 no shutdown ! service routing protocols model multi-agent diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1A.cfg index 756272caebd..34b90323296 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1A.cfg @@ -9,7 +9,7 @@ flow tracking hardware exporter DPI-EXPORTER collector 127.0.0.1 local interface Loopback0 - template interval 5000 + template interval 3000000 no shutdown ! service routing protocols model multi-agent diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1B.cfg index 2e536fdc077..ee9ee532a7c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1B.cfg @@ -9,7 +9,7 @@ flow tracking hardware exporter DPI-EXPORTER collector 127.0.0.1 local interface Loopback0 - template interval 5000 + template interval 3000000 no shutdown ! service routing protocols model multi-agent diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router1.cfg index b1b2405c3d5..fc9469cc9a3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router1.cfg @@ -9,7 +9,7 @@ flow tracking hardware exporter DPI-EXPORTER collector 127.0.0.1 local interface Loopback0 - template interval 5000 + template interval 3000000 no shutdown ! service routing protocols model multi-agent diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router2.cfg index a748afb6e79..a013823f984 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router2.cfg @@ -9,7 +9,7 @@ flow tracking hardware exporter DPI-EXPORTER collector 127.0.0.1 local interface Loopback0 - template interval 5000 + template interval 3000000 no shutdown ! service routing protocols model multi-agent diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-custom-default-policy.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-custom-default-policy.yml index fd242805543..75b4202d6ba 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-custom-default-policy.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-custom-default-policy.yml @@ -113,7 +113,7 @@ ethernet_interfaces: description: ATT_666 dhcp_client_accept_default_route: true flow_tracker: - hardware: WAN-FLOW-TRACKER + hardware: custom_flow_track_name - name: Ethernet2 peer_type: l3_interface ip_address: 172.15.5.5/31 @@ -121,7 +121,7 @@ ethernet_interfaces: type: routed description: Colt_10555 flow_tracker: - hardware: WAN-FLOW-TRACKER + hardware: custom_flow_track_name - name: Ethernet3 peer_type: l3_interface ip_address: 172.20.20.20/31 @@ -129,7 +129,7 @@ ethernet_interfaces: type: routed description: Comcast-5G_AF830 flow_tracker: - hardware: WAN-FLOW-TRACKER + hardware: custom_flow_track_name loopback_interfaces: - name: Loopback0 description: Router_ID @@ -177,16 +177,16 @@ agents: flow_tracking: hardware: trackers: - - name: WAN-FLOW-TRACKER + - name: custom_flow_track_name record_export: - on_inactive_timeout: 70000 + on_inactive_timeout: 50000 on_interval: 5000 exporters: - - name: DPI-EXPORTER + - name: ayush_exporter collector: host: 127.0.0.1 local_interface: Loopback0 - template_interval: 5000 + template_interval: 40000 shutdown: false ip_extcommunity_lists: - name: ECL-EVPN-SOO @@ -387,7 +387,7 @@ dps_interfaces: mtu: 9214 ip_address: 192.168.255.1/32 flow_tracker: - hardware: WAN-FLOW-TRACKER + hardware: custom_flow_track_name vxlan_interface: Vxlan1: description: cv-pathfinder-edge-custom-default-policy_VTEP diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-no-common-path-group.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-no-common-path-group.yml index bfb58aa02e0..8734272afee 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-no-common-path-group.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-no-common-path-group.yml @@ -302,7 +302,7 @@ flow_tracking: collector: host: 127.0.0.1 local_interface: Loopback0 - template_interval: 5000 + template_interval: 3000000 shutdown: false ip_extcommunity_lists: - name: ECL-EVPN-SOO diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-no-default-policy.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-no-default-policy.yml index 0e6f188ed0b..b6d8648f075 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-no-default-policy.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-no-default-policy.yml @@ -203,7 +203,7 @@ flow_tracking: collector: host: 127.0.0.1 local_interface: Loopback0 - template_interval: 5000 + template_interval: 3000000 shutdown: false ip_extcommunity_lists: - name: ECL-EVPN-SOO diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge.yml index 10dcc8013a0..61b15f18e57 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge.yml @@ -339,7 +339,7 @@ flow_tracking: collector: host: 127.0.0.1 local_interface: Loopback0 - template_interval: 5000 + template_interval: 3000000 shutdown: false ip_extcommunity_lists: - name: ECL-EVPN-SOO diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2A.yml index ffc341c8eef..aa482c24e0e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2A.yml @@ -405,7 +405,7 @@ flow_tracking: collector: host: 127.0.0.1 local_interface: Loopback0 - template_interval: 5000 + template_interval: 3000000 shutdown: false ip_extcommunity_lists: - name: ECL-EVPN-SOO diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2B.yml index 9697decb666..b7599893fa6 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge2B.yml @@ -404,7 +404,7 @@ flow_tracking: collector: host: 127.0.0.1 local_interface: Loopback0 - template_interval: 5000 + template_interval: 3000000 shutdown: false ip_extcommunity_lists: - name: ECL-EVPN-SOO diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder.yml index ea8dca73d26..61ff3a0c528 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder.yml @@ -175,7 +175,7 @@ flow_tracking: collector: host: 127.0.0.1 local_interface: Loopback0 - template_interval: 5000 + template_interval: 3000000 shutdown: false ip_extcommunity_lists: - name: ECL-EVPN-SOO diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder1.yml index f504d19f882..e42b178f549 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder1.yml @@ -187,7 +187,7 @@ flow_tracking: collector: host: 127.0.0.1 local_interface: Loopback0 - template_interval: 5000 + template_interval: 3000000 shutdown: false ip_extcommunity_lists: - name: ECL-EVPN-SOO diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder2.yml index 8610459f334..a39fcb6c8b8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder2.yml @@ -195,7 +195,7 @@ flow_tracking: collector: host: 127.0.0.1 local_interface: Loopback0 - template_interval: 5000 + template_interval: 3000000 shutdown: false ip_extcommunity_lists: - name: ECL-EVPN-SOO diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1A.yml index eb5cb278f7d..c08a7a617e7 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1A.yml @@ -382,7 +382,7 @@ flow_tracking: collector: host: 127.0.0.1 local_interface: Loopback0 - template_interval: 5000 + template_interval: 3000000 shutdown: false ip_extcommunity_lists: - name: ECL-EVPN-SOO diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1B.yml index e2dd8008e90..e028c40e5a0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit1B.yml @@ -382,7 +382,7 @@ flow_tracking: collector: host: 127.0.0.1 local_interface: Loopback0 - template_interval: 5000 + template_interval: 3000000 shutdown: false ip_extcommunity_lists: - name: ECL-EVPN-SOO diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router1.yml index dd81325d643..e38144f7410 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router1.yml @@ -217,7 +217,7 @@ flow_tracking: collector: host: 127.0.0.1 local_interface: Loopback0 - template_interval: 5000 + template_interval: 3000000 shutdown: false ip_extcommunity_lists: - name: ECL-EVPN-SOO diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router2.yml index a5e0d26e6e2..f6efab25d74 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/uplink_lan_wan_router2.yml @@ -226,7 +226,7 @@ flow_tracking: collector: host: 127.0.0.1 local_interface: Loopback0 - template_interval: 5000 + template_interval: 3000000 shutdown: false ip_extcommunity_lists: - name: ECL-EVPN-SOO diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/cv-pathfinder-edge-custom-default-policy.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/cv-pathfinder-edge-custom-default-policy.yml index e94b941bbf1..1b0958edb6f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/cv-pathfinder-edge-custom-default-policy.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/cv-pathfinder-edge-custom-default-policy.yml @@ -7,6 +7,14 @@ underlay_routing_protocol: none bgp_as: 65000 +cv_pathfinder_flow_tracking: + flow_tracker_name: custom_flow_track_name + record_export: + on_inactive_timeout: 50000 + exporter: + name: ayush_exporter + template_interval: 40000 + cv_pathfinder_regions: - name: AVD_Land_West id: 42 diff --git a/ansible_collections/arista/avd/plugins/plugin_utils/eos_designs_shared_utils/wan.py b/ansible_collections/arista/avd/plugins/plugin_utils/eos_designs_shared_utils/wan.py index b73f99ddaa0..b1b7b409767 100644 --- a/ansible_collections/arista/avd/plugins/plugin_utils/eos_designs_shared_utils/wan.py +++ b/ansible_collections/arista/avd/plugins/plugin_utils/eos_designs_shared_utils/wan.py @@ -371,11 +371,9 @@ def wan_flow_tracker_name(self: SharedUtils) -> str: """ Return the name of the WAN flow tracking object Used in both network services, underlay and overlay python modules. - - TODO make this configurable - TODO may need to return exporter name also later """ - return "WAN-FLOW-TRACKER" + flow_tracking = get(self.hostvars, "cv_pathfinder_flow_tracking", default={}) + return get(flow_tracking, "flow_tracker_name", default="WAN-FLOW-TRACKER") @cached_property def is_cv_pathfinder_router(self: SharedUtils) -> bool: diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/wan-cv-pathfinder-flow-tracking.md b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/wan-cv-pathfinder-flow-tracking.md new file mode 100644 index 00000000000..cbd6378538d --- /dev/null +++ b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/wan-cv-pathfinder-flow-tracking.md @@ -0,0 +1,37 @@ + +=== "Table" + + | Variable | Type | Required | Default | Value Restrictions | Description | + | -------- | ---- | -------- | ------- | ------------------ | ----------- | + | [cv_pathfinder_flow_tracking](## "cv_pathfinder_flow_tracking") | Dictionary | | | | Define the flow tracking parameters for this topology. | + | [  flow_tracker_name](## "cv_pathfinder_flow_tracking.flow_tracker_name") | String | | `WAN-FLOW-TRACKER` | | Flow Tracker Name | + | [  record_export](## "cv_pathfinder_flow_tracking.record_export") | Dictionary | | | | | + | [    on_inactive_timeout](## "cv_pathfinder_flow_tracking.record_export.on_inactive_timeout") | Integer | | `70000` | Min: 3000
Max: 900000 | Flow record inactive export timeout in milliseconds | + | [  exporter](## "cv_pathfinder_flow_tracking.exporter") | Dictionary | | | | | + | [    name](## "cv_pathfinder_flow_tracking.exporter.name") | String | | `DPI-EXPORTER` | | Exporter Name | + | [    template_interval](## "cv_pathfinder_flow_tracking.exporter.template_interval") | Integer | | `3000000` | Min: 5000
Max: 3600000 | Template interval in milliseconds | + +=== "YAML" + + ```yaml + # Define the flow tracking parameters for this topology. + cv_pathfinder_flow_tracking: + + # Flow Tracker Name + flow_tracker_name: + record_export: + + # Flow record inactive export timeout in milliseconds + on_inactive_timeout: + exporter: + + # Exporter Name + name: + + # Template interval in milliseconds + template_interval: + ``` diff --git a/ansible_collections/arista/avd/roles/eos_designs/python_modules/overlay/flow_tracking.py b/ansible_collections/arista/avd/roles/eos_designs/python_modules/overlay/flow_tracking.py index eaffbddf851..ebad8411c84 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/python_modules/overlay/flow_tracking.py +++ b/ansible_collections/arista/avd/roles/eos_designs/python_modules/overlay/flow_tracking.py @@ -5,6 +5,8 @@ from functools import cached_property +from ansible_collections.arista.avd.plugins.plugin_utils.utils import get + from .utils import UtilsMixin @@ -24,13 +26,20 @@ def flow_tracking(self) -> dict | None: if not self.shared_utils.is_cv_pathfinder_router: return None + flow_tracking = get(self._hostvars, "cv_pathfinder_flow_tracking", default={}) + exporter = get(flow_tracking, "exporter", default={}) + exporter_name = get(exporter, "name", default="DPI-EXPORTER") + template_interval = get(exporter, "template_interval", default=3000000) + on_inactive_timeout = get(flow_tracking, "record_export.on_inactive_timeout", default=70000) return { "hardware": { "trackers": [ { "name": self.shared_utils.wan_flow_tracker_name, - "record_export": {"on_inactive_timeout": 70000, "on_interval": 5000}, - "exporters": [{"name": "DPI-EXPORTER", "collector": {"host": "127.0.0.1"}, "local_interface": "Loopback0", "template_interval": 5000}], + "record_export": {"on_inactive_timeout": on_inactive_timeout, "on_interval": 5000}, + "exporters": [ + {"name": exporter_name, "collector": {"host": "127.0.0.1"}, "local_interface": "Loopback0", "template_interval": template_interval} + ], } ], "shutdown": False, diff --git a/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.jsonschema.json b/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.jsonschema.json index c247bed7ab8..9b03698bfdc 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.jsonschema.json +++ b/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.jsonschema.json @@ -4381,6 +4381,65 @@ ], "title": "Custom Structured Configuration Prefix" }, + "cv_pathfinder_flow_tracking": { + "description": "Define the flow tracking parameters for this topology.", + "type": "object", + "properties": { + "flow_tracker_name": { + "type": "string", + "default": "WAN-FLOW-TRACKER", + "description": "Flow Tracker Name", + "title": "Flow Tracker Name" + }, + "record_export": { + "type": "object", + "properties": { + "on_inactive_timeout": { + "description": "Flow record inactive export timeout in milliseconds", + "type": "integer", + "minimum": 3000, + "maximum": 900000, + "default": 70000, + "title": "On Inactive Timeout" + } + }, + "additionalProperties": false, + "patternProperties": { + "^_.+$": {} + }, + "title": "Record Export" + }, + "exporter": { + "type": "object", + "properties": { + "name": { + "type": "string", + "default": "DPI-EXPORTER", + "description": "Exporter Name", + "title": "Name" + }, + "template_interval": { + "description": "Template interval in milliseconds", + "type": "integer", + "minimum": 5000, + "maximum": 3600000, + "default": 3000000, + "title": "Template Interval" + } + }, + "additionalProperties": false, + "patternProperties": { + "^_.+$": {} + }, + "title": "Exporter" + } + }, + "additionalProperties": false, + "patternProperties": { + "^_.+$": {} + }, + "title": "Cv Pathfinder Flow Tracking" + }, "cv_pathfinder_regions": { "description": "PREVIEW: This key is currently not supported\nDefine the SDWAN hierarchy for the device.", "type": "array", diff --git a/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.yml b/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.yml index c2308799ed2..05952f297c7 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.yml +++ b/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.yml @@ -602,6 +602,42 @@ keys: existing keys will be replaced.\n" default: - custom_structured_configuration_ + cv_pathfinder_flow_tracking: + documentation_options: + table: wan-cv-pathfinder-flow-tracking + description: Define the flow tracking parameters for this topology. + type: dict + keys: + flow_tracker_name: + type: str + default: WAN-FLOW-TRACKER + description: Flow Tracker Name + record_export: + type: dict + keys: + on_inactive_timeout: + description: Flow record inactive export timeout in milliseconds + type: int + convert_types: + - str + min: 3000 + max: 900000 + default: 70000 + exporter: + type: dict + keys: + name: + type: str + default: DPI-EXPORTER + description: Exporter Name + template_interval: + description: Template interval in milliseconds + type: int + convert_types: + - str + min: 5000 + max: 3600000 + default: 3000000 cv_pathfinder_regions: documentation_options: table: wan-cv-pathfinder-regions diff --git a/ansible_collections/arista/avd/roles/eos_designs/schemas/schema_fragments/cv_pathfinder_flow_tracking.schema.yml b/ansible_collections/arista/avd/roles/eos_designs/schemas/schema_fragments/cv_pathfinder_flow_tracking.schema.yml new file mode 100644 index 00000000000..7d32a66996d --- /dev/null +++ b/ansible_collections/arista/avd/roles/eos_designs/schemas/schema_fragments/cv_pathfinder_flow_tracking.schema.yml @@ -0,0 +1,45 @@ +# Copyright (c) 2023-2024 Arista Networks, Inc. +# Use of this source code is governed by the Apache License 2.0 +# that can be found in the LICENSE file. +# yaml-language-server: $schema=../../../../plugins/plugin_utils/schema/avd_meta_schema.json +# Line above is used by RedHat's YAML Schema vscode extension +# Use Ctrl + Space to get suggestions for every field. Autocomplete will pop up after typing 2 letters. +type: dict +keys: + cv_pathfinder_flow_tracking: + documentation_options: + table: wan-cv-pathfinder-flow-tracking + description: |- + Define the flow tracking parameters for this topology. + type: dict + keys: + flow_tracker_name: + type: str + default: WAN-FLOW-TRACKER + description: Flow Tracker Name + record_export: + type: dict + keys: + on_inactive_timeout: + description: Flow record inactive export timeout in milliseconds + type: int + convert_types: + - str + min: 3000 + max: 900000 + default: 70000 + exporter: + type: dict + keys: + name: + type: str + default: DPI-EXPORTER + description: Exporter Name + template_interval: + description: Template interval in milliseconds + type: int + convert_types: + - str + min: 5000 + max: 3600000 + default: 3000000