From 2302af91506e95d56ee8b5b0208da675228d7384 Mon Sep 17 00:00:00 2001 From: Shivani-gslab Date: Tue, 2 Jul 2024 16:52:39 +0530 Subject: [PATCH] Removing feature_header_legth from switchport.tap.encapsulation --- .../devices/ethernet-interfaces.md | 2 +- .../intended/configs/ethernet-interfaces.cfg | 2 +- .../host_vars/ethernet-interfaces.yml | 1 - .../docs/tables/ethernet-interfaces.md | 4 --- .../j2templates/eos/ethernet-interfaces.j2 | 3 -- .../eos/port-channel-interfaces.j2 | 3 -- .../schema/eos_cli_config_gen.jsonschema.json | 7 ----- .../schema/eos_cli_config_gen.schema.yml | 7 ----- .../ethernet_interfaces.schema.yml | 7 ----- .../schema/eos_designs.jsonschema.json | 28 ------------------- 10 files changed, 2 insertions(+), 62 deletions(-) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md index cdf7c9806b8..73bfec4da19 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md +++ b/ansible_collections/arista/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/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ethernet-interfaces.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ethernet-interfaces.cfg index 15c5bf0c6dd..69d5d005099 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ethernet-interfaces.cfg +++ b/ansible_collections/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/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml index 6c6fba2817b..b31ac08545a 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml +++ b/ansible_collections/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/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md index 1f927d8fd3e..0f795a1c686 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md @@ -434,7 +434,6 @@ | [            destination](## "ethernet_interfaces.[].switchport.tap.encapsulation.gre.destination") | String | | | | Destination IP address of tunnel packets. | | [            source](## "ethernet_interfaces.[].switchport.tap.encapsulation.gre.source") | String | | | | Source IP address of tunnel packets. | | [            protocol](## "ethernet_interfaces.[].switchport.tap.encapsulation.gre.protocol") | String | | | | Protocol type in GRE header.
Protocol range: 0x0000-0xFFFF | - | [            feature_header_length](## "ethernet_interfaces.[].switchport.tap.encapsulation.gre.feature_header_length") | Integer | | | Min: 1
Max: 16 | Feature header length in bytes. | | [      tool](## "ethernet_interfaces.[].switchport.tool") | Dictionary | | | | | | [        mpls_pop_all](## "ethernet_interfaces.[].switchport.tool.mpls_pop_all") | Boolean | | | | Pop all MPLS labels. | | [        encapsulation](## "ethernet_interfaces.[].switchport.tool.encapsulation") | Dictionary | | | | | @@ -1260,9 +1259,6 @@ # Protocol type in GRE header. # Protocol range: 0x0000-0xFFFF protocol: - - # Feature header length in bytes. - feature_header_length: 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 index 8c021117a96..2190a088ab1 100644 --- 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 index ea125f86094..873483e68d2 100644 --- 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 index 86ba5af5b12..a5f91d36e5b 100644 --- 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 index fc0b9e5c9c2..9863e9f6946 100644 --- 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 index 449229d0bf3..b8065b33ea0 100644 --- 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 index a99b3e571f6..3abc13ab680 100644 --- 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,