From 7496605db33f448f3b0b83d7cf3dbcbed6e869b8 Mon Sep 17 00:00:00 2001 From: Sam Tannous Date: Thu, 20 Aug 2015 23:12:26 -0400 Subject: [PATCH] ifupdown2 ethtool does not handle link-* settings on enslaved ports Ticket: CM-7128 Reviewed By: Trivial Testing Done: unit tested on Ken's machine The ifupdown2 ethtool addon module fails to set/check the link-speed on bridge ports. I removed excessive ifaceLinkKind checking since CM-6619 (03642a9a) added BRIDGE_PORT and BOND_SLAVE. This is ok since we now check to see if ports have defaults (only swp do) before showing or changing settings). --- addons/ethtool.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/addons/ethtool.py b/addons/ethtool.py index 177e9f9..06cad88 100644 --- a/addons/ethtool.py +++ b/addons/ethtool.py @@ -236,13 +236,6 @@ class ethtool(moduleBase,utilsBase): if not op_handler: return self._init_command_handlers() - # while this will not catch all interface kinds, we try for most here - # we should only be running ethtool on real, hardware devices. For - # newer interfaces that do not set link_kind, they should not have - # a default attribute setting since update-ports only generates - # settings for hardware ports. - if ifaceobj.link_kind != ifaceLinkKind.UNKNOWN: - return if operation == 'query-checkcurr': op_handler(self, ifaceobj, query_ifaceobj)