aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-05-09 09:55:02 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-05-09 09:55:02 +0200
commit6e43ec79cd567da62835483277a51e68e1a82fec (patch)
tree30111b586c51213aa0a63ee7343d6606ca0f1db3
parentb9cac1d63b0c919c961671a1405cbb3ced06942b (diff)
Rename VnfOnBoardingBase to VnfOnBoarding
Change-Id: I514340fc6180e29b31ef11bdea9f719aa2bbb738 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--functest/core/vnf.py4
-rwxr-xr-xfunctest/opnfv_tests/vnf/aaa/aaa.py2
-rw-r--r--functest/opnfv_tests/vnf/ims/clearwater_ims_base.py2
-rwxr-xr-xfunctest/opnfv_tests/vnf/ims/orchestra_ims.py2
-rw-r--r--functest/tests/unit/core/test_vnf.py4
5 files changed, 7 insertions, 7 deletions
diff --git a/functest/core/vnf.py b/functest/core/vnf.py
index bc5bf9a71..5667b2997 100644
--- a/functest/core/vnf.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/vnf/aaa/aaa.py b/functest/opnfv_tests/vnf/aaa/aaa.py
index f23adb5df..0030256c2 100755
--- a/functest/opnfv_tests/vnf/aaa/aaa.py
+++ b/functest/opnfv_tests/vnf/aaa/aaa.py
@@ -16,7 +16,7 @@ import functest.core.testcase as testcase
import functest.core.vnf as vnf
-class AaaVnf(vnf.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 4bd3dc4fe..42d31e3bb 100644
--- a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
+++ b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
@@ -18,7 +18,7 @@ from functest.utils.constants import CONST
import functest.utils.functest_utils as ft_utils
-class ClearwaterOnBoardingBase(vnf.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 128ea366c..6f341970d 100755
--- a/functest/opnfv_tests/vnf/ims/orchestra_ims.py
+++ b/functest/opnfv_tests/vnf/ims/orchestra_ims.py
@@ -76,7 +76,7 @@ def servertest(host, port):
return True
-class ImsVnf(vnf.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.py b/functest/tests/unit/core/test_vnf.py
index a0e733084..f348c0dbf 100644
--- a/functest/tests/unit/core/test_vnf.py
+++ b/functest/tests/unit/core/test_vnf.py
@@ -18,8 +18,8 @@ class VnfBaseTesting(unittest.TestCase):
logging.disable(logging.CRITICAL)
def setUp(self):
- self.test = vnf.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"