Switch to Python 3.7 and Alpine 3.10

It also allows building docs as doc8 is broken due to latest
OpenStack's upper-constraints.

pylint is updated to 2.3.1 (lastest py3.7 version)

It disables perm as umask is currently false on lf-virtual1.

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

17 files changed, 85 insertions, 87 deletions

diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index efc2e784f..7438d7155 100644
--- a/functest/opnfv_tests/openstack/rally/rally.py
+++ b/functest/opnfv_tests/openstack/rally/rally.py
@@ -40,29 +40,29 @@ class RallyBase(singlevm.VmReady2):
     """Base class form Rally testcases implementation."""
 
     # pylint: disable=too-many-instance-attributes, too-many-public-methods
-    TESTS = ['authenticate', 'glance', 'cinder', 'gnocchi', 'heat',
-             'keystone', 'neutron', 'nova', 'quotas', 'swift', 'barbican']
+    stests = ['authenticate', 'glance', 'cinder', 'gnocchi', 'heat',
+              'keystone', 'neutron', 'nova', 'quotas', 'swift', 'barbican']
 
-    RALLY_CONF_PATH = "/etc/rally/rally.conf"
-    RALLY_AARCH64_PATCH_PATH = pkg_resources.resource_filename(
+    rally_conf_path = "/etc/rally/rally.conf"
+    rally_aar4_patch_path = pkg_resources.resource_filename(
         'functest', 'ci/rally_aarch64_patch.conf')
-    RALLY_DIR = pkg_resources.resource_filename(
+    rally_dir = pkg_resources.resource_filename(
         'functest', 'opnfv_tests/openstack/rally')
-    RALLY_SCENARIO_DIR = pkg_resources.resource_filename(
+    rally_scenario_dir = pkg_resources.resource_filename(
         'functest', 'opnfv_tests/openstack/rally/scenario')
-    TEMPLATE_DIR = pkg_resources.resource_filename(
+    template_dir = pkg_resources.resource_filename(
         'functest', 'opnfv_tests/openstack/rally/scenario/templates')
-    SUPPORT_DIR = pkg_resources.resource_filename(
+    support_dir = pkg_resources.resource_filename(
         'functest', 'opnfv_tests/openstack/rally/scenario/support')
-    USERS_AMOUNT = 2
-    TENANTS_AMOUNT = 3
-    ITERATIONS_AMOUNT = 10
-    CONCURRENCY = 4
-    VOLUME_VERSION = 3
-    VOLUME_SERVICE_TYPE = "volumev3"
-    BLACKLIST_FILE = os.path.join(RALLY_DIR, "blacklist.yaml")
-    TASK_DIR = os.path.join(getattr(config.CONF, 'dir_rally_data'), 'task')
-    TEMP_DIR = os.path.join(TASK_DIR, 'var')
+    users_amount = 2
+    tenants_amount = 3
+    iterations_amount = 10
+    concurrency = 4
+    volume_version = 3
+    volume_service_type = "volumev3"
+    blacklist_file = os.path.join(rally_dir, "blacklist.yaml")
+    task_dir = os.path.join(getattr(config.CONF, 'dir_rally_data'), 'task')
+    temp_dir = os.path.join(task_dir, 'var')
 
     visibility = 'public'
     shared_network = True
@@ -108,16 +108,16 @@ class RallyBase(singlevm.VmReady2):
         task_args['flavor_alt_name'] = str(self.flavor_alt.name)
         task_args['glance_image_location'] = str(self.filename)
         task_args['glance_image_format'] = str(self.image_format)
-        task_args['tmpl_dir'] = str(self.TEMPLATE_DIR)
-        task_args['sup_dir'] = str(self.SUPPORT_DIR)
-        task_args['users_amount'] = self.USERS_AMOUNT
-        task_args['tenants_amount'] = self.TENANTS_AMOUNT
+        task_args['tmpl_dir'] = str(self.template_dir)
+        task_args['sup_dir'] = str(self.support_dir)
+        task_args['users_amount'] = self.users_amount
+        task_args['tenants_amount'] = self.tenants_amount
         task_args['use_existing_users'] = False
-        task_args['iterations'] = self.ITERATIONS_AMOUNT
-        task_args['concurrency'] = self.CONCURRENCY
+        task_args['iterations'] = self.iterations_amount
+        task_args['concurrency'] = self.concurrency
         task_args['smoke'] = self.smoke
-        task_args['volume_version'] = self.VOLUME_VERSION
-        task_args['volume_service_type'] = self.VOLUME_SERVICE_TYPE
+        task_args['volume_version'] = self.volume_version
+        task_args['volume_service_type'] = self.volume_service_type
         task_args['block_migration'] = env.get("BLOCK_MIGRATION").lower()
 
         if self.ext_net:
@@ -135,7 +135,7 @@ class RallyBase(singlevm.VmReady2):
     def _prepare_test_list(self, test_name):
         """Build the list of test cases to be executed."""
         test_yaml_file_name = 'opnfv-{}.yaml'.format(test_name)
-        scenario_file_name = os.path.join(self.RALLY_SCENARIO_DIR,
+        scenario_file_name = os.path.join(self.rally_scenario_dir,
                                           test_yaml_file_name)
 
         if not os.path.exists(scenario_file_name):
@@ -147,10 +147,10 @@ class RallyBase(singlevm.VmReady2):
                                 % scenario_file_name)
 
         LOGGER.debug('Scenario fetched from : %s', scenario_file_name)
-        test_file_name = os.path.join(self.TEMP_DIR, test_yaml_file_name)
+        test_file_name = os.path.join(self.temp_dir, test_yaml_file_name)
 
-        if not os.path.exists(self.TEMP_DIR):
-            os.makedirs(self.TEMP_DIR)
+        if not os.path.exists(self.temp_dir):
+            os.makedirs(self.temp_dir)
 
         self.apply_blacklist(scenario_file_name, test_file_name)
         return test_file_name
@@ -178,10 +178,10 @@ class RallyBase(singlevm.VmReady2):
 
         if pod_arch and pod_arch in arch_filter:
             LOGGER.info("Apply aarch64 specific to rally config...")
-            with open(RallyBase.RALLY_AARCH64_PATCH_PATH, "r") as pfile:
+            with open(RallyBase.rally_aar4_patch_path, "r") as pfile:
                 rally_patch_conf = pfile.read()
 
-            for line in fileinput.input(RallyBase.RALLY_CONF_PATH):
+            for line in fileinput.input(RallyBase.rally_conf_path):
                 print(line, end=' ')
                 if "cirros|testvm" in line:
                     print(rally_patch_conf)
@@ -282,7 +282,7 @@ class RallyBase(singlevm.VmReady2):
         """Exclude scenario."""
         black_tests = []
         try:
-            with open(RallyBase.BLACKLIST_FILE, 'r') as black_list_file:
+            with open(RallyBase.blacklist_file, 'r') as black_list_file:
                 black_list_yaml = yaml.safe_load(black_list_file)
 
             deploy_scenario = env.get('DEPLOY_SCENARIO')
@@ -326,7 +326,7 @@ class RallyBase(singlevm.VmReady2):
         func_list = []
 
         try:
-            with open(RallyBase.BLACKLIST_FILE, 'r') as black_list_file:
+            with open(RallyBase.blacklist_file, 'r') as black_list_file:
                 black_list_yaml = yaml.safe_load(black_list_file)
 
             if env.get('BLOCK_MIGRATION').lower() == 'true':
@@ -439,6 +439,7 @@ class RallyBase(singlevm.VmReady2):
         self._save_results(test_name, task_id)
 
     def _append_summary(self, json_raw, test_name):
+        # pylint: disable=too-many-locals
         """Update statistics summary info."""
         nb_tests = 0
         nb_success = 0
@@ -481,29 +482,29 @@ class RallyBase(singlevm.VmReady2):
         """Prepare resources needed by test scenarios."""
         assert self.cloud
         LOGGER.debug('Validating run tests...')
-        for test in kwargs.get('tests', self.TESTS):
-            if test in self.TESTS:
+        for test in kwargs.get('tests', self.stests):
+            if test in self.stests:
                 self.tests.append(test)
             else:
                 raise Exception("Test name '%s' is invalid" % test)
 
-        if not os.path.exists(self.TASK_DIR):
-            os.makedirs(self.TASK_DIR)
+        if not os.path.exists(self.task_dir):
+            os.makedirs(self.task_dir)
 
-        task = os.path.join(self.RALLY_DIR, 'task.yaml')
+        task = os.path.join(self.rally_dir, 'task.yaml')
         if not os.path.exists(task):
             LOGGER.error("Task file '%s' does not exist.", task)
             raise Exception("Task file '{}' does not exist.".
                             format(task))
-        self.task_file = os.path.join(self.TASK_DIR, 'task.yaml')
+        self.task_file = os.path.join(self.task_dir, 'task.yaml')
         shutil.copyfile(task, self.task_file)
 
-        task_macro = os.path.join(self.RALLY_DIR, 'macro')
+        task_macro = os.path.join(self.rally_dir, 'macro')
         if not os.path.exists(task_macro):
             LOGGER.error("Task macro dir '%s' does not exist.", task_macro)
             raise Exception("Task macro dir '{}' does not exist.".
                             format(task_macro))
-        macro_dir = os.path.join(self.TASK_DIR, 'macro')
+        macro_dir = os.path.join(self.task_dir, 'macro')
         if os.path.exists(macro_dir):
             shutil.rmtree(macro_dir)
         shutil.copytree(task_macro, macro_dir)
@@ -709,7 +710,7 @@ class RallySanity(RallyBase):
             kwargs["case_name"] = "rally_sanity"
         super(RallySanity, self).__init__(**kwargs)
         self.smoke = True
-        self.scenario_dir = os.path.join(self.RALLY_SCENARIO_DIR, 'sanity')
+        self.scenario_dir = os.path.join(self.rally_scenario_dir, 'sanity')
 
 
 class RallyFull(RallyBase):
@@ -721,26 +722,26 @@ class RallyFull(RallyBase):
             kwargs["case_name"] = "rally_full"
         super(RallyFull, self).__init__(**kwargs)
         self.smoke = False
-        self.scenario_dir = os.path.join(self.RALLY_SCENARIO_DIR, 'full')
+        self.scenario_dir = os.path.join(self.rally_scenario_dir, 'full')
 
 
 class RallyJobs(RallyBase):
     """Rally OpenStack CI testcase implementation."""
 
-    TESTS = ["neutron"]
+    stests = ["neutron"]
 
     def __init__(self, **kwargs):
         """Initialize RallyJobs object."""
         if "case_name" not in kwargs:
             kwargs["case_name"] = "rally_jobs"
         super(RallyJobs, self).__init__(**kwargs)
-        self.task_file = os.path.join(self.RALLY_DIR, 'rally_jobs.yaml')
+        self.task_file = os.path.join(self.rally_dir, 'rally_jobs.yaml')
         self.task_yaml = None
 
     def prepare_run(self, **kwargs):
         """Create resources needed by test scenarios."""
         super(RallyJobs, self).prepare_run(**kwargs)
-        with open(os.path.join(self.RALLY_DIR,
+        with open(os.path.join(self.rally_dir,
                                'rally_jobs.yaml'), 'r') as task_file:
             self.task_yaml = yaml.safe_load(task_file)
 
@@ -829,9 +830,9 @@ class RallyJobs(RallyBase):
             raise Exception("The scenario '%s' does not exist." % task)
         LOGGER.debug('Scenario fetched from : %s', task)
 
-        if not os.path.exists(self.TEMP_DIR):
-            os.makedirs(self.TEMP_DIR)
-        task_file_name = os.path.join(self.TEMP_DIR, task_name)
+        if not os.path.exists(self.temp_dir):
+            os.makedirs(self.temp_dir)
+        task_file_name = os.path.join(self.temp_dir, task_name)
         self.apply_blacklist(task, task_file_name)
         self.run_cmd = (["rally", "task", "start", "--task", task_file_name,
                          "--task-args", str(self.build_task_args(test_name))])
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index fb0c15512..be86cee86 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -41,13 +41,13 @@ class TempestCommon(singlevm.VmReady2):
     visibility = 'public'
     filename_alt = '/home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img'
     shared_network = True
-    TEMPEST_CONF_YAML = pkg_resources.resource_filename(
+    tempest_conf_yaml = pkg_resources.resource_filename(
         'functest',
         'opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml')
-    TEMPEST_CUSTOM = pkg_resources.resource_filename(
+    tempest_custom = pkg_resources.resource_filename(
         'functest',
         'opnfv_tests/openstack/tempest/custom_tests/test_list.txt')
-    TEMPEST_BLACKLIST = pkg_resources.resource_filename(
+    tempest_blacklist = pkg_resources.resource_filename(
         'functest',
         'opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml')
 
@@ -224,7 +224,7 @@ class TempestCommon(singlevm.VmReady2):
     @staticmethod
     def update_tempest_conf_file(conf_file, rconfig):
         """Update defined paramters into tempest config file"""
-        with open(TempestCommon.TEMPEST_CONF_YAML) as yfile:
+        with open(TempestCommon.tempest_conf_yaml) as yfile:
             conf_yaml = yaml.safe_load(yfile)
         if conf_yaml:
             sections = rconfig.sections()
@@ -244,8 +244,8 @@ class TempestCommon(singlevm.VmReady2):
             compute_cnt=1, image_alt_id=None, flavor_alt_id=None,
             admin_role_name='admin', cidr='192.168.120.0/24',
             domain_id='default'):
-        # pylint: disable=too-many-branches,too-many-arguments,
-        # too-many-statements
+        # pylint: disable=too-many-branches,too-many-arguments
+        # pylint: disable=too-many-statements,too-many-locals
         """
         Add/update needed parameters into tempest.conf file
         """
@@ -335,12 +335,12 @@ class TempestCommon(singlevm.VmReady2):
         LOGGER.debug("Generating test case list...")
         self.backup_tempest_config(self.conf_file, '/etc')
         if kwargs.get('mode') == 'custom':
-            if os.path.isfile(self.TEMPEST_CUSTOM):
+            if os.path.isfile(self.tempest_custom):
                 shutil.copyfile(
-                    self.TEMPEST_CUSTOM, self.list)
+                    self.tempest_custom, self.list)
             else:
                 raise Exception("Tempest test list file %s NOT found."
-                                % self.TEMPEST_CUSTOM)
+                                % self.tempest_custom)
         else:
             testr_mode = kwargs.get(
                 'mode', r'^tempest\.(api|scenario).*\[.*\bsmoke\b.*\]$')
@@ -363,7 +363,7 @@ class TempestCommon(singlevm.VmReady2):
             deploy_scenario = env.get('DEPLOY_SCENARIO')
             if bool(deploy_scenario):
                 # if DEPLOY_SCENARIO is set we read the file
-                black_list_file = open(self.TEMPEST_BLACKLIST)
+                black_list_file = open(self.tempest_blacklist)
                 black_list_yaml = yaml.safe_load(black_list_file)
                 black_list_file.close()
                 for item in black_list_yaml:
diff --git a/functest/opnfv_tests/openstack/vping/vping_userdata.py b/functest/opnfv_tests/openstack/vping/vping_userdata.py
index a58184c59..225c167d5 100644
--- a/functest/opnfv_tests/openstack/vping/vping_userdata.py
+++ b/functest/opnfv_tests/openstack/vping/vping_userdata.py
@@ -88,7 +88,7 @@ class VPingUserdata(singlevm.VmReady2):
             elif sec % 10 == 0:
                 if "request failed" in p_console:
                     self.logger.debug(
-                        "It seems userdata is not supported in nova boot. " +
+                        "It seems userdata is not supported in nova boot. "
                         "Waiting a bit...")
                     tries += 1
                 else:
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index 17600a316..b54f0f54b 100644
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -189,7 +189,7 @@ class ODLTests(robotframework.RobotFramework):
         return self.run_suites(suites, **kwargs)
 
 
-class ODLParser(object):  # pylint: disable=too-few-public-methods
+class ODLParser():  # pylint: disable=too-few-public-methods
     """Parser to run ODL test suites."""
 
     def __init__(self):
diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py
index 7c8a925bb..5a0a86b0c 100644
--- a/functest/opnfv_tests/vnf/epc/juju_epc.py
+++ b/functest/opnfv_tests/vnf/epc/juju_epc.py
@@ -148,13 +148,13 @@ class JujuEpc(singlevm.VmReady2):
 
     def check_requirements(self):
         if not os.path.exists("/src/epc-requirements/go/bin/juju"):
-            self.__logger.warn(
+            self.__logger.warning(
                 "Juju cannot be cross-compiled (arm and arm64) from the time "
                 "being")
             self.is_skipped = True
             self.project.clean()
         if env.get('NEW_USER_ROLE').lower() == "admin":
-            self.__logger.warn(
+            self.__logger.warning(
                 "Defining NEW_USER_ROLE=admin will easily break the testcase "
                 "because Juju doesn't manage tenancy (e.g. subnet  "
                 "overlapping)")
diff --git a/functest/opnfv_tests/vnf/ims/clearwater.py b/functest/opnfv_tests/vnf/ims/clearwater.py
index 64f0428b3..67128b11c 100644
--- a/functest/opnfv_tests/vnf/ims/clearwater.py
+++ b/functest/opnfv_tests/vnf/ims/clearwater.py
@@ -24,7 +24,7 @@ __author__ = ("Valentin Boucher <valentin.boucher@orange.com>, "
               "Helen Yao <helanyao@gmail.com>")
 
 
-class ClearwaterTesting(object):
+class ClearwaterTesting():
     """vIMS clearwater base usable by several orchestrators"""
 
     def __init__(self, case_name, bono_ip, ellis_ip):
@@ -91,8 +91,7 @@ class ClearwaterTesting(object):
                         'Account %s is created on Ellis\n%s',
                         params.get('full_name'), account_res)
                     return account_res
-                else:
-                    raise Exception("Cannot create ellis account")
+                raise Exception("Cannot create ellis account")
             except Exception:  # pylint: disable=broad-except
                 self.logger.info(
                     "try %s: cannot create ellis account", iloop + 1)
@@ -110,8 +109,7 @@ class ClearwaterTesting(object):
                     cookies = req.cookies
                     self.logger.debug('cookies: %s', cookies)
                     return cookies
-                else:
-                    raise Exception('Failed to get cookies for Ellis')
+                raise Exception('Failed to get cookies for Ellis')
             except Exception:  # pylint: disable=broad-except
                 self.logger.info(
                     "try %s: cannot get cookies for Ellis", iloop + 1)
@@ -128,13 +126,12 @@ class ClearwaterTesting(object):
                     self.logger.info(
                         'Calling number is created: %s', number_res)
                     return number_res
+                if req and req.json():
+                    reason = req.json()['reason']
                 else:
-                    if req and req.json():
-                        reason = req.json()['reason']
-                    else:
-                        reason = req
-                    self.logger.info("cannot create a number: %s", reason)
-                    raise Exception('Failed to create a number')
+                    reason = req
+                self.logger.info("cannot create a number: %s", reason)
+                raise Exception('Failed to create a number')
             except Exception:  # pylint: disable=broad-except
                 self.logger.info(
                     "try %s: cannot create a number", iloop + 1)
diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
index 0f6adf96a..d937cc052 100644
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
@@ -103,7 +103,7 @@ class CloudifyIms(cloudify.Cloudify):
 
     def check_requirements(self):
         if env.get('NEW_USER_ROLE').lower() == "admin":
-            self.__logger.warn(
+            self.__logger.warning(
                 "Defining NEW_USER_ROLE=admin will easily break the testcase "
                 "because Cloudify doesn't manage tenancy (e.g. subnet "
                 "overlapping)")
@@ -250,7 +250,7 @@ class CloudifyIms(cloudify.Cloudify):
         self.result += vnf_test_rate / 3 * 100
         if vnf_test_rate == 0:
             self.details['test_vnf'].update(status='FAIL')
-        return True if vnf_test_rate > 0 else False
+        return bool(vnf_test_rate > 0)
 
     def clean(self):
         """Clean created objects/functions."""
diff --git a/functest/opnfv_tests/vnf/ims/heat_ims.py b/functest/opnfv_tests/vnf/ims/heat_ims.py
index 9ea9c5627..4a57a7445 100644
--- a/functest/opnfv_tests/vnf/ims/heat_ims.py
+++ b/functest/opnfv_tests/vnf/ims/heat_ims.py
@@ -234,7 +234,7 @@ class HeatIms(singlevm.VmReady2):
         if vnf_test_rate == 0:
             self.details['test_vnf'].update(status='FAIL')
         self._monit()
-        return True if vnf_test_rate > 0 else False
+        return bool(vnf_test_rate > 0)
 
     def clean(self):
         """Clean created objects/functions."""
diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
index b449d2d81..c793953d3 100644
--- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
+++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
@@ -113,7 +113,7 @@ class CloudifyVrouter(cloudify.Cloudify):
 
     def check_requirements(self):
         if env.get('NEW_USER_ROLE').lower() == "admin":
-            self.__logger.warn(
+            self.__logger.warning(
                 "Defining NEW_USER_ROLE=admin will easily break the testcase "
                 "because Cloudify doesn't manage tenancy (e.g. subnet "
                 "overlapping)")
diff --git a/functest/opnfv_tests/vnf/router/test_controller/function_test_exec.py b/functest/opnfv_tests/vnf/router/test_controller/function_test_exec.py
index 0b8a69b73..0a56913b7 100644
--- a/functest/opnfv_tests/vnf/router/test_controller/function_test_exec.py
+++ b/functest/opnfv_tests/vnf/router/test_controller/function_test_exec.py
@@ -21,7 +21,7 @@ from functest.opnfv_tests.vnf.router.vnf_controller.vnf_controller import (
     VnfController)
 
 
-class FunctionTestExec(object):
+class FunctionTestExec():
     """vrouter function test execution class"""
 
     logger = logging.getLogger(__name__)
diff --git a/functest/opnfv_tests/vnf/router/utilvnf.py b/functest/opnfv_tests/vnf/router/utilvnf.py
index a54f6cb0b..2db3b38e5 100644
--- a/functest/opnfv_tests/vnf/router/utilvnf.py
+++ b/functest/opnfv_tests/vnf/router/utilvnf.py
@@ -43,7 +43,7 @@ NUMBER_OF_DIGITS_FOR_AVG_JITTER = 3
 NUMBER_OF_DIGITS_FOR_AVG_PKT_LOSS = 1
 
 
-class Utilvnf(object):  # pylint: disable=too-many-instance-attributes
+class Utilvnf():  # pylint: disable=too-many-instance-attributes
     """ Utility class of vrouter testcase """
 
     logger = logging.getLogger(__name__)
diff --git a/functest/opnfv_tests/vnf/router/vnf_controller/checker.py b/functest/opnfv_tests/vnf/router/vnf_controller/checker.py
index a7a70f6d7..d3a216ed0 100644
--- a/functest/opnfv_tests/vnf/router/vnf_controller/checker.py
+++ b/functest/opnfv_tests/vnf/router/vnf_controller/checker.py
@@ -18,7 +18,7 @@ import re
 from jinja2 import Environment, FileSystemLoader
 
 
-class Checker(object):
+class Checker():
     """vrouter test result check class"""
 
     logger = logging.getLogger(__name__)
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 7d9116bcc..a86a16485 100644
--- a/functest/opnfv_tests/vnf/router/vnf_controller/command_generator.py
+++ b/functest/opnfv_tests/vnf/router/vnf_controller/command_generator.py
@@ -15,7 +15,7 @@ import logging
 from jinja2 import Environment, FileSystemLoader
 
 
-class CommandGenerator(object):
+class CommandGenerator():
     """command generator class for vrouter testing"""
 
     logger = logging.getLogger(__name__)
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 6f4a9cf7f..0969eab3b 100644
--- a/functest/opnfv_tests/vnf/router/vnf_controller/ssh_client.py
+++ b/functest/opnfv_tests/vnf/router/vnf_controller/ssh_client.py
@@ -24,7 +24,7 @@ DEFAULT_CONNECT_RETRY_COUNT = 10
 DEFAULT_SEND_TIMEOUT = 10
 
 
-class SshClient(object):  # pylint: disable=too-many-instance-attributes
+class SshClient():  # pylint: disable=too-many-instance-attributes
     """ssh client class for vrouter testing"""
 
     logger = logging.getLogger(__name__)
@@ -80,7 +80,7 @@ class SshClient(object):  # pylint: disable=too-many-instance-attributes
                 retrycount -= 1
 
         if retrycount == 0:
-            self.logger.warn(
+            self.logger.warning(
                 "Cannot establish connection to IP '%s'", self.ip_address)
             self.connected = False
             return self.connected
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 a73855421..b159ddda4 100644
--- a/functest/opnfv_tests/vnf/router/vnf_controller/vm_controller.py
+++ b/functest/opnfv_tests/vnf/router/vnf_controller/vm_controller.py
@@ -23,7 +23,7 @@ from functest.opnfv_tests.vnf.router.vnf_controller.ssh_client import (
     SshClient)
 
 
-class VmController(object):
+class VmController():
     """vm controll class"""
 
     logger = logging.getLogger(__name__)
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 a5b1ad856..7ed287c6e 100644
--- a/functest/opnfv_tests/vnf/router/vnf_controller/vnf_controller.py
+++ b/functest/opnfv_tests/vnf/router/vnf_controller/vnf_controller.py
@@ -26,7 +26,7 @@ from functest.opnfv_tests.vnf.router.vnf_controller.vm_controller import (
     VmController)
 
 
-class VnfController(object):
+class VnfController():
     """vrouter controll class"""
 
     logger = logging.getLogger(__name__)
diff --git a/functest/opnfv_tests/vnf/router/vrouter_base.py b/functest/opnfv_tests/vnf/router/vrouter_base.py
index 8cfab341e..932770b9c 100644
--- a/functest/opnfv_tests/vnf/router/vrouter_base.py
+++ b/functest/opnfv_tests/vnf/router/vrouter_base.py
@@ -24,7 +24,7 @@ from functest.opnfv_tests.vnf.router.test_controller import function_test_exec
 __author__ = "Shuya Nakama <shuya.nakama@okinawaopenlabs.org>"
 
 
-class VrouterOnBoardingBase(object):
+class VrouterOnBoardingBase():
     """vrouter testing base class"""
 
     def __init__(self, util, util_info):