Updated tests

aristanetworks · Dec 16, 2024 · 79364ae · 79364ae
1 parent d25216b
commit 79364ae
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 220 deletions.
diff --git a/...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md b/...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md
@@ -4758,11 +4758,6 @@ interface Ethernet82
    switchport tap native vlan 10
    switchport tap identity 3 inner 5
    switchport tap mac-address dest 01:00:00:00:00:00 src 01:23:45:67:89:ab
-   switchport tap encapsulation gre protocol 0x1 strip
-   switchport tap encapsulation gre protocol 0x2 feature header length 3 strip
-   switchport tap encapsulation gre protocol 0x3 feature header length 2 strip re-encapsulation ethernet
-   switchport tap encapsulation gre protocol 0x4 strip re-encapsulation ethernet
-   switchport tap encapsulation gre strip
    switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 protocol 0x0 strip
    switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 strip
    switchport tap encapsulation gre destination 2.1.1.2 protocol 0x10 strip
@@ -4778,14 +4773,12 @@ interface Ethernet82
    switchport tool identity qinq
    switchport tool identity dot1q source dzgre port
    switchport tap truncation 150
-   switchport tool truncation
    switchport tap default group g1 group g2 group g3
    switchport tap default nexthop-group nexthop_g1 nexthop_g2 nexthop_g3
    switchport tap default interface ethernet4
    switchport tap default interface port-channel10
    switchport tool group set group1 group2 group3
    switchport tool dot1q remove outer 1
-   switchport tool dzgre preserve
 !
 interface Ethernet83
    description Test_tap_tool
@@ -4796,7 +4789,12 @@ interface Ethernet83
    switchport tool identity dot1q
    switchport tool identity qinq source dzgre policy inner port
    switchport tap truncation
-   switchport tool truncation 160
+!
+interface Ethernet84
+   switchport tap encapsulation gre protocol 0x1 strip
+   switchport tap encapsulation gre protocol 0x2 feature header length 3 strip
+   switchport tap encapsulation gre protocol 0x3 feature header length 2 strip re-encapsulation ethernet
+   switchport tap encapsulation gre protocol 0x4 strip re-encapsulation ethernet
 ```
 
 ### Port-Channel Interfaces
@@ -5547,10 +5545,6 @@ interface Port-Channel133
    switchport tap native vlan 10
    switchport tap identity 3
    switchport tap mac-address dest 01:00:00:00:00:00 src 01:23:45:67:89:ab
-   switchport tap encapsulation gre protocol 0x2 feature header length 3 strip
-   switchport tap encapsulation gre protocol 0x3 feature header length 2 strip re-encapsulation ethernet
-   switchport tap encapsulation gre protocol 0x10 strip
-   switchport tap encapsulation gre strip
    switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 protocol 0x0 strip
    switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 strip
    switchport tap encapsulation gre destination 1.1.1.3 source 1.1.1.4 strip
@@ -5565,24 +5559,27 @@ interface Port-Channel133
    switchport tool identity qinq
    switchport tool identity qinq source dzgre port inner policy
    switchport tap truncation
-   switchport tool truncation 160
    switchport tap default group g1 group g2 group g3
    switchport tap default nexthop-group nexthop_g1 nexthop_g2 nexthop_g3
    switchport tap default interface ethernet4
    switchport tap default interface port-channel10
    switchport tool group set group1 group2 group3
    switchport tool dot1q remove outer 1-2
-   switchport tool dzgre preserve
 !
 interface Port-Channel134
    description Test2_switchport_tap_tool
    switchport tap identity 3 inner 10
    switchport tap mac-address dest 01:00:00:00:00:00
    switchport tap encapsulation vxlan strip
+   switchport tap encapsulation gre strip
    switchport tool identity dot1q
    switchport tool identity dot1q source dzgre policy
    switchport tap truncation 120
-   switchport tool truncation
+!
+interface Port-Channel135
+   switchport tap encapsulation gre protocol 0x2 feature header length 3 strip
+   switchport tap encapsulation gre protocol 0x3 feature header length 2 strip re-encapsulation ethernet
+   switchport tap encapsulation gre protocol 0x10 strip
 ```
 
 ### Loopback Interfaces

diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg
@@ -2172,10 +2172,6 @@ interface Port-Channel133
    switchport tap native vlan 10
    switchport tap identity 3
    switchport tap mac-address dest 01:00:00:00:00:00 src 01:23:45:67:89:ab
