From 112e652af2b2f61192d3f1bd903522a14be06b94 Mon Sep 17 00:00:00 2001
From: Linda Wang <wangwulin@huawei.com>
Date: Tue, 26 Sep 2017 03:31:51 +0000
Subject: Fix timeout for socket connection
Change-Id: I0688761ba7224f40f79310295efadd9b40bfeefb
Signed-off-by: Linda Wang <wangwulin@huawei.com>
---
functest/ci/check_deployment.py | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
(limited to 'functest/ci')
diff --git a/functest/ci/check_deployment.py b/functest/ci/check_deployment.py
index 13bb4c8b..e593e17b 100644
--- a/functest/ci/check_deployment.py
+++ b/functest/ci/check_deployment.py
@@ -20,7 +20,6 @@ import logging.config
import os
import pkg_resources
import socket
-import time
from urlparse import urlparse
from snaps.openstack.utils import glance_utils
@@ -34,20 +33,16 @@ __author__ = "Jose Lausuch <jose.lausuch@ericsson.com>"
LOGGER = logging.getLogger(__name__)
-def verify_connectivity(adress, port, timeout=10):
+def verify_connectivity(adress, port):
""" Returns true if an ip/port is reachable"""
connection = socket.socket()
- count = 0
- while count < timeout:
- try:
- connection.connect((adress, port))
- LOGGER.debug('%s:%s is reachable!', adress, port)
- return True
- except socket.error:
- count += 1
- time.sleep(1)
- continue
- LOGGER.error('%s:%s is not reachable.', adress, port)
+ connection.settimeout(10)
+ try:
+ connection.connect((adress, port))
+ LOGGER.debug('%s:%s is reachable!', adress, port)
+ return True
+ except socket.error:
+ LOGGER.error('%s:%s is not reachable.', adress, port)
return False
--
cgit