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_2.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_2.py')
| -rw-r--r-- | test/functest/testcase_2.py | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/test/functest/testcase_2.py b/test/functest/testcase_2.py index d2c3d57..2875c5f 100644 --- a/test/functest/testcase_2.py +++ b/test/functest/testcase_2.py @@ -106,7 +106,6 @@ def main(): secgroup_name=TESTCASE_CONFIG.secgroup_name, compute_node=av_zone_1, userdata=userdata_common) - vm_2_ip = vm_2.networks.itervalues().next()[0] vm_3 = test_utils.create_instance( nova_client, @@ -118,7 +117,6 @@ def main(): secgroup_name=TESTCASE_CONFIG.secgroup_name, compute_node=av_zone_2, userdata=userdata_common) - vm_3_ip = vm_3.networks.itervalues().next()[0] vm_5 = test_utils.create_instance( nova_client, @@ -130,7 +128,6 @@ def main(): secgroup_name=TESTCASE_CONFIG.secgroup_name, compute_node=av_zone_2, userdata=userdata_common) - vm_5_ip = vm_5.networks.itervalues().next()[0] # We boot vm5 first because we need vm5_ip for vm4 userdata u4 = test_utils.generate_userdata_with_ssh( @@ -148,7 +145,6 @@ def main(): compute_node=av_zone_1, userdata=u4, files=files) - vm_4_ip = vm_4.networks.itervalues().next()[0] # We boot VM1 at the end because we need to get the IPs first to generate # the userdata @@ -168,7 +164,6 @@ def main(): compute_node=av_zone_1, userdata=u1, files=files) - vm_1_ip = vm_1.networks.itervalues().next()[0] msg = ("Create VPN1 with eRT=iRT") results.record_action(msg) @@ -203,17 +198,13 @@ def main(): test_utils.wait_before_subtest() # 10.10.10.12 should return sdnvpn-2 to sdnvpn-1 - results.check_ssh_output( - vm_1, vm_1_ip, - vm_2, vm_2_ip, - expected=TESTCASE_CONFIG.instance_2_name, - timeout=200) + results.check_ssh_output(vm_1, vm_2, + expected=TESTCASE_CONFIG.instance_2_name, + timeout=200) # 10.10.11.13 should return sdnvpn-3 to sdnvpn-1 - results.check_ssh_output( - vm_1, vm_1_ip, - vm_3, vm_3_ip, - expected=TESTCASE_CONFIG.instance_3_name, - timeout=30) + results.check_ssh_output(vm_1, vm_3, + expected=TESTCASE_CONFIG.instance_3_name, + timeout=30) results.add_to_summary(0, "-") msg = ("Create VPN2 with eRT=iRT") @@ -243,15 +234,14 @@ def main(): test_utils.wait_before_subtest() # 10.10.11.13 should return sdnvpn-5 to sdnvpn-4 - results.check_ssh_output( - vm_4, vm_4_ip, - vm_5, vm_5_ip, - expected=TESTCASE_CONFIG.instance_5_name, - timeout=30) + results.check_ssh_output(vm_4, vm_5, + expected=TESTCASE_CONFIG.instance_5_name, + timeout=30) # 10.10.10.11 should return "not reachable" to sdnvpn-4 - results.check_ssh_output( - vm_4, vm_4_ip, vm_1, vm_1_ip, expected="not reachable", timeout=30) + results.check_ssh_output(vm_4, vm_1, + expected="not reachable", + timeout=30) return results.compile_summary(TESTCASE_CONFIG.success_criteria) |