aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2017-02-17 08:15:15 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-17 08:15:15 +0000
commitb88ede43e8f02158cbbaa51fdaf72fda2e92a16d (patch)
treebd3e1b5cb5b4e348488356c9780b3674e4af35b8
parent9dde3b3a18214b4daaaccff9388cb4b7669069bb (diff)
parent53c407ac0e9d609b27623d827c046e87e9de374c (diff)
Merge "Check that VNFs boot properly"
-rw-r--r--sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py7
-rw-r--r--sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py7
2 files changed, 6 insertions, 8 deletions
diff --git a/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py b/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py
index 8ec4dffb..68ceeda0 100644
--- a/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py
+++ b/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py
@@ -160,10 +160,9 @@ def main():
'test-vnfd2',
av_zone=availability_zones[1])
- try:
- os_tacker.wait_for_vnf(tacker_client, vnf_name='testVNF1')
- os_tacker.wait_for_vnf(tacker_client, vnf_name='testVNF2')
- except:
+ vnf1_id = os_tacker.wait_for_vnf(tacker_client, vnf_name='testVNF1')
+ vnf2_id = os_tacker.wait_for_vnf(tacker_client, vnf_name='testVNF2')
+ if vnf1_id is None or vnf2_id is None:
logger.error('ERROR while booting vnfs')
sys.exit(1)
diff --git a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
index a91b457b..e02fa475 100644
--- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
+++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
@@ -131,10 +131,9 @@ def main():
test_utils.create_vnf_in_av_zone(tacker_client, 'testVNF1', 'test-vnfd1')
test_utils.create_vnf_in_av_zone(tacker_client, 'testVNF2', 'test-vnfd2')
- try:
- os_tacker.wait_for_vnf(tacker_client, vnf_name='testVNF1')
- os_tacker.wait_for_vnf(tacker_client, vnf_name='testVNF2')
- except:
+ vnf1_id = os_tacker.wait_for_vnf(tacker_client, vnf_name='testVNF1')
+ vnf2_id = os_tacker.wait_for_vnf(tacker_client, vnf_name='testVNF2')
+ if vnf1_id is None or vnf2_id is None:
logger.error('ERROR while booting vnfs')
sys.exit(1)