Multiple fixes as per review comments

aristanetworks · Jul 12, 2024 · 06cbda0 · 06cbda0
1 parent 2302af9
commit 06cbda0
Show file tree

Hide file tree

Showing 15 changed files with 696 additions and 481 deletions.
diff --git a/...ta/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md b/...ta/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md
@@ -365,9 +365,11 @@ interface Ethernet1
    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 vxlan strip
+   switchport tap mpls pop all
    switchport tap encapsulation gre strip
    switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 protocol 0x0000 strip
+   switchport tap encapsulation gre protocol 0x0000 strip
+   switchport tap encapsulation gre destination 2.1.1.2 protocol 0x0000 strip
    switchport tool mpls pop all
    switchport tool encapsulation vn-tag strip
    switchport tool encapsulation dot1br strip
@@ -382,6 +384,7 @@ interface Ethernet1
    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
    ip address 172.31.255.1/31
    ip verify unicast source reachable-via rx

diff --git a/...vd/molecule/eos_cli_config_gen/documentation/devices/port-channel-interfaces.md b/...vd/molecule/eos_cli_config_gen/documentation/devices/port-channel-interfaces.md
@@ -514,8 +514,11 @@ interface Port-Channel100
    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 mpls pop all
    switchport tap encapsulation gre strip
-   switchport tap encapsulation gre destination 1.1.1.1 protocol 0x0000 strip
+   switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 protocol 0x0000 strip
+   switchport tap encapsulation gre protocol 0x0000 strip
+   switchport tap encapsulation gre destination 2.1.1.2 protocol 0x0000 strip
    switchport tool mpls pop all
    switchport tool encapsulation vn-tag strip
    switchport tool encapsulation dot1br strip
@@ -524,11 +527,13 @@ interface Port-Channel100
    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-Channel100.101

diff --git a/...llections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ethernet-interfaces.cfg b/...llections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ethernet-interfaces.cfg
@@ -18,9 +18,11 @@ interface Ethernet1
    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 vxlan strip
+   switchport tap mpls pop all
    switchport tap encapsulation gre strip
    switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 protocol 0x0000 strip
+   switchport tap encapsulation gre protocol 0x0000 strip
+   switchport tap encapsulation gre destination 2.1.1.2 protocol 0x0000 strip
    switchport tool mpls pop all
    switchport tool encapsulation vn-tag strip
    switchport tool encapsulation dot1br strip
@@ -35,6 +37,7 @@ interface Ethernet1
    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
    ip address 172.31.255.1/31
    ip verify unicast source reachable-via rx

diff --git a/...tions/arista/avd/molecule/eos_cli_config_gen/intended/configs/port-channel-interfaces.cfg b/...tions/arista/avd/molecule/eos_cli_config_gen/intended/configs/port-channel-interfaces.cfg
@@ -168,8 +168,11 @@ interface Port-Channel100
    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 mpls pop all
    switchport tap encapsulation gre strip
-   switchport tap encapsulation gre destination 1.1.1.1 protocol 0x0000 strip
+   switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 protocol 0x0000 strip
+   switchport tap encapsulation gre protocol 0x0000 strip
+   switchport tap encapsulation gre destination 2.1.1.2 protocol 0x0000 strip
    switchport tool mpls pop all
    switchport tool encapsulation vn-tag strip
    switchport tool encapsulation dot1br strip
@@ -178,11 +181,13 @@ interface Port-Channel100
    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-Channel100.101

diff --git a/...ctions/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml b/...ctions/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml
@@ -63,11 +63,17 @@ ethernet_interfaces:
           src: 01:23:45:67:89:ab
         encapsulation:
           vxlan_strip: true
-          gre_strip: true
           gre:
-            destination: 1.1.1.1
-            source: 1.1.1.2
-            protocol: "0x0000"
+            - strip: true
+            - strip: true
+              destination: 1.1.1.1
+              source: 1.1.1.2
+              protocol: "0x0000"
+            - strip: true
+              protocol: "0x0000"
+            - strip: true
+              destination: 2.1.1.2
+              protocol: "0x0000"
       tool:
         mpls_pop_all: true
         encapsulation:
@@ -83,6 +89,7 @@ ethernet_interfaces:
           - group1
           - group2
           - group3
+        dot1q_remove_outer_vlan_tag: 1
         dzgre_preserve: true
     eos_cli: |
       comment

diff --git a/...ns/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/port-channel-interfaces.yml b/...ns/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/port-channel-interfaces.yml
@@ -138,10 +138,17 @@ port_channel_interfaces:
           dest: 01:00:00:00:00:00
           src: 01:23:45:67:89:ab
         encapsulation:
