Updated schemas and template

aristanetworks · Aug 23, 2024 · fdee560 · fdee560
1 parent b0e8829
commit fdee560
Show file tree

Hide file tree

Showing 7 changed files with 241 additions and 270 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
@@ -657,43 +657,31 @@ interface Ethernet26.1
    description TENANT_A pseudowire 1 interface
    encapsulation vlan
       client unmatched
-   encapsulation vlan
-      client unmatched
 !
 interface Ethernet26.100
    description TENANT_A pseudowire 1 interface
    encapsulation vlan
       client dot1q 100 network client
-   encapsulation vlan
-      client dot1q 100 network client
 !
 interface Ethernet26.200
    description TENANT_A pseudowire 2 interface
    encapsulation vlan
       client dot1q 200
-   encapsulation vlan
-      client dot1q 200
 !
 interface Ethernet26.300
    description TENANT_A pseudowire 3 interface
    encapsulation vlan
       client dot1q 300 network dot1q 400
-   encapsulation vlan
-      client dot1q 300 network dot1q 400
 !
 interface Ethernet26.400
    description TENANT_A pseudowire 3 interface
    encapsulation vlan
       client dot1q outer 400 inner 20 network dot1q outer 21 inner 401
-   encapsulation vlan
-      client dot1q outer 400 inner 20 network dot1q outer 21 inner 401
 !
 interface Ethernet26.500
    description TENANT_A pseudowire 3 interface
    encapsulation vlan
       client dot1q outer 500 inner 50
-   encapsulation vlan
-      client dot1q outer 500 inner 50
 !
 interface Ethernet27
    description EVPN-Vxlan single-active redundancy
@@ -1050,15 +1038,15 @@ interface Ethernet68.5
 !
 interface Ethernet68.6
    encapsulation vlan
-      client dot1ad outer 35 inner 60 network dot1q outer 6 inner 53
+      client dot1ad outer 35 inner 60 network dot1q outer 53 inner 6
 !
 interface Ethernet68.7
    encapsulation vlan
       client dot1ad outer 35 inner 60 network dot1ad outer 52 inner 62
 !
 interface Ethernet68.8
    encapsulation vlan
-      client dot1ad outer 35 inner 60
+      client dot1ad outer 35 inner 60 network client
 !
 interface Ethernet68.9
    encapsulation vlan

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
@@ -302,43 +302,31 @@ interface Ethernet26.1
    description TENANT_A pseudowire 1 interface
    encapsulation vlan
       client unmatched
-   encapsulation vlan
-      client unmatched
 !
 interface Ethernet26.100
    description TENANT_A pseudowire 1 interface
    encapsulation vlan
       client dot1q 100 network client
-   encapsulation vlan
-      client dot1q 100 network client
 !
 interface Ethernet26.200
    description TENANT_A pseudowire 2 interface
    encapsulation vlan
       client dot1q 200
-   encapsulation vlan
-      client dot1q 200
 !
 interface Ethernet26.300
    description TENANT_A pseudowire 3 interface
    encapsulation vlan
       client dot1q 300 network dot1q 400
-   encapsulation vlan
-      client dot1q 300 network dot1q 400
 !
 interface Ethernet26.400
    description TENANT_A pseudowire 3 interface
    encapsulation vlan
       client dot1q outer 400 inner 20 network dot1q outer 21 inner 401
-   encapsulation vlan
-      client dot1q outer 400 inner 20 network dot1q outer 21 inner 401
 !
 interface Ethernet26.500
    description TENANT_A pseudowire 3 interface
    encapsulation vlan
       client dot1q outer 500 inner 50
-   encapsulation vlan
-      client dot1q outer 500 inner 50
 !
 interface Ethernet27
    description EVPN-Vxlan single-active redundancy
@@ -695,15 +683,15 @@ interface Ethernet68.5
 !
 interface Ethernet68.6
    encapsulation vlan
-      client dot1ad outer 35 inner 60 network dot1q outer 6 inner 53
+      client dot1ad outer 35 inner 60 network dot1q outer 53 inner 6
 !
 interface Ethernet68.7
    encapsulation vlan
       client dot1ad outer 35 inner 60 network dot1ad outer 52 inner 62
 !
 interface Ethernet68.8
    encapsulation vlan
-      client dot1ad outer 35 inner 60
+      client dot1ad outer 35 inner 60 network client
 !
 interface Ethernet68.9
    encapsulation vlan

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
@@ -1076,107 +1076,107 @@ ethernet_interfaces:
   - name: Ethernet68.1
     encapsulation_vlan:
       client:
-        dot1q:
-          outer: 23
-          inner: 45
+        outer: 23
+        inner: 45
+        protocol: dot1q
       network:
-        dot1ad:
-          outer: 32
-          inner: 54
+        protocol: dot1ad
+        outer: 32
+        inner: 54
 
   - name: Ethernet68.2
     encapsulation_vlan:
       client:
-        dot1q:
-          vlan: 10
+        protocol: dot1q
+        vlan: 10
       network:
-        dot1q:
-          outer: 32
-          inner: 54
+        protocol: dot1q
+        outer: 32
+        inner: 54
 
   - name: Ethernet68.3
     encapsulation_vlan:
       client:
-        dot1q:
-          vlan: 10
+        protocol: dot1q
+        vlan: 10
       network:
-        dot1ad:
-          vlan: 20
+        protocol: dot1ad
+        vlan: 20
 
   - name: Ethernet68.4
     encapsulation_vlan:
       client:
-        dot1q:
-          vlan: 10
+        protocol: dot1q
+        vlan: 10
       network:
-        client: true
+        protocol: client
 
   - name: Ethernet68.5
     encapsulation_vlan:
       client:
-        dot1ad:
-          vlan: 12
+        protocol: dot1ad
+        vlan: 12
       network:
-        dot1q:
-          vlan: 25
+        protocol: dot1q
+        vlan: 25
 
   - name: Ethernet68.6
     encapsulation_vlan:
       client:
-        dot1ad:
-          outer: 35
-          inner: 60
+        protocol: dot1ad
+        outer: 35
+        inner: 60
       network:
-        dot1q:
-          outer: 53
-          inner: 6
+        protocol: dot1q
+        outer: 53
+        inner: 6
 
   - name: Ethernet68.7
     encapsulation_vlan:
       client:
-        dot1ad:
-          outer: 35
-          inner: 60
+        protocol: dot1ad
+        outer: 35
+        inner: 60
       network:
-        dot1ad:
-          outer: 52
-          inner: 62
+        protocol: dot1ad
+        outer: 52
+        inner: 62
 
   - name: Ethernet68.8
     encapsulation_vlan:
       client:
-        dot1ad:
-          outer: 35
-          inner: 60
+        protocol: dot1ad
+        outer: 35
+        inner: 60
       network:
-        client: true
+        protocol: client
 
   - name: Ethernet68.9
     encapsulation_vlan:
       client:
-        untagged: true
+        protocol: untagged
       network:
-        dot1ad:
-          outer: 35
-          inner: 60
+        protocol: dot1ad
+        outer: 35
+        inner: 60
 
   - name: Ethernet69.1
     encapsulation_vlan:
       client:
-        untagged: true
+        protocol: untagged
       network:
-        dot1q:
-          outer: 35
-          inner: 60
+        protocol: dot1q
+        outer: 35
+        inner: 60
 
   - name: Ethernet69.2
     encapsulation_vlan:
       client:
-        untagged: true
+        protocol: untagged
       network:
-        untagged: true
+        protocol: untagged
 
   - name: Ethernet69.3
     encapsulation_vlan:
       client:
-        unmatched: true
+        protocol: unmatched