7 files changed, 16 insertions, 12 deletions
diff --git a/functest/core/pytest_suite_runner.py b/functest/core/pytest_suite_runner.py
index 8b5da05ef..21edc1874 100644
--- a/functest/core/pytest_suite_runner.py
+++ b/functest/core/pytest_suite_runner.py
@@ -18,6 +18,7 @@ class PyTestSuiteRunner(base.TestCase):
     def __init__(self, **kwargs):
         super(PyTestSuiteRunner, self).__init__(**kwargs)
         self.suite = None
+        self.logger = None
 
     def run(self, **kwargs):
         """
diff --git a/functest/core/vnf_base.py b/functest/core/vnf.py
index bc5bf9a71..5667b2997 100644
--- a/functest/core/vnf_base.py
+++ b/functest/core/vnf.py
@@ -17,12 +17,12 @@ import functest.utils.functest_utils as ft_utils
 import functest.utils.openstack_utils as os_utils
 
 
-class VnfOnBoardingBase(base.TestCase):
+class VnfOnBoarding(base.TestCase):
 
     __logger = logging.getLogger(__name__)
 
     def __init__(self, **kwargs):
-        super(VnfOnBoardingBase, self).__init__(**kwargs)
+        super(VnfOnBoarding, self).__init__(**kwargs)
         self.repo = kwargs.get('repo', '')
         self.cmd = kwargs.get('cmd', '')
         self.details = {}
diff --git a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
index 8a68cad9e..2a1b3a39b 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
@@ -5,6 +5,8 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 
+import logging
+
 from functest.core.pytest_suite_runner import PyTestSuiteRunner
 from functest.opnfv_tests.openstack.snaps import snaps_utils
 from functest.utils import functest_utils
@@ -22,6 +24,7 @@ class SnapsTestRunner(PyTestSuiteRunner):
     """
     def __init__(self, **kwargs):
         super(SnapsTestRunner, self).__init__(**kwargs)
+        self.logger = logging.getLogger(__name__)
 
         self.os_creds = openstack_tests.get_credentials(
             os_env_file=CONST.__getattribute__('openstack_creds'),
diff --git a/functest/opnfv_tests/vnf/aaa/aaa.py b/functest/opnfv_tests/vnf/aaa/aaa.py
index 1a484ddfb..0030256c2 100755
--- a/functest/opnfv_tests/vnf/aaa/aaa.py
+++ b/functest/opnfv_tests/vnf/aaa/aaa.py
@@ -13,10 +13,10 @@ import sys
 import argparse
 
 import functest.core.testcase as testcase
-import functest.core.vnf_base as vnf_base
+import functest.core.vnf as vnf
 
 
-class AaaVnf(vnf_base.VnfOnBoardingBase):
+class AaaVnf(vnf.VnfOnBoarding):
 
     logger = logging.getLogger(__name__)
 
diff --git a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
index f3bb30126..42d31e3bb 100644
--- a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
+++ b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
@@ -13,12 +13,12 @@ import shutil
 
 import requests
 
-import functest.core.vnf_base as vnf_base
+import functest.core.vnf as vnf
 from functest.utils.constants import CONST
 import functest.utils.functest_utils as ft_utils
 
 
-class ClearwaterOnBoardingBase(vnf_base.VnfOnBoardingBase):
+class ClearwaterOnBoardingBase(vnf.VnfOnBoarding):
 
     def __init__(self, **kwargs):
         self.logger = logging.getLogger(__name__)
diff --git a/functest/opnfv_tests/vnf/ims/orchestra_ims.py b/functest/opnfv_tests/vnf/ims/orchestra_ims.py
index 95751d47f..6f341970d 100755
--- a/functest/opnfv_tests/vnf/ims/orchestra_ims.py
+++ b/functest/opnfv_tests/vnf/ims/orchestra_ims.py
@@ -9,15 +9,15 @@
 
 import json
 import logging
+import os
 import socket
 import sys
 import time
 import yaml
 
-import functest.core.vnf_base as vnf_base
+import functest.core.vnf as vnf
 import functest.utils.functest_utils as ft_utils
 import functest.utils.openstack_utils as os_utils
-import os
 from functest.utils.constants import CONST
 
 from org.openbaton.cli.agents.agents import MainAgent
@@ -76,7 +76,7 @@ def servertest(host, port):
             return True
 
 
-class ImsVnf(vnf_base.VnfOnBoardingBase):
+class ImsVnf(vnf.VnfOnBoarding):
 
     def __init__(self, project='functest', case_name='orchestra_ims',
                  repo='', cmd=''):
diff --git a/functest/tests/unit/core/test_vnf_base.py b/functest/tests/unit/core/test_vnf.py
index 540cf610d..f348c0dbf 100644
--- a/functest/tests/unit/core/test_vnf_base.py
+++ b/functest/tests/unit/core/test_vnf.py
@@ -10,7 +10,7 @@
 import logging
 import unittest
 
-from functest.core import vnf_base
+from functest.core import vnf
 
 
 class VnfBaseTesting(unittest.TestCase):
@@ -18,8 +18,8 @@ class VnfBaseTesting(unittest.TestCase):
     logging.disable(logging.CRITICAL)
 
     def setUp(self):
-        self.test = vnf_base.VnfOnBoardingBase(project='functest',
-                                               case_name='aaa')
+        self.test = vnf.VnfOnBoarding(project='functest',
+                                      case_name='aaa')
         self.test.project = "functest"
         self.test.start_time = "1"
         self.test.stop_time = "5"