From 892556bf6e0d4c2f340a1924151de1010001253c Mon Sep 17 00:00:00 2001 From: iljarotar Date: Fri, 27 Sep 2024 11:37:35 +0200 Subject: [PATCH 1/3] use running config where possible --- partition/roles/sonic/templates/metal.yaml.j2 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/partition/roles/sonic/templates/metal.yaml.j2 b/partition/roles/sonic/templates/metal.yaml.j2 index 0face0e1..105e86f8 100644 --- a/partition/roles/sonic/templates/metal.yaml.j2 +++ b/partition/roles/sonic/templates/metal.yaml.j2 @@ -107,15 +107,23 @@ PORT: {% if 'parent_port' in running_cfg %} parent_port: {{ running_cfg.parent_port }} {% endif %} + admin_status: up {% if sonic_ports_dict[name] is defined %} {% set port = sonic_ports_dict[name] %} - admin_status: up speed: "{{ port.speed|default(sonic_ports_default_speed) }}" mtu: "{{ port.mtu|default(sonic_ports_default_mtu) }}" fec: "{{ port.fec|default(sonic_ports_default_fec)|string|lower }}" {% else %} + {% if running_cfg.speed is defined %} speed: "{{ running_cfg.speed }}" {% endif %} + {% if running_cfg.mtu is defined %} + mtu: "{{ running_cfg.mtu }}" + {% endif %} + {% if running_cfg.fec is defined %} + fec: "{{ running_cfg.fec }}" + {% endif %} + {% endif %} {% endfor %} {% if sonic_portchannels %} From 1966afce1ae387647c2d75bd0aa8f2d80a3ef08c Mon Sep 17 00:00:00 2001 From: iljarotar Date: Fri, 27 Sep 2024 12:44:48 +0200 Subject: [PATCH 2/3] fix test --- partition/roles/sonic/test/data/exit/metal.yaml | 3 +++ partition/roles/sonic/test/data/l2_leaf/input.yaml | 4 +++- partition/roles/sonic/test/data/l2_leaf/metal.yaml | 7 ++++++- partition/roles/sonic/test/data/mgmtleaf/metal.yaml | 1 + partition/roles/sonic/test/data/sonic-vs/metal.yaml | 1 + 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/partition/roles/sonic/test/data/exit/metal.yaml b/partition/roles/sonic/test/data/exit/metal.yaml index 086542b1..35a92eb9 100644 --- a/partition/roles/sonic/test/data/exit/metal.yaml +++ b/partition/roles/sonic/test/data/exit/metal.yaml @@ -68,6 +68,7 @@ PORT: index: "1" lanes: "2" parent_port: Ethernet0 + admin_status: up speed: "10000" Ethernet2: alias: Eth1/3(Port1) @@ -75,6 +76,7 @@ PORT: index: "1" lanes: "3" parent_port: Ethernet0 + admin_status: up speed: "10000" Ethernet3: alias: Eth1/4(Port1) @@ -82,6 +84,7 @@ PORT: index: "1" lanes: "4" parent_port: Ethernet0 + admin_status: up speed: "10000" Ethernet112: alias: Eth29(Port29) diff --git a/partition/roles/sonic/test/data/l2_leaf/input.yaml b/partition/roles/sonic/test/data/l2_leaf/input.yaml index 4310c259..77982183 100644 --- a/partition/roles/sonic/test/data/l2_leaf/input.yaml +++ b/partition/roles/sonic/test/data/l2_leaf/input.yaml @@ -72,7 +72,9 @@ sonic_running_cfg_ports: index: "1" lanes: "4" parent_port: Ethernet0 - speed: "25000" + speed: "10000" + fec: "rs" + mtu: "9100" Ethernet4: alias: Eth2/1(Port2) index: "2" diff --git a/partition/roles/sonic/test/data/l2_leaf/metal.yaml b/partition/roles/sonic/test/data/l2_leaf/metal.yaml index 3944e5ad..16ce4dc3 100644 --- a/partition/roles/sonic/test/data/l2_leaf/metal.yaml +++ b/partition/roles/sonic/test/data/l2_leaf/metal.yaml @@ -114,7 +114,10 @@ PORT: index: "1" lanes: "4" parent_port: Ethernet0 - speed: "25000" + admin_status: up + speed: "10000" + mtu: "9100" + fec: "rs" Ethernet4: alias: Eth2/1(Port2) autoneg: "off" @@ -141,6 +144,7 @@ PORT: index: "2" lanes: "3" parent_port: Ethernet4 + admin_status: up speed: "25000" Ethernet7: alias: Eth2/4(Port2) @@ -148,6 +152,7 @@ PORT: index: "2" lanes: "4" parent_port: Ethernet4 + admin_status: up speed: "25000" Ethernet112: alias: Eth29(Port29) diff --git a/partition/roles/sonic/test/data/mgmtleaf/metal.yaml b/partition/roles/sonic/test/data/mgmtleaf/metal.yaml index aee38b48..837b4b43 100644 --- a/partition/roles/sonic/test/data/mgmtleaf/metal.yaml +++ b/partition/roles/sonic/test/data/mgmtleaf/metal.yaml @@ -102,6 +102,7 @@ PORT: index: "2" lanes: "5,6,7,8" parent_port: Ethernet4 + admin_status: up speed: "100000" Ethernet120: alias: Eth31(Port31) diff --git a/partition/roles/sonic/test/data/sonic-vs/metal.yaml b/partition/roles/sonic/test/data/sonic-vs/metal.yaml index 20b0ab56..d3947d44 100644 --- a/partition/roles/sonic/test/data/sonic-vs/metal.yaml +++ b/partition/roles/sonic/test/data/sonic-vs/metal.yaml @@ -56,6 +56,7 @@ PORT: autoneg: "off" index: "1" lanes: "29,30,31,32" + admin_status: up speed: "40000" VLAN: From f1080ccce7a820a98a1ad76c461428137333805b Mon Sep 17 00:00:00 2001 From: iljarotar Date: Tue, 1 Oct 2024 11:11:30 +0200 Subject: [PATCH 3/3] remove unnecessary quotes --- partition/roles/sonic/templates/metal.yaml.j2 | 7 ++++--- .../roles/sonic/test/data/exit/metal.yaml | 6 +++--- .../roles/sonic/test/data/l2_leaf/input.yaml | 2 +- .../roles/sonic/test/data/l2_leaf/metal.yaml | 20 +++++++++---------- .../roles/sonic/test/data/mgmtleaf/metal.yaml | 12 +++++------ .../roles/sonic/test/data/sonic-vs/metal.yaml | 2 +- .../roles/sonic/test/data/spine/metal.yaml | 4 ++-- 7 files changed, 27 insertions(+), 26 deletions(-) diff --git a/partition/roles/sonic/templates/metal.yaml.j2 b/partition/roles/sonic/templates/metal.yaml.j2 index 105e86f8..55d4c078 100644 --- a/partition/roles/sonic/templates/metal.yaml.j2 +++ b/partition/roles/sonic/templates/metal.yaml.j2 @@ -107,13 +107,14 @@ PORT: {% if 'parent_port' in running_cfg %} parent_port: {{ running_cfg.parent_port }} {% endif %} - admin_status: up {% if sonic_ports_dict[name] is defined %} {% set port = sonic_ports_dict[name] %} + admin_status: {{ port.admin_status|default('up') }} speed: "{{ port.speed|default(sonic_ports_default_speed) }}" mtu: "{{ port.mtu|default(sonic_ports_default_mtu) }}" - fec: "{{ port.fec|default(sonic_ports_default_fec)|string|lower }}" + fec: {{ port.fec|default(sonic_ports_default_fec)|string|lower }} {% else %} + admin_status: up {% if running_cfg.speed is defined %} speed: "{{ running_cfg.speed }}" {% endif %} @@ -121,7 +122,7 @@ PORT: mtu: "{{ running_cfg.mtu }}" {% endif %} {% if running_cfg.fec is defined %} - fec: "{{ running_cfg.fec }}" + fec: {{ running_cfg.fec }} {% endif %} {% endif %} {% endfor %} diff --git a/partition/roles/sonic/test/data/exit/metal.yaml b/partition/roles/sonic/test/data/exit/metal.yaml index 35a92eb9..4c2a5bc8 100644 --- a/partition/roles/sonic/test/data/exit/metal.yaml +++ b/partition/roles/sonic/test/data/exit/metal.yaml @@ -61,7 +61,7 @@ PORT: admin_status: up speed: "10000" mtu: "1500" - fec: "none" + fec: none Ethernet1: alias: Eth1/2(Port1) autoneg: "off" @@ -95,7 +95,7 @@ PORT: admin_status: up speed: "100000" mtu: "9216" - fec: "none" + fec: none Ethernet116: alias: Eth30(Port30) autoneg: "off" @@ -105,7 +105,7 @@ PORT: admin_status: up speed: "100000" mtu: "9216" - fec: "none" + fec: none VLAN: Vlan4000: diff --git a/partition/roles/sonic/test/data/l2_leaf/input.yaml b/partition/roles/sonic/test/data/l2_leaf/input.yaml index 77982183..75601c61 100644 --- a/partition/roles/sonic/test/data/l2_leaf/input.yaml +++ b/partition/roles/sonic/test/data/l2_leaf/input.yaml @@ -73,7 +73,7 @@ sonic_running_cfg_ports: lanes: "4" parent_port: Ethernet0 speed: "10000" - fec: "rs" + fec: rs mtu: "9100" Ethernet4: alias: Eth2/1(Port2) diff --git a/partition/roles/sonic/test/data/l2_leaf/metal.yaml b/partition/roles/sonic/test/data/l2_leaf/metal.yaml index 16ce4dc3..1e714005 100644 --- a/partition/roles/sonic/test/data/l2_leaf/metal.yaml +++ b/partition/roles/sonic/test/data/l2_leaf/metal.yaml @@ -87,7 +87,7 @@ PORT: admin_status: up speed: "25000" mtu: "9000" - fec: "none" + fec: none Ethernet1: alias: Eth1/2(Port1) autoneg: "off" @@ -97,7 +97,7 @@ PORT: admin_status: up speed: "25000" mtu: "9000" - fec: "none" + fec: none Ethernet2: alias: Eth1/3(Port1) autoneg: "off" @@ -107,7 +107,7 @@ PORT: admin_status: up speed: "25000" mtu: "9000" - fec: "none" + fec: none Ethernet3: alias: Eth1/4(Port1) autoneg: "off" @@ -117,7 +117,7 @@ PORT: admin_status: up speed: "10000" mtu: "9100" - fec: "rs" + fec: rs Ethernet4: alias: Eth2/1(Port2) autoneg: "off" @@ -127,7 +127,7 @@ PORT: admin_status: up speed: "25000" mtu: "9000" - fec: "none" + fec: none Ethernet5: alias: Eth2/2(Port2) autoneg: "off" @@ -137,7 +137,7 @@ PORT: admin_status: up speed: "25000" mtu: "9000" - fec: "none" + fec: none Ethernet6: alias: Eth2/3(Port2) autoneg: "off" @@ -163,7 +163,7 @@ PORT: admin_status: up speed: "100000" mtu: "9216" - fec: "none" + fec: none Ethernet116: alias: Eth30(Port30) autoneg: "off" @@ -173,7 +173,7 @@ PORT: admin_status: up speed: "100000" mtu: "9216" - fec: "none" + fec: none Ethernet120: alias: Eth31(Port31) autoneg: "off" @@ -183,7 +183,7 @@ PORT: admin_status: up speed: "100000" mtu: "9216" - fec: "none" + fec: none Ethernet124: alias: Eth32(Port32) autoneg: "off" @@ -193,7 +193,7 @@ PORT: admin_status: up speed: "100000" mtu: "9216" - fec: "none" + fec: none PORTCHANNEL: PortChannel01: diff --git a/partition/roles/sonic/test/data/mgmtleaf/metal.yaml b/partition/roles/sonic/test/data/mgmtleaf/metal.yaml index 837b4b43..15f353b4 100644 --- a/partition/roles/sonic/test/data/mgmtleaf/metal.yaml +++ b/partition/roles/sonic/test/data/mgmtleaf/metal.yaml @@ -65,7 +65,7 @@ PORT: admin_status: up speed: "1000" mtu: "9000" - fec: "none" + fec: none Ethernet1: alias: Eth1/2(Port1) autoneg: "off" @@ -75,7 +75,7 @@ PORT: admin_status: up speed: "1000" mtu: "9000" - fec: "none" + fec: none Ethernet2: alias: Eth1/3(Port1) autoneg: "off" @@ -85,7 +85,7 @@ PORT: admin_status: up speed: "1000" mtu: "9000" - fec: "none" + fec: none Ethernet3: alias: Eth1/4(Port1) autoneg: "off" @@ -95,7 +95,7 @@ PORT: admin_status: up speed: "1000" mtu: "9000" - fec: "none" + fec: none Ethernet4: alias: Eth2(Port2) autoneg: "off" @@ -113,7 +113,7 @@ PORT: admin_status: up speed: "100000" mtu: "9216" - fec: "rs" + fec: rs Ethernet124: alias: Eth32(Port32) autoneg: "off" @@ -123,7 +123,7 @@ PORT: admin_status: up speed: "100000" mtu: "9000" - fec: "none" + fec: none VLAN: Vlan1: diff --git a/partition/roles/sonic/test/data/sonic-vs/metal.yaml b/partition/roles/sonic/test/data/sonic-vs/metal.yaml index d3947d44..9fbed0c2 100644 --- a/partition/roles/sonic/test/data/sonic-vs/metal.yaml +++ b/partition/roles/sonic/test/data/sonic-vs/metal.yaml @@ -50,7 +50,7 @@ PORT: admin_status: up speed: "40000" mtu: "9000" - fec: "none" + fec: none Ethernet4: alias: fortyGigE0/4 autoneg: "off" diff --git a/partition/roles/sonic/test/data/spine/metal.yaml b/partition/roles/sonic/test/data/spine/metal.yaml index 155855bb..0562f31b 100644 --- a/partition/roles/sonic/test/data/spine/metal.yaml +++ b/partition/roles/sonic/test/data/spine/metal.yaml @@ -56,7 +56,7 @@ PORT: admin_status: up speed: "100000" mtu: "9216" - fec: "none" + fec: none Ethernet124: alias: Eth32(Port32) autoneg: "off" @@ -66,7 +66,7 @@ PORT: admin_status: up speed: "100000" mtu: "9216" - fec: "none" + fec: none LLDP: Global: