Fix test-case for protocol

aristanetworks · Jul 22, 2024 · bb0d566 · bb0d566
1 parent 5a41481
commit bb0d566
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 30 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
@@ -368,8 +368,8 @@ interface Ethernet1
    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 tap encapsulation gre protocol 0x0001 strip
+   switchport tap encapsulation gre destination 2.1.1.2 protocol 0x0010 strip
    switchport tool mpls pop all
    switchport tool encapsulation vn-tag strip
    switchport tool encapsulation dot1br strip

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
@@ -517,8 +517,8 @@ interface Port-Channel100
    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 tap encapsulation gre protocol 0x0010 strip
+   switchport tap encapsulation gre destination 2.1.1.2 protocol 0x0001 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
@@ -21,8 +21,8 @@ interface Ethernet1
    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 tap encapsulation gre protocol 0x0001 strip
+   switchport tap encapsulation gre destination 2.1.1.2 protocol 0x0010 strip
    switchport tool mpls pop all
    switchport tool encapsulation vn-tag strip
    switchport tool encapsulation dot1br strip

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
@@ -171,8 +171,8 @@ interface Port-Channel100
    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 tap encapsulation gre protocol 0x0010 strip
+   switchport tap encapsulation gre destination 2.1.1.2 protocol 0x0001 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
@@ -70,10 +70,10 @@ ethernet_interfaces:
               source: 1.1.1.2
               protocol: "0x0000"
             - strip: true
-              protocol: "0x0000"
+              protocol: "0x0001"
             - strip: true
               destination: 2.1.1.2
-              protocol: "0x0000"
+              protocol: "0x0010"
       tool:
         mpls_pop_all: true
         encapsulation:

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
@@ -145,10 +145,10 @@ port_channel_interfaces:
               source: 1.1.1.2
               protocol: "0x0000"
             - strip: true
-              protocol: "0x0000"
+              protocol: "0x0010"
             - strip: true
               destination: 2.1.1.2
-              protocol: "0x0000"
+              protocol: "0x0001"
       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
