[v2] framework/dut: fix pylama errors
Checks
| Context |
Check |
Description |
| ci/Intel-dts-suite-test |
success
|
Testing OK
|
Commit Message
Pylama found the following errors:
framework/dut.py:273: [E] E0602 Undefined variable 'threading' [pylint]
framework/dut.py:591: [E] E1101 Instance of 'Dut' has no 'get_def_rte_config' member [pylint]
- move the method from child class
framework/dut.py:631: [E] E0602 Undefined variable 'crbs' [pylint]
framework/dut.py:840: [E] E0602 Undefined variable 'ResultTable' [pylint]
framework/dut.py:846: [E] E0602 Undefined variable 'ResultTable' [pylint]
framework/dut.py:929: [E] E0602 Undefined variable 'pci_bus' [pylint]
framework/dut.py:1173: [E] E0602 Undefined variable 'VMCORELIST' [pylint]
- remove unused method
Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
---
Lijuan, please add additional people to review if needed.
---
framework/dut.py | 23 ++++++++++++++++++-----
framework/project_dpdk.py | 13 -------------
2 files changed, 18 insertions(+), 18 deletions(-)
Comments
> -----Original Message-----
> From: Juraj Linkeš <juraj.linkes@pantheon.tech>
> Sent: Wednesday, January 19, 2022 8:06 PM
> To: Tu, Lijuan <lijuan.tu@intel.com>; ohilyard@iol.unh.edu; Dong, JunX
> <junx.dong@intel.com>
> Cc: dts@dpdk.org; Juraj Linkeš <juraj.linkes@pantheon.tech>
> Subject: [PATCH v2] framework/dut: fix pylama errors
>
> Pylama found the following errors:
> framework/dut.py:273: [E] E0602 Undefined variable 'threading' [pylint]
> framework/dut.py:591: [E] E1101 Instance of 'Dut' has no
> 'get_def_rte_config' member [pylint]
> - move the method from child class
> framework/dut.py:631: [E] E0602 Undefined variable 'crbs' [pylint]
> framework/dut.py:840: [E] E0602 Undefined variable 'ResultTable' [pylint]
> framework/dut.py:846: [E] E0602 Undefined variable 'ResultTable' [pylint]
> framework/dut.py:929: [E] E0602 Undefined variable 'pci_bus' [pylint]
> framework/dut.py:1173: [E] E0602 Undefined variable 'VMCORELIST' [pylint]
> - remove unused method
>
> Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
> ---
> Lijuan, please add additional people to review if needed.
> ---
Tested-by: Jun Dong <junx. dong@intel.com>
> -----Original Message-----
> From: Dong, JunX <junx.dong@intel.com>
> Sent: 2022年1月25日 11:31
> To: Juraj Linkeš <juraj.linkes@pantheon.tech>; Tu, Lijuan <lijuan.tu@intel.com>;
> ohilyard@iol.unh.edu
> Cc: dts@dpdk.org
> Subject: RE: [PATCH v2] framework/dut: fix pylama errors
>
> > -----Original Message-----
> > From: Juraj Linkeš <juraj.linkes@pantheon.tech>
> > Sent: Wednesday, January 19, 2022 8:06 PM
> > To: Tu, Lijuan <lijuan.tu@intel.com>; ohilyard@iol.unh.edu; Dong, JunX
> > <junx.dong@intel.com>
> > Cc: dts@dpdk.org; Juraj Linkeš <juraj.linkes@pantheon.tech>
> > Subject: [PATCH v2] framework/dut: fix pylama errors
> >
> > Pylama found the following errors:
> > framework/dut.py:273: [E] E0602 Undefined variable 'threading'
> > [pylint]
> > framework/dut.py:591: [E] E1101 Instance of 'Dut' has no
> > 'get_def_rte_config' member [pylint]
> > - move the method from child class
> > framework/dut.py:631: [E] E0602 Undefined variable 'crbs' [pylint]
> > framework/dut.py:840: [E] E0602 Undefined variable 'ResultTable'
> > [pylint]
> > framework/dut.py:846: [E] E0602 Undefined variable 'ResultTable'
> > [pylint]
> > framework/dut.py:929: [E] E0602 Undefined variable 'pci_bus' [pylint]
> > framework/dut.py:1173: [E] E0602 Undefined variable 'VMCORELIST'
> > [pylint]
> > - remove unused method
> >
> > Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
> > ---
> > Lijuan, please add additional people to review if needed.
> > ---
>
> Tested-by: Jun Dong <junx. dong@intel.com>
Applied, thanks
@@ -31,6 +31,7 @@
import os
import re
+import threading
import time
from uuid import uuid4
@@ -41,6 +42,7 @@ from .config import AppNameConf, PortConf
from .crb import Crb
from .settings import LOG_NAME_SEP, NICS
from .ssh_connection import SSHConnection
+from .test_result import ResultTable
from .utils import RED, remove_old_rsa_key
from .virt_resource import VirtResource
@@ -540,6 +542,19 @@ class Dut(Crb):
except AttributeError:
self.logger.error("%s is not implemented" % function_name)
+ def get_def_rte_config(self, config):
+ """
+ Get RTE configuration from config/defconfig_*.
+ """
+ out = self.send_expect("cat config/defconfig_%s | sed '/^#/d' | sed '/^\s*$/d'"
+ % self.target, "# ")
+
+ def_rte_config = re.findall(config+'=(\S+)', out)
+ if def_rte_config:
+ return def_rte_config[0]
+ else:
+ return None
+
def setup_memory_linux(self, hugepages=-1):
"""
Setup Linux hugepages.
@@ -628,7 +643,7 @@ class Dut(Crb):
if pci_bus == port_info['pci']:
port = port_info['port']
break
- if port and port.get_ipv4_addr() == crbs['IP'].strip():
+ if port and port.get_ipv4_addr() == self.get_ip_address().strip():
return True
else:
return False
@@ -926,7 +941,8 @@ class Dut(Crb):
port = port_info['port']
intf = port.get_interface_name()
if "No such file" in intf:
- self.logger.info("DUT: [%s] %s" % (pci_bus, unknow_interface))
+ self.logger.info("DUT: [%s] %s" % (port_info['pci'],
+ unknow_interface))
continue
self.send_expect("ifconfig %s up" % intf, "# ")
time.sleep(5)
@@ -1169,9 +1185,6 @@ class Dut(Crb):
for port_id in range(len(self.ports_info)):
self.destroy_sriov_vfs_by_port(port_id)
- def get_vm_core_list(self):
- return VMCORELIST[self.crb['VM CoreList']]
-
def load_portconf(self):
"""
Load port configurations for ports_info. If manually configured info
@@ -649,19 +649,6 @@ class DPDKdut(Dut):
# No blocklist option in FreeBSD
return blocklist
- def get_def_rte_config(self, config):
- """
- Get RTE configuration from config/defconfig_*.
- """
- out = self.send_expect("cat config/defconfig_%s | sed '/^#/d' | sed '/^\s*$/d'"
- % self.target, "# ")
-
- def_rte_config = re.findall(config+'=(\S+)', out)
- if def_rte_config:
- return def_rte_config[0]
- else:
- return None
-
def set_driver_specific_configurations(self, drivername):
"""
Set configurations required for specific drivers before compilation.