schema and template update for dot1q

aristanetworks · Jul 2, 2024 · 051dda4 · 051dda4
1 parent d516675
commit 051dda4
Show file tree

Hide file tree

Showing 15 changed files with 332 additions and 0 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,6 +368,7 @@ interface Ethernet1
    switchport phone trunk tagged
    switchport trunk allowed vlan 10-11
    switchport mode dot1q-tunnel
+   switchport dot1q ethertype 1536
    switchport vlan forwarding accept all
    switchport trunk group g1
    switchport trunk group g2

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
@@ -515,6 +515,7 @@ interface Port-Channel100
    switchport trunk native vlan tag
    switchport phone vlan 110
    switchport phone trunk tagged
+   switchport dot1q vlan tag required
    switchport trunk allowed vlan 10-11
    switchport mode dot1q-tunnel
    switchport vlan forwarding accept all

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,6 +21,7 @@ interface Ethernet1
    switchport phone trunk tagged
    switchport trunk allowed vlan 10-11
    switchport mode dot1q-tunnel
+   switchport dot1q ethertype 1536
    switchport vlan forwarding accept all
    switchport trunk group g1
    switchport trunk group g2

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
@@ -169,6 +169,7 @@ interface Port-Channel100
    switchport trunk native vlan tag
    switchport phone vlan 110
    switchport phone trunk tagged
+   switchport dot1q vlan tag required
    switchport trunk allowed vlan 10-11
    switchport mode dot1q-tunnel
    switchport vlan forwarding accept all

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
@@ -51,6 +51,8 @@ ethernet_interfaces:
         trunk: tagged
       mode: dot1q-tunnel
       pvlan_mapping: 20-30
+      dot1q:
+        ethertype: 1536
       vlan_translations:
         - from: 23-37
           to: 45

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
@@ -130,6 +130,8 @@ port_channel_interfaces:
         trunk: tagged
       mode: dot1q-tunnel
       pvlan_mapping: 20-30
