diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2016-12-13 18:11:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-13 18:11:22 +0000 |
| commit | fdd7790f733d83022ace8c5be102a1aa57699fcb (patch) | |
| tree | 195641783635fda2445ac25cbf6cbdd2363e3ea1 /test/functest/testcase_1.py | |
| parent | 76d39e29232020e2fc7b4252185e301484ebca1d (diff) | |
| parent | e01762afb78c7c4938ce16d52b7f47fdbb4ed4dc (diff) | |
Merge "Don't pass ips to get_ssh_output and check_ping"
Diffstat (limited to 'test/functest/testcase_1.py')
| -rw-r--r-- | test/functest/testcase_1.py | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/test/functest/testcase_1.py b/test/functest/testcase_1.py index a84478f..143945d 100644 --- a/test/functest/testcase_1.py +++ b/test/functest/testcase_1.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) @@ -163,15 +162,9 @@ def main(): logger.error("One or more instances is down") # TODO: Handle this 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, "-") @@ -189,15 +182,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, "-") @@ -212,12 +199,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) return results.compile_summary(TESTCASE_CONFIG.success_criteria) |