X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fopenstack%2Fvping%2Fvping_userdata.py;h=deaacfccd6e4948cb1d81e550f369c5cbb396bed;hb=a691a8c2868d3f8af531e0bff513023c3a704aaf;hp=718f47f0db0033e8497501541dbd9031768a0fb3;hpb=e50767cc62bbf42505d36b3932709db8a73e9d4b;p=functest.git

diff --git a/functest/opnfv_tests/openstack/vping/vping_userdata.py b/functest/opnfv_tests/openstack/vping/vping_userdata.py
old mode 100755
new mode 100644
index 718f47f0d..deaacfccd
--- a/functest/opnfv_tests/openstack/vping/vping_userdata.py
+++ b/functest/opnfv_tests/openstack/vping/vping_userdata.py
@@ -7,17 +7,14 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 
-import argparse
-import sys
 import time
 
-from functest.core.testcase import TestCase
-
 from snaps.openstack.utils import deploy_utils
 from snaps.openstack.create_instance import VmInstanceSettings
 from snaps.openstack.create_network import PortSettings
 
-import vping_base
+from functest.core.testcase import TestCase
+from functest.opnfv_tests.openstack.vping import vping_base
 
 
 class VPingUserdata(vping_base.VPingBase):
@@ -91,19 +88,19 @@ class VPingUserdata(vping_base.VPingBase):
         Override from super
         """
         self.logger.info("Waiting for ping...")
-        exit_code = -1
+        exit_code = TestCase.EX_TESTCASE_FAILED
         sec = 0
         tries = 0
 
         while True:
             time.sleep(1)
-            p_console = vm_creator.get_os_vm_server_obj().get_console_output()
+            p_console = vm_creator.get_console_output()
             if "vPing OK" in p_console:
                 self.logger.info("vPing detected!")
                 exit_code = TestCase.EX_OK
                 break
             elif "failed to read iid from metadata" in p_console or tries > 5:
-                exit_code = TestCase.EX_TESTCASE_FAILED
+                self.logger.info("Failed to read iid from metadata")
                 break
             elif sec == self.ping_timeout:
                 self.logger.info("Timeout reached.")
@@ -140,15 +137,5 @@ def _get_userdata(test_ip):
                 "  echo 'vPing KO'\n"
                 " fi\n"
                 " sleep 1\n"
-                "done\n" % test_ip)
+                "done\n" % str(test_ip))
     return None
-
-
-if __name__ == '__main__':
-    args_parser = argparse.ArgumentParser()
-    args_parser.add_argument("-r", "--report",
-                             help="Create json result file",
-                             action="store_true")
-    args = vars(args_parser.parse_args())
-
-    sys.exit(vping_base.VPingMain(VPingUserdata).main(**args))