summaryrefslogtreecommitdiffstats
path: root/test/functest/testcase_1.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/functest/testcase_1.py')
-rw-r--r--test/functest/testcase_1.py33
1 files changed, 5 insertions, 28 deletions
diff --git a/test/functest/testcase_1.py b/test/functest/testcase_1.py
index 4ad29b6..aa9bc92 100644
--- a/test/functest/testcase_1.py
+++ b/test/functest/testcase_1.py
@@ -11,8 +11,6 @@
import argparse
import os
from random import randint
-import sys
-import time
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as ft_utils
@@ -128,16 +126,8 @@ def main():
sg_id = os_utils.create_security_group_full(neutron_client,
SECGROUP_NAME, SECGROUP_DESCR)
- # Get hypervisors zones
- compute_nodes = os_utils.get_hypervisors(nova_client)
- num_compute_nodes = len(compute_nodes)
- if num_compute_nodes < 2:
- logger.error("There are %s compute nodes in the deployment. "
- "Minimum number of nodes to complete the test is 2."
- % num_compute_nodes)
- sys.exit(-1)
+ compute_nodes = test_utils.assert_and_get_compute_nodes(nova_client)
- logger.debug("Compute nodes: %s" % compute_nodes)
av_zone_1 = "nova:" + compute_nodes[0]
av_zone_2 = "nova:" + compute_nodes[1]
@@ -260,7 +250,7 @@ def main():
logger.info("Waiting for the VMs to connect to each other using the"
" updated network configuration")
- time.sleep(30)
+ 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,
@@ -281,9 +271,10 @@ def main():
"export_targets": TARGETS_1,
"name": vpn_name}
bgpvpn = os_utils.update_bgpvpn(neutron_client, bgpvpn_id, **kwargs)
+
logger.info("Waiting for the VMs to connect to each other using the"
" updated network configuration")
- time.sleep(30)
+ 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,
@@ -292,21 +283,7 @@ def main():
results.get_ping_status(vm_1, vm_1_ip, vm_5, vm_5_ip,
expected="PASS", timeout=30)
- results.add_to_summary(0, "=")
- logger.info("\n%s" % results.summary)
-
- if results.test_result == "PASS":
- logger.info("All the ping tests have passed as expected.")
- else:
- logger.info("One or more ping tests have failed.")
-
- status = "PASS"
- success = 100 - \
- (100 * int(results.num_tests_failed) / int(results.num_tests))
- if success < int(SUCCESS_CRITERIA):
- status = "FAILED"
-
- return {"status": status, "details": results.details}
+ return results.compile_summary(SUCCESS_CRITERIA)
if __name__ == '__main__':