Fix last Pylint error in Functest

It also fixes all pylint warnings in router and the related unit
tests. tox.ini is updated to ensure that no error is introduced.

Change-Id: Iddd74b0dac7b6581d72b04369140006c9e19f998
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

5 files changed, 40 insertions, 19 deletions

diff --git a/functest/opnfv_tests/vnf/router/vnf_controller/checker.py b/functest/opnfv_tests/vnf/router/vnf_controller/checker.py
index 198a5ffc9..a7a70f6d7 100644
--- a/functest/opnfv_tests/vnf/router/vnf_controller/checker.py
+++ b/functest/opnfv_tests/vnf/router/vnf_controller/checker.py
@@ -7,6 +7,8 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 
+# pylint: disable=missing-docstring
+
 """vrouter test result check module"""
 
 import json
@@ -24,7 +26,8 @@ class Checker(object):
     def __init__(self):
         self.logger.debug("init checker")
 
-    def load_check_rule(self, rule_file_dir, rule_file_name, parameter):
+    @staticmethod
+    def load_check_rule(rule_file_dir, rule_file_name, parameter):
         loader = FileSystemLoader(rule_file_dir,
                                   encoding='utf8')
         env = Environment(loader=loader)
@@ -33,7 +36,8 @@ class Checker(object):
         check_rule_data = json.loads(check_rule)
         return check_rule_data
 
-    def regexp_information(self, response, rules):
+    @staticmethod
+    def regexp_information(response, rules):
         status = False
         result_data = {}
 
diff --git a/functest/opnfv_tests/vnf/router/vnf_controller/command_generator.py b/functest/opnfv_tests/vnf/router/vnf_controller/command_generator.py
index 98cb14cc0..7d9116bcc 100644
--- a/functest/opnfv_tests/vnf/router/vnf_controller/command_generator.py
+++ b/functest/opnfv_tests/vnf/router/vnf_controller/command_generator.py
@@ -7,6 +7,8 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 
+# pylint: disable=missing-docstring
+
 """command generator module for vrouter testing"""
 
 import logging
@@ -21,12 +23,16 @@ class CommandGenerator(object):
     def __init__(self):
         self.logger.debug("init command generator")
 
-    def load_template(self, template_dir, template):
+    @staticmethod
+    def load_template(template_dir, template):
+        # pylint disable=missing-docstring
         loader = FileSystemLoader(template_dir,
                                   encoding='utf8')
         env = Environment(loader=loader)
         return env.get_template(template)
 
-    def command_create(self, template, parameter):
+    @staticmethod
+    def command_create(template, parameter):
+        # pylint disable=missing-docstring
         commands = template.render(parameter)
         return commands.split('\n')
diff --git a/functest/opnfv_tests/vnf/router/vnf_controller/ssh_client.py b/functest/opnfv_tests/vnf/router/vnf_controller/ssh_client.py
index c85a57351..628afd30e 100644
--- a/functest/opnfv_tests/vnf/router/vnf_controller/ssh_client.py
+++ b/functest/opnfv_tests/vnf/router/vnf_controller/ssh_client.py
@@ -10,10 +10,11 @@
 """ssh client module for vrouter testing"""
 
 import logging
-import paramiko
 import time
 import yaml
 
+import paramiko
+
 from functest.opnfv_tests.vnf.router.utilvnf import Utilvnf
 
 RECEIVE_ROOP_WAIT = 1
@@ -23,7 +24,7 @@ DEFAULT_CONNECT_RETRY_COUNT = 10
 DEFAULT_SEND_TIMEOUT = 10
 
 
-class SshClient(object):
+class SshClient(object):  # pylint: disable=too-many-instance-attributes
     """ssh client class for vrouter testing"""
 
     logger = logging.getLogger(__name__)
@@ -51,6 +52,7 @@ class SshClient(object):
 
     def connect(self, time_out=DEFAULT_CONNECT_TIMEOUT,
                 retrycount=DEFAULT_CONNECT_RETRY_COUNT):
+        # pylint: disable=missing-docstring
         while retrycount > 0:
             try:
                 self.logger.info("SSH connect to %s.", self.ip_address)
@@ -72,7 +74,7 @@ class SshClient(object):
 
                 self.shell.recv(self.ssh_revieve_buff)
                 break
-            except:  # pylint: disable=broad-except
+            except Exception:  # pylint: disable=broad-except
                 self.logger.info("SSH timeout for %s...", self.ip_address)
                 time.sleep(time_out)
                 retrycount -= 1