-          gre_strip: true
           gre:
-            destination: 1.1.1.1
-            protocol: "0x0000"
+            - strip: true
+            - strip: true
+              destination: 1.1.1.1
+              source: 1.1.1.2
+              protocol: "0x0000"
+            - strip: true
+              protocol: "0x0000"
+            - strip: true
+              destination: 2.1.1.2
+              protocol: "0x0000"
       tool:
         mpls_pop_all: true
         encapsulation:
@@ -158,6 +165,7 @@ port_channel_interfaces:
           - group1
           - group2
           - group3
+        dot1q_remove_outer_vlan_tag: 1-2
         dzgre_preserve: true
 
   - name: Port-Channel100.101

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
@@ -425,20 +425,20 @@
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;enabled</samp>](## "ethernet_interfaces.[].switchport.tap.truncation.enabled") | Boolean | Required |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;size</samp>](## "ethernet_interfaces.[].switchport.tap.truncation.size") | Integer |  |  | Min: 100<br>Max: 9236 | Ingress packet truncation size in bytes. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;mac_address</samp>](## "ethernet_interfaces.[].switchport.tap.mac_address") | Dictionary |  |  |  |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;src</samp>](## "ethernet_interfaces.[].switchport.tap.mac_address.src") | String |  |  |  | MAC address for the source. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;dest</samp>](## "ethernet_interfaces.[].switchport.tap.mac_address.dest") | String | Required |  |  | MAC address for the destination. |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;src</samp>](## "ethernet_interfaces.[].switchport.tap.mac_address.src") | String |  |  | Pattern: ^([0-9a-f]{2}:){5}[0-9a-f]{2}$ | MAC address for the source. |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;dest</samp>](## "ethernet_interfaces.[].switchport.tap.mac_address.dest") | String | Required |  | Pattern: ^([0-9a-f]{2}:){5}[0-9a-f]{2}$ | MAC address for the destination. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;encapsulation</samp>](## "ethernet_interfaces.[].switchport.tap.encapsulation") | Dictionary |  |  |  |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;vxlan_strip</samp>](## "ethernet_interfaces.[].switchport.tap.encapsulation.vxlan_strip") | Boolean |  |  |  | Strip VXLAN encapsulation header. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;gre_strip</samp>](## "ethernet_interfaces.[].switchport.tap.encapsulation.gre_strip") | Boolean | Required |  |  | Strip GRE encapsulation header. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;gre</samp>](## "ethernet_interfaces.[].switchport.tap.encapsulation.gre") | Dictionary |  |  |  |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;destination</samp>](## "ethernet_interfaces.[].switchport.tap.encapsulation.gre.destination") | String |  |  |  | Destination IP address of tunnel packets. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;source</samp>](## "ethernet_interfaces.[].switchport.tap.encapsulation.gre.source") | String |  |  |  | Source IP address of tunnel packets. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;protocol</samp>](## "ethernet_interfaces.[].switchport.tap.encapsulation.gre.protocol") | String |  |  |  | Protocol type in GRE header.<br>Protocol range: 0x0000-0xFFFF |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;vxlan_strip</samp>](## "ethernet_interfaces.[].switchport.tap.encapsulation.vxlan_strip") | Boolean |  |  |  | Strip VXLAN encapsulation header.<br>`encapsulation.vxlan_strip` and `mpls_pop_all` are mutually exclusive.<br>`mpls_pop_all` takes precedence. |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;gre</samp>](## "ethernet_interfaces.[].switchport.tap.encapsulation.gre") | List, items: Dictionary |  |  |  |  |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;strip</samp>](## "ethernet_interfaces.[].switchport.tap.encapsulation.gre.[].strip") | Boolean | Required |  |  | Strip GRE encapsulation header. |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;destination</samp>](## "ethernet_interfaces.[].switchport.tap.encapsulation.gre.[].destination") | String |  |  |  | Destination IP address of tunnel packets. |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;source</samp>](## "ethernet_interfaces.[].switchport.tap.encapsulation.gre.[].source") | String |  |  |  | Source IP address of tunnel packets. |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;protocol</samp>](## "ethernet_interfaces.[].switchport.tap.encapsulation.gre.[].protocol") | String |  |  |  | Protocol type in GRE header.<br>Protocol range: 0x0000-0xFFFF |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tool</samp>](## "ethernet_interfaces.[].switchport.tool") | Dictionary |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;mpls_pop_all</samp>](## "ethernet_interfaces.[].switchport.tool.mpls_pop_all") | Boolean |  |  |  | Pop all MPLS labels. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;encapsulation</samp>](## "ethernet_interfaces.[].switchport.tool.encapsulation") | Dictionary |  |  |  |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;dot1br_strip</samp>](## "ethernet_interfaces.[].switchport.tool.encapsulation.dot1br_strip") | Boolean |  |  |  | Remove a 802.1 BR tag in packet header. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;vn_tag_strip</samp>](## "ethernet_interfaces.[].switchport.tool.encapsulation.vn_tag_strip") | Boolean |  |  |  | Remove a VN-tag in packet header. |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;dot1br_strip</samp>](## "ethernet_interfaces.[].switchport.tool.encapsulation.dot1br_strip") | Boolean |  |  |  | Remove a 802.1 BR tag in packet header. 'mpls_pop_all' takes precedence over 'dot1br_strip' in EOS. |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;vn_tag_strip</samp>](## "ethernet_interfaces.[].switchport.tool.encapsulation.vn_tag_strip") | Boolean |  |  |  | Remove a VN-tag in packet header. 'mpls_pop_all' takes precedence over 'vn_tag_strip' in EOS. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;allowed_vlan</samp>](## "ethernet_interfaces.[].switchport.tool.allowed_vlan") | String |  |  |  | VLAN ID or range of VLAN IDs within range 1-4094. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;identity</samp>](## "ethernet_interfaces.[].switchport.tool.identity") | Dictionary |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tag</samp>](## "ethernet_interfaces.[].switchport.tool.identity.tag") | String |  |  | Valid Values:<br>- <code>dot1q</code><br>- <code>qinq</code> |  |
@@ -449,6 +449,7 @@
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;size</samp>](## "ethernet_interfaces.[].switchport.tool.truncation.size") | Integer |  |  | Valid Values:<br>- <code>160</code> | Egress packet truncation size in bytes. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;groups</samp>](## "ethernet_interfaces.[].switchport.tool.groups") | List, items: String |  |  |  | Tool groups for the interface. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;&lt;str&gt;</samp>](## "ethernet_interfaces.[].switchport.tool.groups.[]") | String |  |  |  |  |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;dot1q_remove_outer_vlan_tag</samp>](## "ethernet_interfaces.[].switchport.tool.dot1q_remove_outer_vlan_tag") | String |  |  |  | Indices of vlan tags to be removed.<br>Range: 1-2 |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;dzgre_preserve</samp>](## "ethernet_interfaces.[].switchport.tool.dzgre_preserve") | Boolean |  |  |  | Preserve the DzGRE header. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;eos_cli</samp>](## "ethernet_interfaces.[].eos_cli") | String |  |  |  | Multiline EOS CLI rendered directly on the ethernet interface in the final EOS configuration. |
 
@@ -1244,31 +1245,33 @@
             encapsulation:
 
               # Strip VXLAN encapsulation header.
+              # `encapsulation.vxlan_strip` and `mpls_pop_all` are mutually exclusive.
+              # `mpls_pop_all` takes precedence.
               vxlan_strip: <bool>
-
-              # Strip GRE encapsulation header.
-              gre_strip: <bool; required>
               gre:
 
-                # Destination IP address of tunnel packets.
-                destination: <str>
+                  # Strip GRE encapsulation header.
+                - strip: <bool; required>
+
+                  # Destination IP address of tunnel packets.
+                  destination: <str>
 
-                # Source IP address of tunnel packets.
-                source: <str>
+                  # Source IP address of tunnel packets.
+                  source: <str>
 
-                # Protocol type in GRE header.
-                # Protocol range: 0x0000-0xFFFF
-                protocol: <str>
+                  # Protocol type in GRE header.
+                  # Protocol range: 0x0000-0xFFFF
+                  protocol: <str>
           tool:
 
             # Pop all MPLS labels.
             mpls_pop_all: <bool>
             encapsulation:
 
-              # Remove a 802.1 BR tag in packet header.
+              # Remove a 802.1 BR tag in packet header. 'mpls_pop_all' takes precedence over 'dot1br_strip' in EOS.
               dot1br_strip: <bool>
 
-              # Remove a VN-tag in packet header.
+              # Remove a VN-tag in packet header. 'mpls_pop_all' takes precedence over 'vn_tag_strip' in EOS.
               vn_tag_strip: <bool>
 
             # VLAN ID or range of VLAN IDs within range 1-4094.
@@ -1287,6 +1290,10 @@
             groups:
               - <str>
 
+            # Indices of vlan tags to be removed.
+            # Range: 1-2
+            dot1q_remove_outer_vlan_tag: <str>
+
             # Preserve the DzGRE header.
             dzgre_preserve: <bool>