aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries
diff options
context:
space:
mode:
authorMichal Cmarada <mcmarada@cisco.com>2019-01-15 11:08:34 +0100
committerMichal Cmarada <mcmarada@cisco.com>2019-01-15 11:09:47 +0100
commitae7e4fc1d7766027cf9cc7fcd3b5a3ad29af964e (patch)
tree27ea05c316783b1039b453135002181dc60e919e /resources/libraries
parent3c88007b0cb32905af6e133663f4cd1ad44c13de (diff)
fix failing tests after namespace updates in HC
Change-Id: Idf7cbcf285ff130f771eb3878065e6daa869ac71 Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'resources/libraries')
-rw-r--r--resources/libraries/python/honeycomb/Netconf.py35
-rw-r--r--resources/libraries/python/honeycomb/Notifications.py2
2 files changed, 15 insertions, 22 deletions
diff --git a/resources/libraries/python/honeycomb/Netconf.py b/resources/libraries/python/honeycomb/Netconf.py
index 742948c6e7..303361034e 100644
--- a/resources/libraries/python/honeycomb/Netconf.py
+++ b/resources/libraries/python/honeycomb/Netconf.py
@@ -19,7 +19,6 @@ from time import time
import paramiko
from robot.api import logger
-from interruptingcow import timeout
from resources.libraries.python.honeycomb.HoneycombUtil import HoneycombError
@@ -82,7 +81,6 @@ class Netconf(object):
# read OpenDaylight's hello message and capability list
self.get_response(
size=131072,
- time_out=time_out,
err="Timeout on getting hello message."
)
@@ -90,16 +88,14 @@ class Netconf(object):
if not self.channel.active:
raise HoneycombError("Channel closed on capabilities exchange.")
- def get_response(self, size=4096, time_out=10, err="Unspecified Error."):
+ def get_response(self, size=4096, err="Unspecified Error."):
"""Iteratively read data from the receive buffer and catenate together
until message ends with the message delimiter, or
until timeout is reached.
:param size: Maximum number of bytes to read in one iteration.
- :param time_out: Timeout value for getting the complete response.
:param err: Error message to provide when timeout is reached.
:type size: int
- :type time_out: int
:type err: str
:returns: Content of response.
:rtype: str
@@ -109,20 +105,19 @@ class Netconf(object):
reply = ''
try:
- with timeout(time_out, exception=RuntimeError):
- while not reply.endswith(self.delimiter) or \
- self.channel.recv_ready():
- try:
- chunk = self.channel.recv(size)
- if not chunk:
- break
- reply += chunk
- if self.channel.exit_status_ready():
- logger.debug('Channel exit status ready.')
- break
- except socket.timeout:
- raise HoneycombError("Socket timeout.",
- enable_logging=False)
+ while not reply.endswith(self.delimiter) or \
+ self.channel.recv_ready():
+ try:
+ chunk = self.channel.recv(size)
+ if not chunk:
+ break
+ reply += chunk
+ if self.channel.exit_status_ready():
+ logger.debug('Channel exit status ready.')
+ break
+ except socket.timeout:
+ raise HoneycombError("Socket timeout.",
+ enable_logging=False)
except RuntimeError:
raise HoneycombError(err + " Content of buffer: {0}".format(reply),
@@ -148,7 +143,7 @@ class Netconf(object):
while True:
try:
- response += self.get_response(size, time_out, err)
+ response += self.get_response(size, err)
except HoneycombError:
break
diff --git a/resources/libraries/python/honeycomb/Notifications.py b/resources/libraries/python/honeycomb/Notifications.py
index 58d835eca0..7bba00a2d2 100644
--- a/resources/libraries/python/honeycomb/Notifications.py
+++ b/resources/libraries/python/honeycomb/Notifications.py
@@ -42,7 +42,6 @@ class Notifications(Netconf):
self.send(subscription)
reply = self.get_response(
- time_out=time_out,
err="Timeout on notifications subscription."
)
@@ -65,7 +64,6 @@ class Notifications(Netconf):
.format(time_out))
reply = self.get_response(
- time_out=time_out,
err="Timeout on getting notification."
)