+      dot1q:
+        vlan_tag: required
       source_interface: tx multicast
       vlan_translations:
         - from: 23-37

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
@@ -415,6 +415,9 @@
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;private_vlan_secondary</samp>](## "ethernet_interfaces.[].switchport.trunk.private_vlan_secondary") | Boolean |  |  |  | Enable secondary VLAN mapping for a private vlan.<br>Warning: This should not be combined with `ethernet_ineterfaces[].trunk_private_vlan_secondary`. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;groups</samp>](## "ethernet_interfaces.[].switchport.trunk.groups") | List, items: String |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;&lt;str&gt;</samp>](## "ethernet_interfaces.[].switchport.trunk.groups.[]") | String |  |  |  | Trunk group name.<br>Warning: This should not be combined with `ethernet_ineterfaces[].trunk_groups`. |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;dot1q</samp>](## "ethernet_interfaces.[].switchport.dot1q") | Dictionary |  |  |  |  |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ethertype</samp>](## "ethernet_interfaces.[].switchport.dot1q.ethertype") | Integer |  |  | Min: 1536<br>Max: 65535 | Ethertype/TPID (Tag Protocol IDentifier) for VLAN tagged frames. |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;vlan_tag</samp>](## "ethernet_interfaces.[].switchport.dot1q.vlan_tag") | String |  |  | Valid Values:<br>- <code>disallowed</code><br>- <code>required</code> | Allow/disallow VLAN tagged Frames. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;source_interface</samp>](## "ethernet_interfaces.[].switchport.source_interface") | String |  |  | Valid Values:<br>- <code>tx</code><br>- <code>tx multicast</code> | tx: Allow bridged packets to go out on the source interface.<br>tx multicast: Allow multicast packets only to go out on the source inteface. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;access_vlan</samp>](## "ethernet_interfaces.[].switchport.access_vlan") | Integer |  |  | Min: 1<br>Max: 4094 | Set VLAN when interface is in access mode.<br>Warning: This should not be combined withe `ethernet_interfaces[].mode = access/dot1q-tunnel`. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;phone</samp>](## "ethernet_interfaces.[].switchport.phone") | Dictionary |  |  |  |  |
@@ -1210,6 +1213,13 @@
                 # Trunk group name.
                 # Warning: This should not be combined with `ethernet_ineterfaces[].trunk_groups`.
               - <str>
+          dot1q:
+
+            # Ethertype/TPID (Tag Protocol IDentifier) for VLAN tagged frames.
+            ethertype: <int; 1536-65535>
+
+            # Allow/disallow VLAN tagged Frames.
+            vlan_tag: <str; "disallowed" | "required">
 
           # tx: Allow bridged packets to go out on the source interface.
           # tx multicast: Allow multicast packets only to go out on the source inteface.

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
@@ -266,6 +266,9 @@
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;private_vlan_secondary</samp>](## "port_channel_interfaces.[].switchport.trunk.private_vlan_secondary") | Boolean |  |  |  | Enable secondary VLAN mapping for a private vlan.<br>Warning: This should not be combined with `port_channel_interfaces[].trunk_private_vlan_secondary`. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;groups</samp>](## "port_channel_interfaces.[].switchport.trunk.groups") | List, items: String |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;&lt;str&gt;</samp>](## "port_channel_interfaces.[].switchport.trunk.groups.[]") | String |  |  |  | Trunk group name.<br>Warning: This should not be combined with `port_channel_interfaces[].trunk_groups`. |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;dot1q</samp>](## "port_channel_interfaces.[].switchport.dot1q") | Dictionary |  |  |  |  |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ethertype</samp>](## "port_channel_interfaces.[].switchport.dot1q.ethertype") | Integer |  |  | Min: 1536<br>Max: 65535 | Ethertype/TPID (Tag Protocol IDentifier) for VLAN tagged frames. |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;vlan_tag</samp>](## "port_channel_interfaces.[].switchport.dot1q.vlan_tag") | String |  |  | Valid Values:<br>- <code>disallowed</code><br>- <code>required</code> |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;source_interface</samp>](## "port_channel_interfaces.[].switchport.source_interface") | String |  |  | Valid Values:<br>- <code>tx</code><br>- <code>tx multicast</code> | tx: Allow bridged packets to go out on the source interface.<br>tx multicast: Allow multicast packets only to go out on the source inteface. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;access_vlan</samp>](## "port_channel_interfaces.[].switchport.access_vlan") | Integer |  |  | Min: 1<br>Max: 4094 | Set VLAN when interface is in access mode.<br>Warning: This should not be combined withe `port_channel_interfaces[].mode = access/dot1q-tunnel`. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;phone</samp>](## "port_channel_interfaces.[].switchport.phone") | Dictionary |  |  |  |  |
@@ -808,6 +811,11 @@
                 # Trunk group name.
                 # Warning: This should not be combined with `port_channel_interfaces[].trunk_groups`.
               - <str>
+          dot1q:
+
+            # Ethertype/TPID (Tag Protocol IDentifier) for VLAN tagged frames.
+            ethertype: <int; 1536-65535>
+            vlan_tag: <str; "disallowed" | "required">
 
           # tx: Allow bridged packets to go out on the source interface.
           # tx multicast: Allow multicast packets only to go out on the source inteface.

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
@@ -174,12 +174,18 @@ interface {{ ethernet_interface.name }}
 {%     if ethernet_interface.switchport.phone.trunk is arista.avd.defined %}
    switchport phone trunk {{ ethernet_interface.switchport.phone.trunk }}
 {%     endif %}
+{%     if ethernet_interface.switchport.dot1q.vlan_tag is arista.avd.defined %}
+   switchport dot1q vlan tag {{ ethernet_interface.switchport.dot1q.vlan_tag }}
+{%     endif %}
 {%     if ethernet_interface.switchport.trunk.allowed_vlans is arista.avd.defined %}
    switchport trunk allowed vlan {{ ethernet_interface.switchport.trunk.allowed_vlans }}
 {%     endif %}
 {%     if ethernet_interface.switchport.mode is arista.avd.defined %}
    switchport mode {{ ethernet_interface.switchport.mode }}
 {%     endif %}
+{%     if ethernet_interface.switchport.dot1q.ethertype is arista.avd.defined %}
+   switchport dot1q ethertype {{ ethernet_interface.switchport.dot1q.ethertype }}
+{%     endif %}
 {%     if ethernet_interface.switchport.vlan_forwarding_accept_all is arista.avd.defined(true) %}
    switchport vlan forwarding accept all
 {%     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
@@ -122,12 +122,18 @@ interface {{ port_channel_interface.name }}
 {%     if port_channel_interface.switchport.phone.trunk is arista.avd.defined %}
    switchport phone trunk {{ port_channel_interface.switchport.phone.trunk }}
 {%     endif %}
+{%     if port_channel_interface.switchport.dot1q.vlan_tag is arista.avd.defined %}
+   switchport dot1q vlan tag {{ port_channel_interface.switchport.dot1q.vlan_tag }}
+{%     endif %}
 {%     if port_channel_interface.switchport.trunk.allowed_vlans is arista.avd.defined %}
    switchport trunk allowed vlan {{ port_channel_interface.switchport.trunk.allowed_vlans }}
 {%     endif %}
 {%     if port_channel_interface.switchport.mode is arista.avd.defined %}
    switchport mode {{ port_channel_interface.switchport.mode }}
 {%     endif %}
+{%     if port_channel_interface.switchport.dot1q.ethertype is arista.avd.defined %}
+   switchport dot1q ethertype {{ port_channel_interface.switchport.dot1q.ethertype }}
+{%     endif %}
 {%     if port_channel_interface.switchport.vlan_forwarding_accept_all is arista.avd.defined(true) %}
    switchport vlan forwarding accept all
 {%     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
@@ -5769,6 +5769,32 @@
                 },
                 "title": "Trunk"
               },
+              "dot1q": {
+                "type": "object",
+                "properties": {
+                  "ethertype": {
+                    "type": "integer",
+                    "minimum": 1536,
+                    "maximum": 65535,
+                    "description": "Ethertype/TPID (Tag Protocol IDentifier) for VLAN tagged frames.",
+                    "title": "Ethertype"
+                  },
+                  "vlan_tag": {
+                    "type": "string",
+                    "description": "Allow/disallow VLAN tagged Frames.",
+                    "enum": [
+                      "disallowed",
+                      "required"
+                    ],
+                    "title": "VLAN Tag"
+                  }
+                },
+                "additionalProperties": false,
+                "patternProperties": {
+                  "^_.+$": {}
+                },
+                "title": "Dot1Q"
+              },
               "source_interface": {
                 "type": "string",
                 "description": "tx: Allow bridged packets to go out on the source interface.\ntx multicast: Allow multicast packets only to go out on the source inteface.",
@@ -16173,6 +16199,31 @@
                 },
                 "title": "Trunk"
               },
