aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--resources/libraries/python/honeycomb/Netconf.py35
-rw-r--r--resources/libraries/python/honeycomb/Notifications.py2
-rw-r--r--resources/test_data/honeycomb/netconf/triggers.py40
-rwxr-xr-xresources/traffic_scripts/honeycomb/read_vpp_version.py2
4 files changed, 36 insertions, 43 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."
)
diff --git a/resources/test_data/honeycomb/netconf/triggers.py b/resources/test_data/honeycomb/netconf/triggers.py
index 899c258c06..8cdfcd9380 100644
--- a/resources/test_data/honeycomb/netconf/triggers.py
+++ b/resources/test_data/honeycomb/netconf/triggers.py
@@ -54,11 +54,11 @@ a:operation="replace">
<name>4fe335c8-6fdc-4654-b12c-d256e9b39229</name>
<description>neutron port</description>
<link-up-down-trap-enable>enabled</link-up-down-trap-enable>
-<vhost-user xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+<vhost-user xmlns="http://fd.io/hc2vpp/yang/v3po">
<role>client</role>
<socket>/tmp/socket_4fe335c8-6fdc-4654-b12c-d256e9b39229</socket>
</vhost-user>
-<type xmlns:x="urn:opendaylight:params:xml:ns:yang:v3po">x:vhost-user</type>
+<type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:vhost-user</type>
<enabled>true</enabled>
</interface>
</interfaces>
@@ -144,11 +144,11 @@ a:operation="replace">
<name>4fe335c8-6fdc-4654-b12c-d256e9b39229</name>
<description>neutron port</description>
<link-up-down-trap-enable>enabled</link-up-down-trap-enable>
-<vhost-user xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+<vhost-user xmlns="http://fd.io/hc2vpp/yang/v3po">
<role>client</role>
<socket>/tmp/socket_4fe335c8-6fdc-4654-b12c-d256e9b39229</socket>
</vhost-user>
-<type xmlns:x="urn:opendaylight:params:xml:ns:yang:v3po">x:vhost-user</type>
+<type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:vhost-user</type>
<enabled>true</enabled>
</interface>
</interfaces>
@@ -193,11 +193,11 @@ a:operation="replace">
<name>d7611278-88ff-40e1-81e2-602e94e96fc7</name>
<description>neutron port</description>
<link-up-down-trap-enable>enabled</link-up-down-trap-enable>
-<vhost-user xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+<vhost-user xmlns="http://fd.io/hc2vpp/yang/v3po">
<role>client</role>
<socket>/tmp/socket_d7611278-88ff-40e1-81e2-602e94e96fc7</socket>
</vhost-user>
-<type xmlns:x="urn:opendaylight:params:xml:ns:yang:v3po">x:vhost-user</type>
+<type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:vhost-user</type>
<enabled>true</enabled>
</interface>
</interfaces>
@@ -242,11 +242,11 @@ a:operation="replace">
<name>1f96a665-4351-4984-b1a8-dc6f54683123</name>
<description>neutron port</description>
<link-up-down-trap-enable>enabled</link-up-down-trap-enable>
-<vhost-user xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+<vhost-user xmlns="http://fd.io/hc2vpp/yang/v3po">
<role>client</role>
<socket>/tmp/socket_1f96a665-4351-4984-b1a8-dc6f54683123</socket>
</vhost-user>
-<type xmlns:x="urn:opendaylight:params:xml:ns:yang:v3po">x:vhost-user</type>
+<type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:vhost-user</type>
<enabled>true</enabled>
</interface>
</interfaces>
@@ -285,7 +285,7 @@ a:operation="replace">
</target>
<default-operation>none</default-operation>
<config>
-<bridge-domains xmlns="urn:opendaylight:params:xml:ns:yang:v3po"
+<bridge-domains xmlns="http://fd.io/hc2vpp/yang/v3po"
xmlns:a="urn:ietf:params:xml:ns:netconf:base:1.0" a:operation="replace">
<bridge-domain>
<name>e86740a2-042c-4e64-a43b-cc224e0d5240</name>
@@ -345,10 +345,10 @@ trigger_revert1 = u"""
<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
<interface>
<name>vxlan3</name>
-<type xmlns:v3po="urn:opendaylight:params:xml:ns:yang:v3po">
+<type xmlns:v3po="http://fd.io/hc2vpp/yang/v3po">
v3po:vxlan-tunnel</type>
<enabled>true</enabled>
-<vxlan xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+<vxlan xmlns="http://fd.io/hc2vpp/yang/v3po">
<src>192.168.1.6</src>
<dst>192.168.1.7</dst>
<vni>9</vni>
@@ -370,10 +370,10 @@ trigger_revert1 = u"""
<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
<interface>
<name>vxlan4</name>
-<type xmlns:v3po="urn:opendaylight:params:xml:ns:yang:v3po">
+<type xmlns:v3po="http://fd.io/hc2vpp/yang/v3po">
v3po:vxlan-tunnel</type>
<enabled>true</enabled>
-<vxlan xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+<vxlan xmlns="http://fd.io/hc2vpp/yang/v3po">
<src>192.168.1.6</src>
<dst>192.168.1.7</dst>
<vni>9</vni>
@@ -404,9 +404,9 @@ trigger_revert2 = u"""
<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
<interface>
<name>tap</name>
-<type xmlns:v3po="urn:opendaylight:params:xml:ns:yang:v3po">v3po:tap</type>
+<type xmlns:v3po="http://fd.io/hc2vpp/yang/v3po">v3po:tap</type>
<enabled>true</enabled>
-<tap xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+<tap xmlns="http://fd.io/hc2vpp/yang/v3po">
<tap-name>tap</tap-name>
</tap>
</interface>
@@ -425,9 +425,9 @@ trigger_revert2 = u"""
<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
<interface>
<name>tap2</name>
-<type xmlns:v3po="urn:opendaylight:params:xml:ns:yang:v3po">v3po:tap</type>
+<type xmlns:v3po="http://fd.io/hc2vpp/yang/v3po">v3po:tap</type>
<enabled>true</enabled>
-<tap xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+<tap xmlns="http://fd.io/hc2vpp/yang/v3po">
<tap-name>tap</tap-name>
</tap>
</interface>
@@ -455,7 +455,7 @@ trigger_vlan = u"""
<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
<interface>
<name>{interface}</name>
-<sub-interfaces xmlns="urn:opendaylight:params:xml:ns:yang:vpp:vlan"/>
+<sub-interfaces xmlns="http://fd.io/hc2vpp/yang/vpp-vlan"/>
</interface>
</interfaces>
</config>
@@ -472,7 +472,7 @@ trigger_vlan = u"""
<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
<interface>
<name>{interface}</name>
-<sub-interfaces xmlns="urn:opendaylight:params:xml:ns:yang:vpp:vlan">
+<sub-interfaces xmlns="http://fd.io/hc2vpp/yang/vpp-vlan">
<sub-interface>
<identifier>2420</identifier>
</sub-interface>
@@ -494,7 +494,7 @@ trigger_vlan = u"""
<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
<interface>
<name>{interface}</name>
-<sub-interfaces xmlns="urn:opendaylight:params:xml:ns:yang:vpp:vlan">
+<sub-interfaces xmlns="http://fd.io/hc2vpp/yang/vpp-vlan">
<sub-interface xmlns:a="urn:ietf:params:xml:ns:netconf:base:1.0" a:operation="replace">
<identifier>2420</identifier>
<match>
diff --git a/resources/traffic_scripts/honeycomb/read_vpp_version.py b/resources/traffic_scripts/honeycomb/read_vpp_version.py
index 70ba733ca1..6a275e7c0f 100755
--- a/resources/traffic_scripts/honeycomb/read_vpp_version.py
+++ b/resources/traffic_scripts/honeycomb/read_vpp_version.py
@@ -74,7 +74,7 @@ class ConfigBlaster(object):
<get>
<filter xmlns:ns0="urn:ietf:params:xml:ns:netconf:base:1.0"
ns0:type="subtree">
- <vpp-state xmlns="urn:opendaylight:params:xml:ns:yang:vpp:management">
+ <vpp-state xmlns="http://fd.io/hc2vpp/yang/vpp-management">
<version/>
</vpp-state>
</filter>