diff options
| -rw-r--r-- | resources/libraries/python/HoststackUtil.py | 2 | ||||
| -rw-r--r-- | resources/libraries/python/IPUtil.py | 1 | ||||
| -rw-r--r-- | resources/libraries/python/IPsecUtil.py | 21 | ||||
| -rw-r--r-- | resources/libraries/python/Iperf3.py | 6 | ||||
| -rw-r--r-- | resources/libraries/python/Memif.py | 2 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/suite_setup.robot | 2 |
6 files changed, 15 insertions, 19 deletions
diff --git a/resources/libraries/python/HoststackUtil.py b/resources/libraries/python/HoststackUtil.py index 234a3ebc69..399395d41a 100644 --- a/resources/libraries/python/HoststackUtil.py +++ b/resources/libraries/python/HoststackUtil.py @@ -445,7 +445,7 @@ class HoststackUtil(): program_json = json.loads(program_stdout)[u"intervals"][0][u"sum"] try: retransmits = program_json["retransmits"] - except(KeyError): + except KeyError: retransmits = None export_hoststack_results( bandwidth=program_json["bits_per_second"], diff --git a/resources/libraries/python/IPUtil.py b/resources/libraries/python/IPUtil.py index dd3d21f740..933fa34211 100644 --- a/resources/libraries/python/IPUtil.py +++ b/resources/libraries/python/IPUtil.py @@ -15,7 +15,6 @@ """Common IP utilities library.""" import re -import os from enum import IntEnum diff --git a/resources/libraries/python/IPsecUtil.py b/resources/libraries/python/IPsecUtil.py index 873b6af5d8..29f34ed6a9 100644 --- a/resources/libraries/python/IPsecUtil.py +++ b/resources/libraries/python/IPsecUtil.py @@ -14,8 +14,6 @@ """IPsec utilities library.""" -import os - from enum import Enum, IntEnum from io import open from ipaddress import ip_network, ip_address @@ -483,7 +481,7 @@ class IPsecUtil: @staticmethod def vpp_ipsec_add_sad_entries( node, n_entries, sad_id, spi, crypto_alg, crypto_key, - integ_alg=None, integ_key=u"", tunnel_src=None,tunnel_dst=None, + integ_alg=None, integ_key=u"", tunnel_src=None, tunnel_dst=None, tunnel_addr_incr=True): """Create multiple Security Association Database entries on VPP node. @@ -1925,10 +1923,10 @@ class IPsecUtil: for i in range(n_tunnels//(addr_incr**2)+1): dut1_local_outbound_range = \ ip_network(f"{ip_address(tunnel_ip1) + i*(addr_incr**3)}/8", - False).with_prefixlen + False).with_prefixlen dut1_remote_outbound_range = \ ip_network(f"{ip_address(tunnel_ip2) + i*(addr_incr**3)}/8", - False).with_prefixlen + False).with_prefixlen IPsecUtil.vpp_ipsec_add_spd_entry( nodes[u"DUT1"], spd_id, p_hi, PolicyAction.BYPASS, inbound=False, @@ -1975,19 +1973,21 @@ class IPsecUtil: for i in range(n_tunnels//(addr_incr**2)+1): dut2_local_outbound_range = \ ip_network(f"{ip_address(tunnel_ip1) + i*(addr_incr**3)}/8", - False).with_prefixlen + False).with_prefixlen dut2_remote_outbound_range = \ ip_network(f"{ip_address(tunnel_ip2) + i*(addr_incr**3)}/8", - False).with_prefixlen + False).with_prefixlen IPsecUtil.vpp_ipsec_add_spd_entry( nodes[u"DUT2"], spd_id, p_hi, PolicyAction.BYPASS, - inbound=False, proto=50, laddr_range=dut2_remote_outbound_range, + inbound=False, proto=50, + laddr_range=dut2_remote_outbound_range, raddr_range=dut2_local_outbound_range ) IPsecUtil.vpp_ipsec_add_spd_entry( nodes[u"DUT2"], spd_id, p_hi, PolicyAction.BYPASS, - inbound=True, proto=50, laddr_range=dut2_local_outbound_range, + inbound=True, proto=50, + laddr_range=dut2_local_outbound_range, raddr_range=dut2_remote_outbound_range ) @@ -2082,8 +2082,7 @@ class IPsecUtil: for i in range(0, n_flows): rx_queue = i%rx_queues - spi = spi_start + i flow_index = FlowUtil.vpp_create_ip4_ipsec_flow( - node, "ESP", spi, "redirect-to-queue", value=rx_queue) + node, "ESP", spi, "redirect-to-queue", value=rx_queue) FlowUtil.vpp_flow_enable(node, interface, flow_index) diff --git a/resources/libraries/python/Iperf3.py b/resources/libraries/python/Iperf3.py index 12d0633abc..a881ec9f06 100644 --- a/resources/libraries/python/Iperf3.py +++ b/resources/libraries/python/Iperf3.py @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2023 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -34,11 +34,9 @@ class Iperf3: self._c_affinity = None @staticmethod - def get_iperf_type(node): + def get_iperf_type(): """Log and return the installed traffic generator type. - :param node: Node from topology file. - :type node: dict :returns: Traffic generator type string. :rtype: str """ diff --git a/resources/libraries/python/Memif.py b/resources/libraries/python/Memif.py index 4e0bb5fa4f..32096d0ca5 100644 --- a/resources/libraries/python/Memif.py +++ b/resources/libraries/python/Memif.py @@ -122,7 +122,7 @@ class Memif: @staticmethod def create_memif_interface( - node, filename, mid, sid, rxq=1, txq=1, role=u"SLAVE", use_dma=False + node, filename, mid, sid, rxq=1, txq=1, role=u"SLAVE", use_dma=False ): """Create Memif interface on the given node. diff --git a/resources/libraries/robot/shared/suite_setup.robot b/resources/libraries/robot/shared/suite_setup.robot index 46e134828f..64dd72e4e2 100644 --- a/resources/libraries/robot/shared/suite_setup.robot +++ b/resources/libraries/robot/shared/suite_setup.robot @@ -259,7 +259,7 @@ | | ... | Additional Setup for suites which uses performance measurement over | | ... | iPerf3. | | -| | ${type} = | Get iPerf Type | ${nodes}[TG] +| | ${type} = | Get iPerf Type | | ${version} = | Get iPerf Version | ${nodes}[TG] | | Export TG Type And Version | ${type} | ${version} |