From 98fab2267d805c4a3b74482d1a4942a7917e7fc7 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 1 Apr 2026 23:19:30 +0200 Subject: [PATCH 1/2] Add Dell OS10 bond trunk support Change-Id: Ic0cff059ca315aa3fd058d892a3c36f2da07eded Signed-off-by: Pierre Riteau (cherry picked from commit df7c0a29577d49ca89dbdd567e5a4ccfa21a0d8e) --- .../devices/netmiko_devices/dell.py | 37 +++++++++++++++++++ ...dell-os10-bond-trunk-8df03c8490ee94b0.yaml | 5 +++ 2 files changed, 42 insertions(+) create mode 100644 releasenotes/notes/dell-os10-bond-trunk-8df03c8490ee94b0.yaml diff --git a/networking_generic_switch/devices/netmiko_devices/dell.py b/networking_generic_switch/devices/netmiko_devices/dell.py index 90e44947..ea18720e 100644 --- a/networking_generic_switch/devices/netmiko_devices/dell.py +++ b/networking_generic_switch/devices/netmiko_devices/dell.py @@ -39,12 +39,25 @@ class DellOS10(netmiko_devices.NetmikoSwitch): "exit", ) + PLUG_BOND_TO_NETWORK = ( + "interface {bond}", + "switchport mode access", + "switchport access vlan {segmentation_id}", + "exit", + ) + DELETE_PORT = ( "interface {port}", "no switchport access vlan", "exit", ) + UNPLUG_BOND_FROM_NETWORK = ( + "interface {bond}", + "no switchport access vlan", + "exit", + ) + ADD_NETWORK_TO_TRUNK = ( "interface {port}", "switchport mode trunk", @@ -52,23 +65,47 @@ class DellOS10(netmiko_devices.NetmikoSwitch): "exit", ) + ADD_NETWORK_TO_BOND_TRUNK = ( + "interface {bond}", + "switchport mode trunk", + "switchport trunk allowed vlan {segmentation_id}", + "exit", + ) + REMOVE_NETWORK_FROM_TRUNK = ( "interface {port}", "no switchport trunk allowed vlan {segmentation_id}", "exit", ) + DELETE_NETWORK_ON_BOND_TRUNK = ( + "interface {bond}", + "no switchport trunk allowed vlan {segmentation_id}", + "exit", + ) + SET_NATIVE_VLAN = ( 'interface {port}', 'switchport mode trunk', 'switchport access vlan {segmentation_id}', ) + SET_NATIVE_VLAN_BOND = ( + 'interface {bond}', + 'switchport mode trunk', + 'switchport access vlan {segmentation_id}', + ) + DELETE_NATIVE_VLAN = ( 'interface {port}', 'no switchport access vlan', ) + DELETE_NATIVE_VLAN_BOND = ( + 'interface {bond}', + 'no switchport access vlan', + ) + ENABLE_PORT = ( "interface {port}", "no shutdown", diff --git a/releasenotes/notes/dell-os10-bond-trunk-8df03c8490ee94b0.yaml b/releasenotes/notes/dell-os10-bond-trunk-8df03c8490ee94b0.yaml new file mode 100644 index 00000000..e7929c72 --- /dev/null +++ b/releasenotes/notes/dell-os10-bond-trunk-8df03c8490ee94b0.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Add bond trunk commands so LACP bond trunk ports are supported on Dell OS10 + switches. From d00e900fa1d56b4f03a72ca4569169bfd65ef2d5 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Tue, 30 Jun 2026 22:14:32 +0200 Subject: [PATCH 2/2] Sanitise secret config field Closes-Bug: #2086713 Change-Id: I981a6d148bbf2117805d0e3d94b3f3aecdfc5fc3 Signed-off-by: Pierre Riteau (cherry picked from commit 95e2a90beac9adb65ac2b26e0c99b516452d513a) --- networking_generic_switch/devices/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/networking_generic_switch/devices/utils.py b/networking_generic_switch/devices/utils.py index 429eaf59..9ce63100 100644 --- a/networking_generic_switch/devices/utils.py +++ b/networking_generic_switch/devices/utils.py @@ -46,7 +46,7 @@ def sanitise_config(config): :param config: a configuration dict to sanitise. :returns: a copy of the configuration, with sensitive fields removed. """ - sanitised_fields = {"password", "ip", "device_type", "username", + sanitised_fields = {"password", "secret", "ip", "device_type", "username", "session_log"} return { key: "******" if key in sanitised_fields else value