@@ -88,13 +90,14 @@ class SshClient(object):
         return self.connected
 
     def send(self, cmd, prompt, timeout=DEFAULT_SEND_TIMEOUT):
+        # pylint: disable=missing-docstring
         if self.connected is True:
             self.shell.settimeout(timeout)
             self.logger.debug("Commandset : '%s'", cmd)
 
             try:
                 self.shell.send(cmd + '\n')
-            except:  # pylint: disable=broad-except
+            except Exception:  # pylint: disable=broad-except
                 self.logger.error("ssh send timeout : Command : '%s'", cmd)
                 return None
 
@@ -103,7 +106,7 @@ class SshClient(object):
                 time.sleep(RECEIVE_ROOP_WAIT)
                 try:
                     res = self.shell.recv(self.ssh_revieve_buff)
-                except:  # pylint: disable=broad-except
+                except Exception:  # pylint: disable=broad-except
                     self.logger.error("ssh receive timeout : Command : '%s'",
                                       cmd)
                     break
@@ -112,18 +115,19 @@ class SshClient(object):
 
             self.logger.debug("Response : '%s'", res_buff)
             return res_buff
-        else:
-            self.logger.error("Cannot connected to IP '%s'.", self.ip_address)
-            return None
+        self.logger.error("Cannot connected to IP '%s'.", self.ip_address)
+        return None
 
     def close(self):
+        # pylint: disable=missing-docstring
         if self.connected is True:
             self.ssh.close()
 
-    def error_check(response, err_strs=["error",
-                                        "warn",
-                                        "unknown command",
-                                        "already exist"]):
+    @staticmethod
+    def error_check(response, err_strs=None):
+        # pylint: disable=missing-docstring
+        if err_strs is None:
+            err_strs = ["error", "warn", "unknown command", "already exist"]
         for err in err_strs:
             if err in response:
                 return False
diff --git a/functest/opnfv_tests/vnf/router/vnf_controller/vm_controller.py b/functest/opnfv_tests/vnf/router/vnf_controller/vm_controller.py
index d1c2e3242..10e486455 100644
--- a/functest/opnfv_tests/vnf/router/vnf_controller/vm_controller.py
+++ b/functest/opnfv_tests/vnf/router/vnf_controller/vm_controller.py
@@ -7,6 +7,8 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 
+# pylint: disable=missing-docstring
+
 """vm controll module"""
 
 import logging
diff --git a/functest/opnfv_tests/vnf/router/vnf_controller/vnf_controller.py b/functest/opnfv_tests/vnf/router/vnf_controller/vnf_controller.py
index 814e9e333..a5b1ad856 100644
--- a/functest/opnfv_tests/vnf/router/vnf_controller/vnf_controller.py
+++ b/functest/opnfv_tests/vnf/router/vnf_controller/vnf_controller.py
@@ -7,14 +7,17 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 
+# pylint: disable=missing-docstring
+
 """vrouter controll module"""
 
 import logging
 import os
-import prettytable
 import time
 import yaml
 
+import prettytable
+
 from functest.opnfv_tests.vnf.router.utilvnf import Utilvnf
 from functest.opnfv_tests.vnf.router.vnf_controller.checker import Checker
 from functest.opnfv_tests.vnf.router.vnf_controller.ssh_client import (
@@ -45,6 +48,7 @@ class VnfController(object):
 
     def config_vnf(self, source_vnf, destination_vnf, test_cmd_file_path,
                    parameter_file_path, prompt_file_path):
+        # pylint: disable=too-many-arguments
         parameter_file = open(parameter_file_path,
                               'r')
         cmd_input_param = yaml.safe_load(parameter_file)
@@ -63,6 +67,7 @@ class VnfController(object):
     def result_check(self, target_vnf, reference_vnf,
                      check_rule_file_path_list, parameter_file_path,
                      prompt_file_path):
+        # pylint: disable=too-many-arguments,too-many-locals
 
         res_dict_data_list = []
 
@@ -93,8 +98,8 @@ class VnfController(object):
         checker = Checker()
 
         res_table = prettytable.PrettyTable(
-                        header_style='upper', padding_width=5,
-                        field_names=['test item', 'result'])
+            header_style='upper', padding_width=5,
+            field_names=['test item', 'result'])
 
         status = True
         res_data_list = []