diff options
| author |   Romanos Skiadas <rski@intracom-telecom.com> | 2016-12-05 10:20:45 +0200 |
|---|---|---|
| committer | Romanos Skiadas <rski@intracom-telecom.com> | 2016-12-13 15:23:01 +0200 |
| commit | e01762afb78c7c4938ce16d52b7f47fdbb4ed4dc (patch) | |
| tree | ca2238122a0aa6789fa59ab727047f09d1664e4d /test/functest/testcase_4.py | |
| parent | 2417d16aa6767a4c1bb6f28104076bb4b11d5e10 (diff) | |
Don't pass ips to get_ssh_output and check_ping
Remove the IP arguments from these functions and use the VM objects passed to
them to find their IPs. This simplifies the calls.
Change-Id: Ideb08b6fdf0648870c2854f057708a88bb482d0c
Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com>
Diffstat (limited to 'test/functest/testcase_4.py')
| -rw-r--r-- | test/functest/testcase_4.py | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/test/functest/testcase_4.py b/test/functest/testcase_4.py index 7485e84..61d8c97 100644 --- a/test/functest/testcase_4.py +++ b/test/functest/testcase_4.py @@ -132,7 +132,6 @@ def main(): secgroup_name=TESTCASE_CONFIG.secgroup_name, compute_node=av_zone_1, userdata=u1) - vm_1_ip = vm_1.networks.itervalues().next()[0] msg = ("Create VPN with eRT<>iRT") results.record_action(msg) @@ -161,15 +160,9 @@ def main(): logger.error("One or more instances is down") # TODO Handle appropriately - # Ping from VM1 to VM2 should work - results.get_ping_status(vm_1, vm_1_ip, vm_2, vm_2_ip, - expected="PASS", timeout=200) - # Ping from VM1 to VM3 should work - results.get_ping_status(vm_1, vm_1_ip, vm_3, vm_3_ip, - expected="PASS", timeout=30) - # Ping from VM1 to VM4 should not work - results.get_ping_status(vm_1, vm_1_ip, vm_4, vm_4_ip, - expected="FAIL", timeout=30) + results.get_ping_status(vm_1, vm_2, expected="PASS", timeout=200) + results.get_ping_status(vm_1, vm_3, expected="PASS", timeout=30) + results.get_ping_status(vm_1, vm_4, expected="FAIL", timeout=30) msg = ("Associate network '%s' to the VPN." % TESTCASE_CONFIG.net_2_name) results.add_to_summary(0, "-") @@ -187,15 +180,9 @@ def main(): " updated network configuration") test_utils.wait_before_subtest() - # Ping from VM4 to VM5 should work - results.get_ping_status(vm_4, vm_4_ip, vm_5, vm_5_ip, - expected="PASS", timeout=30) - # Ping from VM1 to VM4 should not work - results.get_ping_status(vm_1, vm_1_ip, vm_4, vm_4_ip, - expected="FAIL", timeout=30) - # Ping from VM1 to VM5 should not work - results.get_ping_status(vm_1, vm_1_ip, vm_5, vm_5_ip, - expected="FAIL", timeout=30) + results.get_ping_status(vm_4, vm_5, expected="PASS", timeout=30) + results.get_ping_status(vm_1, vm_4, expected="FAIL", timeout=30) + results.get_ping_status(vm_1, vm_5, expected="FAIL", timeout=30) msg = ("Update VPN with eRT=iRT ...") results.add_to_summary(0, "-") @@ -210,12 +197,8 @@ def main(): " updated network configuration") test_utils.wait_before_subtest() - # Ping from VM1 to VM4 should work - results.get_ping_status(vm_1, vm_1_ip, vm_4, vm_4_ip, - expected="PASS", timeout=30) - # Ping from VM1 to VM5 should work - results.get_ping_status(vm_1, vm_1_ip, vm_5, vm_5_ip, - expected="PASS", timeout=30) + results.get_ping_status(vm_1, vm_4, expected="PASS", timeout=30) + results.get_ping_status(vm_1, vm_5, expected="PASS", timeout=30) results.add_to_summary(0, "=") logger.info("\n%s" % results.summary) |