From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B914FA00C3; Wed, 15 Dec 2021 16:28:45 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7E23D40688; Wed, 15 Dec 2021 16:28:45 +0100 (CET) Received: from lb.pantheon.sk (lb.pantheon.sk [46.229.239.20]) by mails.dpdk.org (Postfix) with ESMTP id 20EFB40041 for ; Wed, 15 Dec 2021 16:28:44 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by lb.pantheon.sk (Postfix) with ESMTP id 362D516BC06; Wed, 15 Dec 2021 16:28:43 +0100 (CET) X-Virus-Scanned: amavisd-new at siecit.sk Received: from lb.pantheon.sk ([127.0.0.1]) by localhost (lb.pantheon.sk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pMxF0i2HJs26; Wed, 15 Dec 2021 16:28:41 +0100 (CET) Received: from service-node1.lab.pantheon.local (unknown [46.229.239.141]) by lb.pantheon.sk (Postfix) with ESMTP id 7A5A316BC03; Wed, 15 Dec 2021 16:28:41 +0100 (CET) From: =?UTF-8?q?Juraj=20Linke=C5=A1?= To: lijuan.tu@intel.com, ohilyard@iol.unh.edu, junx.dong@intel.com Cc: dts@dpdk.org, =?UTF-8?q?Juraj=20Linke=C5=A1?= Subject: [PATCH v2] nics/net_device: fix pylama errors Date: Wed, 15 Dec 2021 16:28:41 +0100 Message-Id: <1639582121-26177-1-git-send-email-juraj.linkes@pantheon.tech> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1638793115-2374-2-git-send-email-juraj.linkes@pantheon.tech> References: <1638793115-2374-2-git-send-email-juraj.linkes@pantheon.tech> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Pylama found the following errors: nics/net_device.py:104: [E] E0213 Method should have "self" as first argument [pylint] nics/net_device.py:114: [E] E1102 func is not callable [pylint] - moved the decorator outside class definition, which is the standard way to define decorators nics/net_device.py:206: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint] nics/net_device.py:297: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint] nics/net_device.py:309: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint] nics/net_device.py:321: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint] nics/net_device.py:401: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint] nics/net_device.py:441: [E] E0602 Undefined variable 'bus_id' [pylint] nics/net_device.py:461: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint] nics/net_device.py:490: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint] nics/net_device.py:516: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint] nics/net_device.py:519: [E] E0102 method already defined line 510 [pylint] nics/net_device.py:525: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint] nics/net_device.py:622: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint] nics/net_device.py:696: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint] Signed-off-by: Juraj Linkeš --- Lijuan, please add additional people to review if needed. --- nics/net_device.py | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/nics/net_device.py b/nics/net_device.py index 96f31327..19e239e4 100644 --- a/nics/net_device.py +++ b/nics/net_device.py @@ -45,6 +45,22 @@ NICS_LIST = [] # global list for save nic objects MIN_MTU = 68 +def nic_has_driver(func): + """ + Check if the NIC has a driver. + """ + + @wraps(func) + def wrapper(*args, **kwargs): + nic_instance = args[0] + nic_instance.current_driver = nic_instance.get_nic_driver() + if not nic_instance.current_driver: + return '' + return func(*args, **kwargs) + + return wrapper + + class NetDevice(object): """ @@ -73,6 +89,7 @@ class NetDevice(object): self.driver_version = '' self.firmware = '' self.pkg = None + self.current_driver = None def stop(self): pass @@ -101,19 +118,6 @@ class NetDevice(object): """ return True - def nic_has_driver(func): - """ - Check if the NIC has a driver. - """ - @wraps(func) - def wrapper(*args, **kwargs): - nic_instance = args[0] - nic_instance.current_driver = nic_instance.get_nic_driver() - if not nic_instance.current_driver: - return '' - return func(*args, **kwargs) - return wrapper - def get_nic_driver(self): """ Get the NIC driver. @@ -273,7 +277,7 @@ class NetDevice(object): """ Get the interface name by the default way on freebsd. """ - pci_str = "%s:%s:%s" % (domain_id, bus_id, devfun_id) + pci_str = "%s:%s:%s" % (domain_id, bus_id, devfun_id) out = self.__send_expect("pciconf -l", "# ") rexp = r"(\w*)@pci0:%s" % pci_str pattern = re.compile(rexp) @@ -438,7 +442,7 @@ class NetDevice(object): 'get_ipv4_addr_freebsd_%s' % generic_driver) - return get_ipv4_addr_freebsd(intf, bus_id, devfun_id) + return get_ipv4_addr_freebsd(intf) def get_ipv4_addr_freebsd_generic(self, intf): """ @@ -515,15 +519,6 @@ class NetDevice(object): self, 'get_ipv6_addr_%s' % self.__get_os_type()) return get_ipv6_addr(self.intf_name, self.current_driver) - @nic_has_driver - def get_ipv6_addr(self): - """ - Get ipv6 address of specified pci device. - """ - get_ipv6_addr = getattr( - self, 'get_ipv6_addr_%s' % self.__get_os_type()) - return get_ipv6_addr(self.intf_name, self.current_driver) - def get_ipv6_addr_linux(self, intf, driver): """ Get ipv6 address of specified pci device on linux. -- 2.20.1