@@ -433,7 +433,7 @@
     | [<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. Applied only when destination is defined. |
-    | [<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;&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. It should be unique. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tool</samp>](## "ethernet_interfaces.[].switchport.tool") | Dictionary |  |  |  | In tool mode, the interface operates as a tool port.<br>Tool ports replicate traffic received by tap ports. |
     | [<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 |  |  |  |  |
@@ -1265,7 +1265,7 @@
                   source: <str>
 
                   # Protocol type in GRE header.
-                  # Protocol range: 0x0000-0xFFFF
+                  # Protocol range: 0x0000-0xFFFF. It should be unique.
                   protocol: <str>
 
           # In tool mode, the interface operates as a tool port.

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
@@ -272,7 +272,7 @@
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;strip</samp>](## "port_channel_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>](## "port_channel_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>](## "port_channel_interfaces.[].switchport.tap.encapsulation.gre.[].source") | String |  |  |  | Source IP address of tunnel packets. Applied only when destination is defined. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;protocol</samp>](## "port_channel_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;&nbsp;&nbsp;protocol</samp>](## "port_channel_interfaces.[].switchport.tap.encapsulation.gre.[].protocol") | String |  |  |  | Protocol type in GRE header.<br>Protocol range: 0x0000-0xFFFF. It should be unique. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;feature_header_length</samp>](## "port_channel_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>](## "port_channel_interfaces.[].switchport.tool") | Dictionary |  |  |  | In tool mode, the interface operates as a tool port.<br>Tool ports replicate traffic received by tap ports. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;mpls_pop_all</samp>](## "port_channel_interfaces.[].switchport.tool.mpls_pop_all") | Boolean |  |  |  | Pop all MPLS labels. |
@@ -820,7 +820,7 @@
                   source: <str>
 
                   # Protocol type in GRE header.
-                  # Protocol range: 0x0000-0xFFFF
+                  # Protocol range: 0x0000-0xFFFF. It should be unique.
                   protocol: <str>
 
                   # Feature header length in bytes.

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
@@ -5883,7 +5883,7 @@
                             },
                             "protocol": {
                               "type": "string",
-                              "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF",
+                              "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF. It should be unique.",
                               "title": "Protocol"
                             }
                           },
@@ -16284,7 +16284,7 @@
                             },
                             "protocol": {
                               "type": "string",
-                              "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF",
+                              "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF. It should be unique.",
                               "title": "Protocol"
                             },
                             "feature_header_length": {

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
@@ -3553,7 +3553,7 @@ keys:
                             type: str
                             description: 'Protocol type in GRE header.
 
-                              Protocol range: 0x0000-0xFFFF'
+                              Protocol range: 0x0000-0xFFFF. It should be unique.'
             tool:
               description: 'In tool mode, the interface operates as a tool port.
 
@@ -9622,7 +9622,7 @@ keys:
                             type: str
                             description: 'Protocol type in GRE header.
 
-                              Protocol range: 0x0000-0xFFFF'
+                              Protocol range: 0x0000-0xFFFF. It should be unique.'
                           feature_header_length:
                             description: Feature header length in bytes.
                             type: int

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
@@ -1535,7 +1535,7 @@ keys:
                             type: str
                             description: |-
                               Protocol type in GRE header.
-                              Protocol range: 0x0000-0xFFFF
+                              Protocol range: 0x0000-0xFFFF. It should be unique.
             tool:
               description: |-
                 In tool mode, the interface operates as a tool port.

diff --git a/...-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/port_channel_interfaces.schema.yml b/...-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/port_channel_interfaces.schema.yml
@@ -946,11 +946,11 @@ keys:
                           source:
                             description: Source IP address of tunnel packets. Applied only when destination is defined.
                             type: str
-                          protocol:
+                          protocol: 
                             type: str
                             description: |-
                               Protocol type in GRE header.
-                              Protocol range: 0x0000-0xFFFF
+                              Protocol range: 0x0000-0xFFFF. It should be unique.
                           feature_header_length:
                             description: Feature header length in bytes.
                             type: int

diff --git a/python-avd/pyavd/_eos_designs/schema/eos_designs.jsonschema.json b/python-avd/pyavd/_eos_designs/schema/eos_designs.jsonschema.json
@@ -11414,7 +11414,7 @@
                                 },
                                 "protocol": {
                                   "type": "string",
-                                  "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF",
+                                  "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF. It should be unique.",
                                   "title": "Protocol"
                                 }
                               },
@@ -14611,7 +14611,7 @@
                                     },
                                     "protocol": {
                                       "type": "string",
-                                      "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF",
+                                      "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF. It should be unique.",
                                       "title": "Protocol"
                                     },
                                     "feature_header_length": {
@@ -17838,7 +17838,7 @@
                                 },
                                 "protocol": {
                                   "type": "string",
-                                  "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF",
+                                  "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF. It should be unique.",
                                   "title": "Protocol"
                                 }
                               },
@@ -24694,7 +24694,7 @@
                                       },
                                       "protocol": {
                                         "type": "string",
-                                        "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF",
+                                        "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF. It should be unique.",
                                         "title": "Protocol"
                                       }
                                     },
@@ -35095,7 +35095,7 @@
                                       },
                                       "protocol": {
                                         "type": "string",
-                                        "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF",
+                                        "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF. It should be unique.",
                                         "title": "Protocol"
                                       },
                                       "feature_header_length": {
@@ -54043,7 +54043,7 @@
                                     },
                                     "protocol": {
                                       "type": "string",
-                                      "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF",
+                                      "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF. It should be unique.",
                                       "title": "Protocol"
                                     },
                                     "feature_header_length": {
@@ -57270,7 +57270,7 @@
                                 },
                                 "protocol": {
                                   "type": "string",
-                                  "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF",
+                                  "description": "Protocol type in GRE header.\nProtocol range: 0x0000-0xFFFF. It should be unique.",
                                   "title": "Protocol"
                                 }
                               },