-   switchport tap encapsulation gre protocol 0x2 feature header length 3 strip
-   switchport tap encapsulation gre protocol 0x3 feature header length 2 strip re-encapsulation ethernet
-   switchport tap encapsulation gre protocol 0x10 strip
-   switchport tap encapsulation gre strip
    switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 protocol 0x0 strip
    switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 strip
    switchport tap encapsulation gre destination 1.1.1.3 source 1.1.1.4 strip
@@ -2190,24 +2186,27 @@ interface Port-Channel133
    switchport tool identity qinq
    switchport tool identity qinq source dzgre port inner policy
    switchport tap truncation
-   switchport tool truncation 160
    switchport tap default group g1 group g2 group g3
    switchport tap default nexthop-group nexthop_g1 nexthop_g2 nexthop_g3
    switchport tap default interface ethernet4
    switchport tap default interface port-channel10
    switchport tool group set group1 group2 group3
    switchport tool dot1q remove outer 1-2
-   switchport tool dzgre preserve
 !
 interface Port-Channel134
    description Test2_switchport_tap_tool
    switchport tap identity 3 inner 10
    switchport tap mac-address dest 01:00:00:00:00:00
    switchport tap encapsulation vxlan strip
+   switchport tap encapsulation gre strip
    switchport tool identity dot1q
    switchport tool identity dot1q source dzgre policy
    switchport tap truncation 120
-   switchport tool truncation
+!
+interface Port-Channel135
+   switchport tap encapsulation gre protocol 0x2 feature header length 3 strip
+   switchport tap encapsulation gre protocol 0x3 feature header length 2 strip re-encapsulation ethernet
+   switchport tap encapsulation gre protocol 0x10 strip
 !
 interface Dps1
    description Test DPS Interface
@@ -3191,11 +3190,6 @@ interface Ethernet82
    switchport tap native vlan 10
    switchport tap identity 3 inner 5
    switchport tap mac-address dest 01:00:00:00:00:00 src 01:23:45:67:89:ab
-   switchport tap encapsulation gre protocol 0x1 strip
-   switchport tap encapsulation gre protocol 0x2 feature header length 3 strip
-   switchport tap encapsulation gre protocol 0x3 feature header length 2 strip re-encapsulation ethernet
-   switchport tap encapsulation gre protocol 0x4 strip re-encapsulation ethernet
-   switchport tap encapsulation gre strip
    switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 protocol 0x0 strip
    switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 strip
    switchport tap encapsulation gre destination 2.1.1.2 protocol 0x10 strip
@@ -3211,14 +3205,12 @@ interface Ethernet82
    switchport tool identity qinq
    switchport tool identity dot1q source dzgre port
    switchport tap truncation 150
-   switchport tool truncation
    switchport tap default group g1 group g2 group g3
    switchport tap default nexthop-group nexthop_g1 nexthop_g2 nexthop_g3
    switchport tap default interface ethernet4
    switchport tap default interface port-channel10
    switchport tool group set group1 group2 group3
    switchport tool dot1q remove outer 1
-   switchport tool dzgre preserve
 !
 interface Ethernet83
    description Test_tap_tool
@@ -3229,7 +3221,12 @@ interface Ethernet83
    switchport tool identity dot1q
    switchport tool identity qinq source dzgre policy inner port
    switchport tap truncation
-   switchport tool truncation 160
+!
+interface Ethernet84
+   switchport tap encapsulation gre protocol 0x1 strip
+   switchport tap encapsulation gre protocol 0x2 feature header length 3 strip
+   switchport tap encapsulation gre protocol 0x3 feature header length 2 strip re-encapsulation ethernet
+   switchport tap encapsulation gre protocol 0x4 strip re-encapsulation ethernet
 !
 interface Loopback0
    description EVPN_Overlay_Peering

diff --git a/.../arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/ethernet-interfaces.yml b/.../arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/ethernet-interfaces.yml
@@ -1874,7 +1874,6 @@ ethernet_interfaces:
           source: 01:23:45:67:89:ab
         encapsulation:
           gre:
-            strip: true
             destinations:
               - destination: 1.1.1.1
                 source: 1.1.1.2
@@ -1896,19 +1895,6 @@ ethernet_interfaces:
               - destination: 2.1.1.3
                 source: 2.1.1.4
                 strip: true
-            protocols:
-              - protocol: "0x1"
-                strip: true
-              - protocol: "0x2"
-                feature_header_length: 3
-                strip: true
-              - protocol: "0x3"
-                feature_header_length: 2
-                re_encapsulation_ethernet_header: true
-                strip: true
-              - protocol: "0x4"
-                re_encapsulation_ethernet_header: true
-                strip: true
       tool:
         mpls_pop_all: true
         encapsulation:
