FIx CI.

aristanetworks · Sep 20, 2024 · 51fd063 · 51fd063
1 parent 40eaa27
commit 51fd063
Show file tree

Hide file tree

Showing 32 changed files with 47 additions and 36 deletions.
diff --git a/..._designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-edge-1.cfg b/..._designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-edge-1.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/..._designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-edge-2.cfg b/..._designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-edge-2.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/..._designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-edge-3.cfg b/..._designs_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-edge-3.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...ns_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-pathfinder-1.cfg b/...ns_unit_tests/intended/configs/cv-pathfinder-custom-control-plane-policy-pathfinder-1.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...cule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-custom-default-policy.cfg b/...cule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-custom-default-policy.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker custom_flow_track_name
       record export on inactive timeout 50000
       record export on interval 300331
-      !
       exporter ayush_exporter
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-default-policy.cfg b/...molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-default-policy.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg b/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge1.cfg b/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge1.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2A.cfg b/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2A.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2B.cfg b/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2B.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge3A.cfg b/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge3A.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge3B.cfg b/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge3B.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/.../arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder.cfg b/.../arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder1.cfg b/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder1.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder2.cfg b/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder2.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1A.cfg b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1A.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1B.cfg b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit1B.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...sta/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf1.cfg b/...sta/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf1.cfg
@@ -13,8 +13,13 @@ vlan internal order ascending range 1006 1199
 !
 flow tracking sampled
    sample 10000
-   !
    tracker FLOW-TRACKER
+      record export on inactive timeout 70000
+      record export on interval 300000
+      exporter CV-TELEMETRY
+         collector 127.0.0.1
+         local interface Loopback0
+         template interval 3600000
    no shutdown
 !
 transceiver qsfp default-mode 4x10G

diff --git a/...sta/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf2.cfg b/...sta/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf2.cfg
@@ -13,8 +13,13 @@ vlan internal order ascending range 1006 1199
 !
 flow tracking sampled
    sample 10000
-   !
    tracker FLOW-TRACKER
+      record export on inactive timeout 70000
+      record export on interval 300000
+      exporter CV-TELEMETRY
+         collector 127.0.0.1
+         local interface Loopback0
+         template interval 3600000
    no shutdown
 !
 transceiver qsfp default-mode 4x10G

diff --git a/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf1.cfg b/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf1.cfg
@@ -15,15 +15,14 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 50001
       record export on interval 300332
-      !
       exporter ayush_exporter
          collector 127.0.0.2
          local interface Loopback0
          template interval 40002
+   !
    tracker FLOW-TRACKER-3
       record export on inactive timeout 50000
       record export on interval 300331
-      !
       exporter ayush_exporter
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf2.cfg b/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf2.cfg
@@ -16,10 +16,21 @@ flow tracking sampled
    sample 50000
    hardware offload ipv4 ipv6
    hardware offload threshold minimum 1332 samples
-   !
    tracker FLOW-TRACKER-3
+      record export on inactive timeout 50000
+      record export on interval 300331
+      exporter ayush_exporter
+         collector 127.0.0.1
+         local interface Loopback0
+         template interval 40000
    !
    tracker FLOW-TRACKER-4
+      record export on inactive timeout 50020
+      record export on interval 300321
+      exporter ayush_exporter
+         collector 127.0.2.1
+         local interface Loopback0
+         template interval 40020
    no shutdown
 !
 transceiver qsfp default-mode 4x10G

diff --git a/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf3.cfg b/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf3.cfg
@@ -15,15 +15,14 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 50001
       record export on interval 300332
-      !
       exporter ayush_exporter
          collector 127.0.0.2
          local interface Loopback0
          template interval 40002
+   !
    tracker FLOW-TRACKER-3
       record export on inactive timeout 50000
       record export on interval 300331
-      !
       exporter ayush_exporter
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf4.cfg b/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-leaf4.cfg
@@ -15,15 +15,14 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 50001
       record export on interval 300332
-      !
       exporter ayush_exporter
          collector 127.0.0.2
          local interface Loopback0
          template interval 40002
+   !
    tracker FLOW-TRACKER-4
       record export on inactive timeout 50020
       record export on interval 300321
-      !
       exporter ayush_exporter
          collector 127.0.2.1
          local interface Loopback0

diff --git a/...rista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-spine1.cfg b/...rista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-spine1.cfg
@@ -13,11 +13,23 @@ vlan internal order ascending range 1006 1199
 !
 flow tracking sampled
    sample 10000
-   !
    tracker FLOW-TRACKER
+      record export on inactive timeout 50001
+      record export on interval 300332
+      exporter ayush_exporter
+         collector 127.0.0.2
+         local interface Loopback0
+         template interval 40002
    !
    tracker FLOW-TRACKER-1
       flow table size 4331 entries
+      record export on inactive timeout 50000
+      record export on interval 300331
+      record export mpls
+      exporter ayush_exporter
+         collector 127.0.0.1
+         local interface Loopback0
+         template interval 40000
    no shutdown
 !
 transceiver qsfp default-mode 4x10G

diff --git a/...rista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-spine2.cfg b/...rista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-spine2.cfg
@@ -15,15 +15,14 @@ flow tracking hardware
    tracker FLOW-TRACKER-1
       record export on inactive timeout 50000
       record export on interval 300331
-      !
       exporter ayush_exporter
          collector 127.0.0.1
          local interface Loopback0
          template interval 40000
+   !
    tracker FLOW-TRACKER-2
       record export on inactive timeout 50020
       record export on interval 300321
-      !
       exporter ayush_exporter
          collector 127.0.2.1
          local interface Loopback0

diff --git a/...olecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-edge-no-default-policy.cfg b/...olecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-edge-no-default-policy.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-edge.cfg b/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-edge.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-rr1.cfg b/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-rr1.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-rr2.cfg b/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/legacy-autovpn-rr2.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...ections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_l2leaf.cfg b/...ections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_l2leaf.cfg
@@ -13,8 +13,13 @@ vlan internal order ascending range 1006 1199
 !
 flow tracking sampled
    sample 10000
-   !
    tracker FLOW-TRACKER
+      record export on inactive timeout 70000
+      record export on interval 300000
+      exporter CV-TELEMETRY
+         collector 127.0.0.1
+         local interface Loopback0
+         template interval 3600000
    no shutdown
 !
 transceiver qsfp default-mode 4x10G

diff --git a/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router1.cfg b/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router1.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0

diff --git a/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router2.cfg b/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/configs/uplink_lan_wan_router2.cfg
@@ -15,7 +15,6 @@ flow tracking hardware
    tracker FLOW-TRACKER
       record export on inactive timeout 70000
       record export on interval 300000
-      !
       exporter CV-TELEMETRY
          collector 127.0.0.1
          local interface Loopback0