aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/sdn
diff options
context:
space:
mode:
Diffstat (limited to 'functest/opnfv_tests/sdn')
-rwxr-xr-xfunctest/opnfv_tests/sdn/odl/odl.py10
-rw-r--r--functest/opnfv_tests/sdn/onos/onos.py8
2 files changed, 9 insertions, 9 deletions
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index 3d6be9a8..0585fc9b 100755
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -20,7 +20,7 @@ from robot.errors import RobotError
import robot.run
from robot.utils.robottime import timestamp_to_secs
-from functest.core import testcase_base
+from functest.core import testcase
import functest.utils.functest_logger as ft_logger
import functest.utils.openstack_utils as op_utils
@@ -46,7 +46,7 @@ class ODLResultVisitor(robot.api.ResultVisitor):
return self._data
-class ODLTests(testcase_base.TestCase):
+class ODLTests(testcase.TestCase):
repos = "/home/opnfv/repos/"
odl_test_repo = os.path.join(repos, "odl_test")
@@ -59,7 +59,7 @@ class ODLTests(testcase_base.TestCase):
logger = ft_logger.Logger("opendaylight").getLogger()
def __init__(self):
- testcase_base.TestCase.__init__(self)
+ testcase.TestCase.__init__(self)
self.case_name = "odl"
@classmethod
@@ -236,9 +236,9 @@ if __name__ == '__main__':
args = parser.parse_args(sys.argv[1:])
try:
result = odl.main(ODLTests.default_suites, **args)
- if result != testcase_base.TestCase.EX_OK:
+ if result != testcase.TestCase.EX_OK:
sys.exit(result)
if args['pushtodb']:
sys.exit(odl.push_to_db())
except Exception:
- sys.exit(testcase_base.TestCase.EX_RUN_ERROR)
+ sys.exit(testcase.TestCase.EX_RUN_ERROR)
diff --git a/functest/opnfv_tests/sdn/onos/onos.py b/functest/opnfv_tests/sdn/onos/onos.py
index 5764bdee..d482ae32 100644
--- a/functest/opnfv_tests/sdn/onos/onos.py
+++ b/functest/opnfv_tests/sdn/onos/onos.py
@@ -14,7 +14,7 @@ import shutil
import time
import urlparse
-from functest.core import testcase_base
+from functest.core import testcase
from functest.utils.constants import CONST
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as ft_utils
@@ -24,7 +24,7 @@ import functest.utils.openstack_utils as openstack_utils
logger = ft_logger.Logger(__name__).getLogger()
-class OnosBase(testcase_base.TestCase):
+class OnosBase(testcase.TestCase):
onos_repo_path = CONST.dir_repo_onos
onos_sfc_image_name = CONST.onos_sfc_image_name
onos_sfc_image_path = os.path.join(CONST.dir_functest_data,
@@ -39,10 +39,10 @@ class OnosBase(testcase_base.TestCase):
self.start_time = time.time()
try:
self._run()
- res = testcase_base.TestCase.EX_OK
+ res = testcase.TestCase.EX_OK
except Exception as e:
logger.error('Error with run: %s', e)
- res = testcase_base.TestCase.EX_RUN_ERROR
+ res = testcase.TestCase.EX_RUN_ERROR
self.stop_time = time.time()
return res