@@ -1918,14 +1904,11 @@ ethernet_interfaces:
         identity:
           tag: qinq
           dot1q_dzgre_source: port
-        truncation:
-          enabled: true
         groups:
           - group1
           - group2
           - group3
         dot1q_remove_outer_vlan_tag: 1
-        dzgre_preserve: true
 
   - name: Ethernet83
     description: Test_tap_tool
@@ -1945,6 +1928,22 @@ ethernet_interfaces:
         identity:
           tag: dot1q
           qinq_dzgre_source: policy inner port
-        truncation:
-          enabled: true
-          size: 160
+
+  - name: Ethernet84
+    switchport:
+      tap: 
+        encapsulation:
+          gre:
+            protocols:
+              - protocol: "0x1"
+                strip: true
+              - protocol: "0x2"
+                feature_header_length: 3
+                strip: true
+              - protocol: "0x3"
+                feature_header_length: 2
+                re_encapsulation_ethernet_header: true
+                strip: true
+              - protocol: "0x4"
+                re_encapsulation_ethernet_header: true
+                strip: true
diff --git a/...sta/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/port-channel-interfaces.yml b/...sta/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/port-channel-interfaces.yml
@@ -976,7 +976,6 @@ port_channel_interfaces:
           source: 01:23:45:67:89:ab
         encapsulation:
           gre:
-            strip: true
             destinations:
               - destination: 1.1.1.1
                 source: 1.1.1.2
@@ -996,16 +995,6 @@ port_channel_interfaces:
               - destination: 1.1.1.3
                 source: 1.1.1.4
                 strip: true
-            protocols:
-              - protocol: "0x10"
-                strip: true
-              - protocol: "0x2"
-                feature_header_length: 3
-                strip: true
-              - protocol: "0x3"
-                feature_header_length: 2
-                re_encapsulation_ethernet_header: true
-                strip: true
       tool:
         mpls_pop_all: true
         encapsulation:
@@ -1015,15 +1004,11 @@ port_channel_interfaces:
         identity:
           tag: qinq
           qinq_dzgre_source: port inner policy
-        truncation:
-          enabled: true
-          size: 160
         groups:
           - group1
           - group2
           - group3
         dot1q_remove_outer_vlan_tag: 1-2
-        dzgre_preserve: true
 
   - name: Port-Channel134
     description: Test2_switchport_tap_tool
@@ -1036,12 +1021,28 @@ port_channel_interfaces:
           destination: 01:00:00:00:00:00
         encapsulation:
           vxlan_strip: true
+          gre:
+            strip: true
         truncation:
           enabled: true
           size: 120
       tool:
-        truncation:
-          enabled: true
         identity:
           tag: dot1q
           dot1q_dzgre_source: policy
+
+  - name: Port-Channel135
+    switchport:
+      tap:
+        encapsulation:
+          gre:
+            protocols:
+              - protocol: "0x10"
+                strip: true
+              - protocol: "0x2"
+                feature_header_length: 3
+                strip: true
+              - protocol: "0x3"
+                feature_header_length: 2
+                re_encapsulation_ethernet_header: true
+                strip: true
diff --git a/...lections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md b/...lections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md
diff --git a/...ions/arista/avd/roles/eos_cli_config_gen/docs/tables/port-channel-interfaces.md b/...ions/arista/avd/roles/eos_cli_config_gen/docs/tables/port-channel-interfaces.md
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ethernet-interfaces.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ethernet-interfaces.j2
@@ -1083,13 +1083,6 @@ interface {{ ethernet_interface.name }}
 {%             endif %}
    {{ tap_truncation_cli }}
 {%         endif %}
-{%         if ethernet_interface.switchport.tool.truncation.enabled is arista.avd.defined(true) %}
-{%             set tool_truncation_cli = "switchport tool truncation" %}
-{%             if ethernet_interface.switchport.tool.truncation.size is arista.avd.defined %}
-{%                 set tool_truncation_cli = tool_truncation_cli ~ " " ~ ethernet_interface.switchport.tool.truncation.size %}
-{%             endif %}
-   {{ tool_truncation_cli }}
-{%         endif %}
 {%         if ethernet_interface.switchport.tap.default.groups is arista.avd.defined %}
    switchport tap default group {{ ethernet_interface.switchport.tap.default.groups | arista.avd.natural_sort | join(" group ") }}
 {%         endif %}