aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan Vidal <juan.vidal.allende@ericsson.com>2017-02-16 16:57:41 +0000
committerJuan Vidal <juan.vidal.allende@ericsson.com>2017-02-16 17:03:23 +0000
commit53c407ac0e9d609b27623d827c046e87e9de374c (patch)
treec9c00242a9bcaf6efe534b502e66dc9b587c52dd
parentc5cbde76d281a5255751260fcae9f29809c6da01 (diff)
Check that VNFs boot properly
Change-Id: I10b82e9a48363cbe10c62d4f4f7f9b22371b06e9 Signed-off-by: Juan Vidal <juan.vidal.allende@ericsson.com>
-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)