Merge "Update ODL tag to release/carbon"

[functest.git] / functest / utils / openstack_tacker.py

diff --git a/functest/utils/openstack_tacker.py b/functest/utils/openstack_tacker.py
index 07acc8b..9fd9d5c 100644 (file)
--- a/functest/utils/openstack_tacker.py
+++ b/functest/utils/openstack_tacker.py
@@ -11,13 +11,13 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##########################################################################
 
+import logging
 
 from tackerclient.v1_0 import client as tackerclient
-import functest.utils.functest_logger as ft_logger
 import functest.utils.openstack_utils as os_utils
 import time
 
-logger = ft_logger.Logger("tacker_utils").getLogger()
+logger = logging.getLogger(__name__)
 
 
 def get_tacker_client(other_creds={}):
@@ -176,6 +176,11 @@ def wait_for_vnf(tacker_client, vnf_id=None, vnf_name=None, timeout=60):
             elif vnf['status'] == 'PENDING_CREATE':
                 time.sleep(3)
                 timeout -= 3
+            vnf = get_vnf(tacker_client, vnf_id, vnf_name)
+
+        if (timeout < 0):
+            raise Exception('Timeout when booting vnf %s' % vnf['id'])
+
         return vnf['id']
     except Exception, e:
         logger.error("error [wait_for_vnf(tacker_client, '%s', '%s')]: %s"