Feat(eos_designs): add support for 7300X3 in default platforms (#1863)

aristanetworks · Jun 9, 2022 · 191c291 · 191c291
1 parent 6da00fc
commit 191c291
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 126 deletions.
diff --git a/...ns/arista/avd/molecule/eos_designs_unit_tests/documentation/devices/DC1-CL1B.md b/...ns/arista/avd/molecule/eos_designs_unit_tests/documentation/devices/DC1-CL1B.md
@@ -14,8 +14,6 @@
 - [Monitoring](#monitoring)
   - [TerminAttr Daemon](#terminattr-daemon)
   - [SNMP](#snmp)
-- [Hardware TCAM Profile](#hardware-tcam-profile)
-  - [Hardware TCAM configuration](#hardware-tcam-configuration)
 - [MLAG](#mlag)
   - [MLAG Summary](#mlag-summary)
   - [MLAG Device Configuration](#mlag-device-configuration)
@@ -51,9 +49,6 @@
 - [VRF Instances](#vrf-instances)
   - [VRF Instances Summary](#vrf-instances-summary)
   - [VRF Instances Device Configuration](#vrf-instances-device-configuration)
-- [Platform](#platform)
-  - [Platform Summary](#platform-summary)
-  - [Platform Configuration](#platform-configuration)
 - [Quality Of Service](#quality-of-service)
 
 # Management
@@ -66,19 +61,19 @@
 
 | Management Interface | description | Type | VRF | IP Address | Gateway |
 | -------------------- | ----------- | ---- | --- | ---------- | ------- |
-| Management1 | oob_management | oob | MGMT | 192.168.200.120/24 | 192.168.200.5 |
+| Management0 | oob_management | oob | MGMT | 192.168.200.120/24 | 192.168.200.5 |
 
 #### IPv6
 
 | Management Interface | description | Type | VRF | IPv6 Address | IPv6 Gateway |
 | -------------------- | ----------- | ---- | --- | ------------ | ------------ |
-| Management1 | oob_management | oob | MGMT | -  | - |
+| Management0 | oob_management | oob | MGMT | -  | - |
 
 ### Management Interfaces Device Configuration
 
 ```eos
 !
-interface Management1
+interface Management0
    description oob_management
    no shutdown
    vrf MGMT
@@ -220,18 +215,6 @@ snmp-server contact example@example.com
 snmp-server location EOS_DESIGNS_UNIT_TESTS DC1-CL1B
 ```
 
-# Hardware TCAM Profile
-
-TCAM profile __`vxlan-routing`__ is active
-
-## Hardware TCAM configuration
-
-```eos
-!
-hardware tcam
-   system profile vxlan-routing
-```
-
 # MLAG
 
 ## MLAG Summary
@@ -251,8 +234,8 @@ mlag configuration
    local-interface Vlan4092
    peer-address 10.255.252.18
    peer-link Port-Channel5
-   reload-delay mlag 900
-   reload-delay non-mlag 1020
+   reload-delay mlag 1200
+   reload-delay non-mlag 1320
 ```
 
 # Spanning Tree
@@ -998,21 +981,4 @@ route-map RM-MLAG-PEER-IN permit 10
 vrf instance MGMT
 ```
 
-# Platform
-
-## Platform Summary
-
-### Platform Sand Summary
-
-| Settings | Value |
-| -------- | ----- |
-| Hardware Only Lag | True |
-
-## Platform Configuration
-
-```eos
-!
-platform sand lag hardware-only
-```
-
 # Quality Of Service
diff --git a/...designs_unit_tests/documentation/fabric/EOS_DESIGNS_UNIT_TESTS-documentation.md b/...designs_unit_tests/documentation/fabric/EOS_DESIGNS_UNIT_TESTS-documentation.md
@@ -23,7 +23,7 @@
 | EOS_DESIGNS_UNIT_TESTS | l3leaf | DC1-BL2A | 192.168.200.117/24 | 7280R2 | Provisioned |
 | EOS_DESIGNS_UNIT_TESTS | l3leaf | DC1-BL2B | 192.168.200.118/24 | 7280R3 | Provisioned |
 | EOS_DESIGNS_UNIT_TESTS | l3leaf | DC1-CL1A | 192.168.200.119/24 | 7368X4 | Provisioned |
-| EOS_DESIGNS_UNIT_TESTS | l3leaf | DC1-CL1B | 192.168.200.120/24 | 7280R | Provisioned |
+| EOS_DESIGNS_UNIT_TESTS | l3leaf | DC1-CL1B | 192.168.200.120/24 | 7300X3 | Provisioned |
 | EOS_DESIGNS_UNIT_TESTS | l2leaf | DC1-L2LEAF1A | 192.168.200.112/24 | vEOS-LAB | Provisioned |
 | EOS_DESIGNS_UNIT_TESTS | l2leaf | DC1-L2LEAF1B | 192.168.200.115/24 | vEOS-LAB | Provisioned |
 | EOS_DESIGNS_UNIT_TESTS | l2leaf | DC1-L2LEAF2A | 192.168.200.113/24 | vEOS-LAB | Provisioned |

diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-CL1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-CL1B.cfg
@@ -24,18 +24,11 @@ ntp server vrf MGMT 192.168.200.5 prefer
 snmp-server contact example@example.com
 snmp-server location EOS_DESIGNS_UNIT_TESTS DC1-CL1B
 !
-hardware speed-group 1 serdes 10G
-hardware speed-group 2 serdes 25G
-hardware speed-group 3 serdes 25G
-hardware speed-group 4 serdes 10G
-!
 spanning-tree root super
 spanning-tree mode mstp
 no spanning-tree vlan-id 4090,4092
 spanning-tree mst 0 priority 4096
 !
-platform sand lag hardware-only
-!
 no enable password
 no aaa root
 !
@@ -170,7 +163,7 @@ interface Loopback1
    no shutdown
    ip address 192.168.254.18/32
 !
-interface Management1
+interface Management0
    description oob_management
    no shutdown
    vrf MGMT
@@ -213,9 +206,6 @@ interface Vxlan1
    vxlan vlan 311 vni 30311
    vxlan vlan 350 vni 30350
 !
-hardware tcam
-   system profile vxlan-routing
-!
 ip routing
 no ip routing vrf MGMT
 !
@@ -228,8 +218,8 @@ mlag configuration
    local-interface Vlan4092
    peer-address 10.255.252.18
    peer-link Port-Channel5
-   reload-delay mlag 900
-   reload-delay non-mlag 1020
+   reload-delay mlag 1200
+   reload-delay non-mlag 1320
 !
 ip route vrf MGMT 0.0.0.0/0 192.168.200.5
 !

diff --git a/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1B.yml b/...tions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-CL1B.yml
@@ -181,16 +181,6 @@ static_routes:
   gateway: 192.168.200.5
 service_routing_protocols_model: multi-agent
 ip_routing: true
-hardware:
-  speed_groups:
-    1:
-      serdes: 10G
-    2:
-      serdes: 25G
-    3:
-      serdes: 25G
-    4:
-      serdes: 10G
 daemon_terminattr:
   cvaddrs:
   - 192.168.200.11:9910
@@ -237,19 +227,13 @@ vrfs:
   MGMT:
     ip_routing: false
 management_interfaces:
-  Management1:
+  Management0:
     description: oob_management
     shutdown: false
     vrf: MGMT
     ip_address: 192.168.200.120/24
     gateway: 192.168.200.5
     type: oob
-tcam_profile:
-  system: vxlan-routing
-platform:
-  sand:
-    lag:
-      hardware_only: true
 management_api_http:
   enable_vrfs:
     MGMT: {}
@@ -410,8 +394,8 @@ mlag_configuration:
   local_interface: Vlan4092
   peer_address: 10.255.252.18
   peer_link: Port-Channel5
-  reload_delay_mlag: 900
-  reload_delay_non_mlag: 1020
+  reload_delay_mlag: 1200
+  reload_delay_non_mlag: 1320
 route_maps:
   RM-MLAG-PEER-IN:
     sequence_numbers:

diff --git a/...ollections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/DC1_FABRIC.yml b/...ollections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/DC1_FABRIC.yml
@@ -212,6 +212,7 @@ l3leaf:
           mgmt_ip: 192.168.200.119/24
           uplink_switch_interfaces: [ Ethernet14, Ethernet14, Ethernet14, Ethernet14 ]
         DC1-CL1B:
+          platform: 7300X3
           id: 11
           bgp_as: 65109
           mgmt_ip: 192.168.200.120/24

diff --git a/ansible_collections/arista/avd/roles/eos_designs/defaults/main/default-platform-settings.yml b/ansible_collections/arista/avd/roles/eos_designs/defaults/main/default-platform-settings.yml
@@ -0,0 +1,58 @@
+# Set platform specific settings, TCAM profile and reload delay.
+# The reload delay values should be reviewed and tuned to the specific environment.
+# Recommended default values for Jericho based platform, VEOS and all other platforms default tag.
+default_platform_settings:
+  - platforms: ['default']
+    reload_delay:
+      mlag: 300
+      non_mlag: 330
+    feature_support:
+      # "queue-monitor length notify" is only valid for R-Series so should be disabled on default platform.
+      queue_monitor_length_notify: false
+  - platforms: ['7280R', '7280R2']
+    tcam_profile: vxlan-routing
+    lag_hardware_only: true
+    reload_delay:
+      mlag: 900
+      non_mlag: 1020
+  - platforms: ['7280R3']
+    reload_delay:
+      mlag: 900
+      non_mlag: 1020
+  - platforms: ['7500R', '7500R2']
+    tcam_profile: vxlan-routing
+    lag_hardware_only: true
+    management_interface: Management0
+    reload_delay:
+      mlag: 900
+      non_mlag: 1020
+  - platforms: ['7500R3', '7800R3']
+    management_interface: Management0
+    reload_delay:
+      mlag: 900
+      non_mlag: 1020
+  - platforms: ['7368X4']
+    management_interface: Management0
+    reload_delay:
+      mlag: 300
+      non_mlag: 330
+  - platforms: ['7300X3']
+    management_interface: Management0
+    reload_delay:
+      mlag: 1200
+      non_mlag: 1320
+  - platforms: ['VEOS', 'VEOS-LAB', 'vEOS', 'vEOS-lab']
+    reload_delay:
+      mlag: 300
+      non_mlag: 330
+    feature_support:
+      queue_monitor_length_notify: false
+      interface_storm_control: false
+  - platforms: ['CEOS', 'cEOS', 'ceos', 'cEOSLab']
+    management_interface: Management0
+    reload_delay:
+      mlag: 300
+      non_mlag: 330
+    feature_support:
+      queue_monitor_length_notify: false
+      interface_storm_control: false
diff --git a/ansible_collections/arista/avd/roles/eos_designs/defaults/main/main.yml b/ansible_collections/arista/avd/roles/eos_designs/defaults/main/main.yml
@@ -80,60 +80,9 @@ bfd_multihop:
 mlag_ibgp_peering_vrfs:
   base_vlan: 3000
 
-# Set platform specific settings, TCAM profile and reload delay.
-# The reload delay values should be reviewed and tuned to the specific environment.
-# Recommended default values for Jericho based platform, VEOS and all other platforms default tag.
-
-platform_settings:
-  - platforms: [ 'default' ]
-    reload_delay:
-      mlag: 300
-      non_mlag: 330
-    feature_support:
-      # "queue-monitor length notify" is only valid for R-Series so should be disabled on default platform.
-      queue_monitor_length_notify: false
-  - platforms: [ '7280R', '7280R2' ]
-    tcam_profile: vxlan-routing
-    lag_hardware_only: true
-    reload_delay:
-      mlag: 900
-      non_mlag: 1020
-  - platforms: [ '7280R3' ]
-    reload_delay:
-      mlag: 900
-      non_mlag: 1020
-  - platforms: [ '7500R', '7500R2' ]
-    tcam_profile: vxlan-routing
-    lag_hardware_only: true
-    management_interface: Management0
-    reload_delay:
-      mlag: 900
-      non_mlag: 1020
-  - platforms: [ '7500R3', '7800R3' ]
-    management_interface: Management0
-    reload_delay:
-      mlag: 900
-      non_mlag: 1020
-  - platforms: [ '7368X4' ]
-    management_interface: Management0
-    reload_delay:
-      mlag: 300
-      non_mlag: 330
-  - platforms: [ 'VEOS', 'VEOS-LAB', 'vEOS', 'vEOS-lab' ]
-    reload_delay:
-      mlag: 300
-      non_mlag: 330
-    feature_support:
-      queue_monitor_length_notify: false
-      interface_storm_control: false
-  - platforms: [ 'CEOS', 'cEOS', 'ceos', 'cEOSLab' ]
-    management_interface: Management0
-    reload_delay:
-      mlag: 300
-      non_mlag: 330
-    feature_support:
-      queue_monitor_length_notify: false
-      interface_storm_control: false
+# Platform Settings
+platform_settings: "{{ default_platform_settings }}"
+
 
 # Infrastructure Elements Keys