Removing feature_header_legth from switchport.tap.encapsulation

aristanetworks · Jul 2, 2024 · 2302af9 · 2302af9
1 parent 9cc2279
commit 2302af9
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 62 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
@@ -367,7 +367,7 @@ interface Ethernet1
    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 encapsulation gre strip
-   switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 protocol 0x0000 feature header length 10 strip
+   switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 protocol 0x0000 strip
    switchport tool mpls pop all
    switchport tool encapsulation vn-tag strip
    switchport tool encapsulation dot1br strip

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
@@ -20,7 +20,7 @@ interface Ethernet1
    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 encapsulation gre strip
-   switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 protocol 0x0000 feature header length 10 strip
+   switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 protocol 0x0000 strip
    switchport tool mpls pop all
    switchport tool encapsulation vn-tag strip
    switchport tool encapsulation dot1br strip

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
@@ -68,7 +68,6 @@ ethernet_interfaces:
             destination: 1.1.1.1
             source: 1.1.1.2
             protocol: "0x0000"
-            feature_header_length: 10
       tool:
         mpls_pop_all: true
         encapsulation:

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
@@ -434,7 +434,6 @@
     | [<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;&nbsp;&nbsp;feature_header_length</samp>](## "ethernet_interfaces.[].switchport.tap.encapsulation.gre.feature_header_length") | Integer |  |  | Min: 1<br>Max: 16 | Feature header length in bytes. |
     | [<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 |  |  |  |  |
@@ -1260,9 +1259,6 @@
                 # Protocol type in GRE header.
                 # Protocol range: 0x0000-0xFFFF
                 protocol: <str>
-
-                # Feature header length in bytes.
-                feature_header_length: <int; 1-16>
           tool:
 
             # Pop all MPLS labels.

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
@@ -193,9 +193,6 @@ interface {{ ethernet_interface.name }}
 {%         endif %}
 {%         if ethernet_interface.switchport.tap.encapsulation.gre.protocol is arista.avd.defined %}
 {%             set tap_encapsulation_cli = tap_encapsulation_cli ~ " protocol " ~ ethernet_interface.switchport.tap.encapsulation.gre.protocol %}
-{%             if ethernet_interface.switchport.tap.encapsulation.gre.feature_header_length is arista.avd.defined %}
-{%                 set tap_encapsulation_cli = tap_encapsulation_cli ~ " feature header length " ~ ethernet_interface.switchport.tap.encapsulation.gre.feature_header_length %}
-{%             endif %}
 {%         endif %}
    {{ tap_encapsulation_cli }} strip
 {%     endif %}

diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/port-channel-interfaces.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/port-channel-interfaces.j2
@@ -141,9 +141,6 @@ interface {{ port_channel_interface.name }}
 {%         endif %}
 {%         if port_channel_interface.switchport.tap.encapsulation.gre.protocol is arista.avd.defined %}
 {%             set tap_encapsulation_cli = tap_encapsulation_cli ~ " protocol " ~ port_channel_interface.switchport.tap.encapsulation.gre.protocol %}
-{%             if port_channel_interface.switchport.tap.encapsulation.gre.feature_header_length is arista.avd.defined %}
-{%                 set tap_encapsulation_cli = tap_encapsulation_cli ~ " feature header length " ~ port_channel_interface.switchport.tap.encapsulation.gre.feature_header_length %}
-{%             endif %}
 {%         endif %}
    {{ tap_encapsulation_cli }} strip
 {%     endif %}

diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.jsonschema.json b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.jsonschema.json
@@ -5879,13 +5879,6 @@
                             "type": "string",
                             "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF",
                             "title": "Protocol"
-                          },
-                          "feature_header_length": {
-                            "description": "Feature header length in bytes.",
-                            "type": "integer",
-                            "minimum": 1,
-                            "maximum": 16,
-                            "title": "Feature Header Length"
                           }
                         },
                         "additionalProperties": false,

diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml
@@ -3540,13 +3540,6 @@ keys:
                           description: 'Protocol type in GRE header.
 
                             Protocol range: 0x0000-0xFFFF'
-                        feature_header_length:
-                          description: Feature header length in bytes.
-                          type: int
-                          convert_types:
-                          - str
-                          min: 1
-                          max: 16
             tool:
               type: dict
               keys:

diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml
@@ -1525,13 +1525,6 @@ keys:
                           description: |-
                             Protocol type in GRE header.
                             Protocol range: 0x0000-0xFFFF
-                        feature_header_length:
-                          description: Feature header length in bytes.
-                          type: int
-                          convert_types:
-                            - str
-                          min: 1
-                          max: 16
             tool:
               type: dict
               keys:

diff --git a/python-avd/pyavd/_eos_designs/schema/eos_designs.jsonschema.json b/python-avd/pyavd/_eos_designs/schema/eos_designs.jsonschema.json
@@ -11410,13 +11410,6 @@
                                 "type": "string",
                                 "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF",
                                 "title": "Protocol"
-                              },
-                              "feature_header_length": {
-                                "description": "Feature header length in bytes.",
-                                "type": "integer",
-                                "minimum": 1,
-                                "maximum": 16,
-                                "title": "Feature Header Length"
                               }
                             },
                             "additionalProperties": false,
@@ -17815,13 +17808,6 @@
                                 "type": "string",
                                 "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF",
                                 "title": "Protocol"
-                              },
-                              "feature_header_length": {
-                                "description": "Feature header length in bytes.",
-                                "type": "integer",
-                                "minimum": 1,
-                                "maximum": 16,
-                                "title": "Feature Header Length"
                               }
                             },
                             "additionalProperties": false,
@@ -24665,13 +24651,6 @@
                                       "type": "string",
                                       "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF",
                                       "title": "Protocol"
-                                    },
-                                    "feature_header_length": {
-                                      "description": "Feature header length in bytes.",
-                                      "type": "integer",
-                                      "minimum": 1,
-                                      "maximum": 16,
-                                      "title": "Feature Header Length"
                                     }
                                   },
                                   "additionalProperties": false,
@@ -57209,13 +57188,6 @@
                                 "type": "string",
                                 "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF",
                                 "title": "Protocol"
-                              },
-                              "feature_header_length": {
-                                "description": "Feature header length in bytes.",
-                                "type": "integer",
-                                "minimum": 1,
-                                "maximum": 16,
-                                "title": "Feature Header Length"
                               }
                             },
                             "additionalProperties": false,