3 files changed, 19 insertions, 19 deletions
diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py
index 586b8d655..620acf3ff 100644
--- a/functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/functest/opnfv_tests/openstack/vping/vping_base.py
@@ -15,11 +15,6 @@ import logging
 import time
 import uuid
 
-from functest.core import testcase
-from functest.opnfv_tests.openstack.snaps import snaps_utils
-from functest.utils import config
-from functest.utils import env
-
 from snaps.config.flavor import FlavorConfig
 from snaps.config.network import NetworkConfig, SubnetConfig
 from snaps.config.router import RouterConfig
@@ -27,6 +22,11 @@ from snaps.openstack import create_flavor
 from snaps.openstack.create_flavor import OpenStackFlavor
 from snaps.openstack.tests import openstack_tests
 from snaps.openstack.utils import deploy_utils
+from xtesting.core import testcase
+
+from functest.opnfv_tests.openstack.snaps import snaps_utils
+from functest.utils import config
+from functest.utils import env
 
 
 class VPingBase(testcase.TestCase):
diff --git a/functest/opnfv_tests/openstack/vping/vping_ssh.py b/functest/opnfv_tests/openstack/vping/vping_ssh.py
index e6c6bf351..19d47f57f 100644
--- a/functest/opnfv_tests/openstack/vping/vping_ssh.py
+++ b/functest/opnfv_tests/openstack/vping/vping_ssh.py
@@ -14,19 +14,19 @@ import time
 from scp import SCPClient
 import pkg_resources
 
-from functest.core.testcase import TestCase
-from functest.energy import energy
-from functest.opnfv_tests.openstack.vping import vping_base
-from functest.utils import config
-
 from snaps.config.keypair import KeypairConfig
 from snaps.config.network import PortConfig
 from snaps.config.security_group import (
     Direction, Protocol, SecurityGroupConfig, SecurityGroupRuleConfig)
 from snaps.config.vm_inst import FloatingIpConfig, VmInstanceConfig
-
 from snaps.openstack.utils import deploy_utils
 
+from xtesting.core import testcase
+from xtesting.energy import energy
+
+from functest.opnfv_tests.openstack.vping import vping_base
+from functest.utils import config
+
 
 class VPingSSH(vping_base.VPingBase):
     """
@@ -122,7 +122,7 @@ class VPingSSH(vping_base.VPingBase):
             return self._execute()
         except Exception as exc:  # pylint: disable=broad-except
             self.logger.error('Unexpected error running test - ' + exc.message)
-            return TestCase.EX_RUN_ERROR
+            return testcase.TestCase.EX_RUN_ERROR
         finally:
             self._cleanup()
 
@@ -135,10 +135,10 @@ class VPingSSH(vping_base.VPingBase):
         if vm_creator.vm_ssh_active(block=True):
             ssh = vm_creator.ssh_client()
             if not self._transfer_ping_script(ssh):
-                return TestCase.EX_RUN_ERROR
+                return testcase.TestCase.EX_RUN_ERROR
             return self._do_vping_ssh(ssh, test_ip)
         else:
-            return TestCase.EX_RUN_ERROR
+            return testcase.TestCase.EX_RUN_ERROR
 
     def _transfer_ping_script(self, ssh):
         """
@@ -175,7 +175,7 @@ class VPingSSH(vping_base.VPingBase):
         :param test_ip: the IP for the ping command to use
         :return: exit_code (int)
         """
-        exit_code = TestCase.EX_TESTCASE_FAILED
+        exit_code = testcase.TestCase.EX_TESTCASE_FAILED
         self.logger.info("Waiting for ping...")
 
         sec = 0
@@ -190,7 +190,7 @@ class VPingSSH(vping_base.VPingBase):
             for line in output:
                 if "vPing OK" in line:
                     self.logger.info("vPing detected!")
-                    exit_code = TestCase.EX_OK
+                    exit_code = testcase.TestCase.EX_OK
                     flag = True
                     break
 
diff --git a/functest/opnfv_tests/openstack/vping/vping_userdata.py b/functest/opnfv_tests/openstack/vping/vping_userdata.py
index 76cdcf832..b4e9304be 100644
--- a/functest/opnfv_tests/openstack/vping/vping_userdata.py
+++ b/functest/opnfv_tests/openstack/vping/vping_userdata.py
@@ -14,8 +14,8 @@ import time
 from snaps.config.network import PortConfig
 from snaps.config.vm_inst import VmInstanceConfig
 from snaps.openstack.utils import deploy_utils
+from xtesting.core import testcase
 
-from functest.core.testcase import TestCase
 from functest.opnfv_tests.openstack.vping import vping_base
 
 
@@ -90,7 +90,7 @@ class VPingUserdata(vping_base.VPingBase):
         Override from super
         """
         self.logger.info("Waiting for ping...")
-        exit_code = TestCase.EX_TESTCASE_FAILED
+        exit_code = testcase.TestCase.EX_TESTCASE_FAILED
         sec = 0
         tries = 0
 
@@ -99,7 +99,7 @@ class VPingUserdata(vping_base.VPingBase):
             p_console = vm_creator.get_console_output()
             if "vPing OK" in p_console:
                 self.logger.info("vPing detected!")
-                exit_code = TestCase.EX_OK
+                exit_code = testcase.TestCase.EX_OK
                 break
             elif "failed to read iid from metadata" in p_console or tries > 5:
                 self.logger.info("Failed to read iid from metadata")