+              "dot1q": {
+                "type": "object",
+                "properties": {
+                  "ethertype": {
+                    "type": "integer",
+                    "minimum": 1536,
+                    "maximum": 65535,
+                    "description": "Ethertype/TPID (Tag Protocol IDentifier) for VLAN tagged frames.",
+                    "title": "Ethertype"
+                  },
+                  "vlan_tag": {
+                    "type": "string",
+                    "enum": [
+                      "disallowed",
+                      "required"
+                    ],
+                    "title": "VLAN Tag"
+                  }
+                },
+                "additionalProperties": false,
+                "patternProperties": {
+                  "^_.+$": {}
+                },
+                "title": "Dot1Q"
+              },
               "source_interface": {
                 "type": "string",
                 "description": "tx: Allow bridged packets to go out on the source interface.\ntx multicast: Allow multicast packets only to go out on the source inteface.",

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
@@ -3479,6 +3479,23 @@ keys:
                     description: 'Trunk group name.
 
                       Warning: This should not be combined with `ethernet_ineterfaces[].trunk_groups`.'
+            dot1q:
+              type: dict
+              keys:
+                ethertype:
+                  type: int
+                  convert_types:
+                  - str
+                  min: 1536
+                  max: 65535
+                  description: Ethertype/TPID (Tag Protocol IDentifier) for VLAN tagged
+                    frames.
+                vlan_tag:
+                  type: str
+                  description: Allow/disallow VLAN tagged Frames.
+                  valid_values:
+                  - disallowed
+                  - required
             source_interface:
               type: str
               description: 'tx: Allow bridged packets to go out on the source interface.
@@ -9589,6 +9606,22 @@ keys:
                     description: 'Trunk group name.
 
                       Warning: This should not be combined with `port_channel_interfaces[].trunk_groups`.'
+            dot1q:
+              type: dict
+              keys:
+                ethertype:
+                  type: int
+                  convert_types:
+                  - str
+                  min: 1536
+                  max: 65535
+                  description: Ethertype/TPID (Tag Protocol IDentifier) for VLAN tagged
+                    frames.
+                vlan_tag:
+                  type: str
+                  valid_values:
+                  - disallowed
+                  - required
             source_interface:
               type: str
               description: 'tx: Allow bridged packets to go out on the source interface.

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
@@ -1463,6 +1463,22 @@ keys:
                     description: |-
                       Trunk group name.
                       Warning: This should not be combined with `ethernet_ineterfaces[].trunk_groups`.
+            dot1q:
+              type: dict
+              keys:
+                ethertype:
+                  type: int
+                  convert_types:
+                    - str
+                  min: 1536
+                  max: 65535
+                  description: Ethertype/TPID (Tag Protocol IDentifier) for VLAN tagged frames.
+                vlan_tag:
+                  type: str
+                  description: Allow/disallow VLAN tagged Frames.
+                  valid_values:
+                    - disallowed
+                    - required
             source_interface:
               type: str
               description: |-

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
@@ -937,6 +937,21 @@ keys:
                     description: |-
                       Trunk group name.
                       Warning: This should not be combined with `port_channel_interfaces[].trunk_groups`.
+            dot1q:
+              type: dict
+              keys:
+                ethertype:
+                  type: int
+                  convert_types:
+                    - str
+                  min: 1536
+                  max: 65535
+                  description: Ethertype/TPID (Tag Protocol IDentifier) for VLAN tagged frames.
+                vlan_tag:
+                  type: str
+                  valid_values:
+                    - disallowed
+                    - required
             source_interface:
               type: str
               description: |-