From edc17958741ce7a99bf572129474d400a98c6dc4 Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Thu, 28 Nov 2019 19:52:52 +0100 Subject: [PATCH] FIX: acl Change-Id: Ieb1569a1dce9fd7c00041ba00f72c67142a581ed Signed-off-by: Jan Gelety --- resources/libraries/python/VatExecutor.py | 3 ++- resources/libraries/robot/features/acl.robot | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/libraries/python/VatExecutor.py b/resources/libraries/python/VatExecutor.py index 2d6a03327b..be8dbbe9dc 100644 --- a/resources/libraries/python/VatExecutor.py +++ b/resources/libraries/python/VatExecutor.py @@ -251,7 +251,8 @@ class VatTerminal: self._tty = self._ssh.interactive_terminal_open() except Exception: raise RuntimeError( - f"Cannot open interactive terminal on node {self._node}" + f"Cannot open interactive terminal on node " + f"{self._node[u'host']}" ) for _ in range(3): diff --git a/resources/libraries/robot/features/acl.robot b/resources/libraries/robot/features/acl.robot index fa94507994..ae613e1812 100644 --- a/resources/libraries/robot/features/acl.robot +++ b/resources/libraries/robot/features/acl.robot @@ -141,14 +141,14 @@ | | | | [Arguments] | ${dut} | ${dut_if1}=${NONE} | ${dut_if2}=${NONE} | | ${src_ip_int} = | Evaluate -| | ... | int(ipaddress.ip_address(unicode($src_ip_start))) - $ip_step +| | ... | int(ipaddress.ip_address($src_ip_start)) - $ip_step | | ... | modules=ipaddress | | ${dst_ip_int} = | Evaluate -| | ... | int(ipaddress.ip_address(unicode($dst_ip_start))) - $ip_step +| | ... | int(ipaddress.ip_address($dst_ip_start)) - $ip_step | | ... | modules=ipaddress | | ${ip_limit} = | Set Variable | 255.255.255.255 | | ${ip_limit_int} = | Evaluate -| | ... | int(ipaddress.ip_address(unicode($ip_limit))) | modules=ipaddress +| | ... | int(ipaddress.ip_address($ip_limit)) | modules=ipaddress | | ${sport}= | Evaluate | $sport_start - $port_step | | ${dport}= | Evaluate | $dport_start - $port_step | | ${port_limit}= | Set Variable | ${65535} -- 2.16.6