From ca9c9275ed6d5d852987c69a378e88a3502cb2ab Mon Sep 17 00:00:00 2001 From: goldammx Date: Thu, 9 Feb 2017 08:03:00 -0500 Subject: pylint: Fixing pylint errors and warnings All python files must reach pylint score 10/10. This will be regularly verified by Jenkins jobs to keep constant code quality. VSPERF specific pylintrc file was updated according to the vsperf coding standards. Distro version included in reports will be slightly different, due to migration to new python package distro. Previously used platform.distro() will be deprecated since python 3.7. JIRA: VSPERF-487 Change-Id: I934120208b9624787a3567ccaa49e14d77d7a5bf Signed-off-by: Martin Goldammer Reviewed-by: Martin Klozik Reviewed-by: Al Morton Reviewed-by: Christian Trautman Reviewed-by: Bill Michalowski Reviewed-by: Antonio Fischetti Reviewed-by: Sridhar Rao --- core/component_factory.py | 4 +++- core/loader/loader.py | 6 +++--- core/loader/loader_servant.py | 4 ++-- core/vnf_controller.py | 8 ++++---- 4 files changed, 12 insertions(+), 10 deletions(-) (limited to 'core') diff --git a/core/component_factory.py b/core/component_factory.py index 236a61ed..0256b85c 100644 --- a/core/component_factory.py +++ b/core/component_factory.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Intel Corporation. +# Copyright 2015-2017 Intel Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -68,6 +68,7 @@ def create_vswitch(deployment_scenario, vswitch_class, traffic, :param tunnel_operation encapsulation/decapsulation or None :return: IVSwitchController for the deployment_scenario """ + # pylint: disable=too-many-return-statements deployment_scenario = deployment_scenario.lower() if deployment_scenario.startswith("p2p"): return VswitchControllerP2P(vswitch_class, traffic) @@ -124,6 +125,7 @@ def create_loadgen(loadgen_type, loadgen_cfg): :param loadgen_class: Reference to load generator class to be used. :return: A new ILoadGenerator class """ + # pylint: disable=too-many-function-args loadgen_type = loadgen_type.lower() if loadgen_type.find("dummy") >= 0: return DummyLoadGen(loadgen_cfg) diff --git a/core/loader/loader.py b/core/loader/loader.py index 0d9c83a6..b0990fa7 100755 --- a/core/loader/loader.py +++ b/core/loader/loader.py @@ -1,4 +1,4 @@ -# Copyright 2015 Intel Corporation. +# Copyright 2015-2017 Intel Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,11 +17,11 @@ from conf import settings from core.loader.loader_servant import LoaderServant -from tools.pkt_gen.trafficgen import ITrafficGenerator from tools.collectors.collector import ICollector +from tools.pkt_fwd.pkt_fwd import IPktFwd +from tools.pkt_gen.trafficgen import ITrafficGenerator from vswitches.vswitch import IVSwitch from vnfs.vnf.vnf import IVnf -from tools.pkt_fwd.pkt_fwd import IPktFwd class Loader(object): """Loader class - main object context holder. diff --git a/core/loader/loader_servant.py b/core/loader/loader_servant.py index 226b0931..bbb4ea9d 100644 --- a/core/loader/loader_servant.py +++ b/core/loader/loader_servant.py @@ -1,4 +1,4 @@ -# Copyright 2015 Intel Corporation. +# Copyright 2015-2017 Intel Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -142,7 +142,7 @@ class LoaderServant(object): # find all classes derived from given interface, but suppress # interface itself and any abstract class starting with iface name gens = dict((k, v) for (k, v) in list(mod.__dict__.items()) - if type(v) == type and + if isinstance(v, type) and issubclass(v, interface) and not k.startswith(interface.__name__)) if gens: diff --git a/core/vnf_controller.py b/core/vnf_controller.py index 937cd5cc..78a29258 100644 --- a/core/vnf_controller.py +++ b/core/vnf_controller.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Intel Corporation. +# Copyright 2015-2017 Intel Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -67,10 +67,10 @@ class VnfController(object): # enforce that GUEST_NIC_NR is 1 or even number of NICs updated = False nics_nr = settings.getValue('GUEST_NICS_NR') - for index in range(len(nics_nr)): - if nics_nr[index] > 1 and nics_nr[index] % 2: + for index, value in enumerate(nics_nr): + if value > 1 and value % 2: updated = True - nics_nr[index] = int(nics_nr[index] / 2) * 2 + nics_nr[index] = int(value / 2) * 2 if updated: settings.setValue('GUEST_NICS_NR', nics_nr) self._logger.warning('Odd number of NICs was detected. Configuration ' -- cgit 1.2.3-korg