diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-01-26 13:32:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-26 13:32:30 +0000 |
| commit | 38b914ef73c879194ba1bd77a279270b514091eb (patch) | |
| tree | 9bb9ee08c53924d0765b43ac2604b0e936fb9357 /testcases/vPing | |
| parent | a78ec95be7909a7c7108fc8632c301bb83b44c63 (diff) | |
| parent | 5ebc6d36dcb058ee4f8ea9ae7865f07bf8cfd895 (diff) | |
Merge "Replace 'No vPing detected' by a better understandable message" into stable/brahmaputra
Diffstat (limited to 'testcases/vPing')
| -rw-r--r-- | testcases/vPing/CI/libraries/vPing.py | 3 | ||||
| -rw-r--r-- | testcases/vPing/CI/libraries/vPing2.py | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/testcases/vPing/CI/libraries/vPing.py b/testcases/vPing/CI/libraries/vPing.py index dc2d2abec..0b09b6d4f 100644 --- a/testcases/vPing/CI/libraries/vPing.py +++ b/testcases/vPing/CI/libraries/vPing.py @@ -412,7 +412,6 @@ def main(): name=NAME_VM_2, flavor=flavor, image=image, - # nics = [{"net-id": network_id, "v4-fixed-ip": IP_2}], nics=[{"port-id": port_id2}], userdata=u ) @@ -459,7 +458,7 @@ def main(): " Waiting a bit...") metadata_tries += 1 else: - logger.debug("No ping detected yet...") + logger.debug("Pinging %s. Waiting for response..." % IP_2) sec += 1 test_status = "NOK" diff --git a/testcases/vPing/CI/libraries/vPing2.py b/testcases/vPing/CI/libraries/vPing2.py index 3b374da43..358223585 100644 --- a/testcases/vPing/CI/libraries/vPing2.py +++ b/testcases/vPing/CI/libraries/vPing2.py @@ -415,7 +415,6 @@ def main(): name=NAME_VM_2, flavor=flavor, image=image, - # nics = [{"net-id": network_id, "v4-fixed-ip": IP_2}], nics=[{"port-id": port_id2}] ) @@ -504,8 +503,8 @@ def main(): # do the scp only once (stdin, stdout, stderr) = ssh.exec_command(cmd) output = stdout.readlines() - for line in output: - print line + #for line in output: + # print line # print "--"+console_log # report if the test is failed @@ -522,7 +521,7 @@ def main(): logger.info("Timeout reached.") break else: - logger.debug("No vPing detected...") + logger.debug("Pinging %s. Waiting for response..." % IP_2) sec += 1 cleanup(nova_client, neutron_client, image_id, network_dic, |