Fix path for vping.sh and exit if SCP fails 63/14363/2
authorjose.lausuch <jose.lausuch@ericsson.com>
Thu, 19 May 2016 11:24:35 +0000 (13:24 +0200)
committerjose.lausuch <jose.lausuch@ericsson.com>
Thu, 19 May 2016 11:29:35 +0000 (13:29 +0200)
Change-Id: I28b394071ae739af60f7e7007cc54e96f13d39db
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
testcases/OpenStack/vPing/vPing_ssh.py

index 5b392e8..4f83b87 100644 (file)
@@ -393,12 +393,13 @@ def main():
 
     scp = SCPClient(ssh.get_transport())
 
-    ping_script = REPO_PATH + "testcases/vPing/ping.sh"
+    ping_script = REPO_PATH + "testcases/OpenStack/vPing/ping.sh"
     try:
         scp.put(ping_script, "~/")
     except:
         logger.error("Cannot SCP the file '%s' to VM '%s'"
                      % (ping_script, floatip))
+        return (EXIT_CODE)
 
     cmd = 'chmod 755 ~/ping.sh'
     (stdin, stdout, stderr) = ssh.exec_command(cmd)
@@ -427,6 +428,7 @@ def main():
                 EXIT_CODE = 0
                 flag = True
                 break
+
             elif sec == PING_TIMEOUT:
                 logger.info("Timeout reached.")
                 flag = True