diff options
22 files changed, 80 insertions, 90 deletions
diff --git a/VPP_STABLE_VER_CENTOS b/VPP_STABLE_VER_CENTOS index bc9af79f1c..af95662829 100644 --- a/VPP_STABLE_VER_CENTOS +++ b/VPP_STABLE_VER_CENTOS @@ -1 +1 @@ -21.01-rc0~225_gdfffdd7~b128 +21.01-rc0~283-g5f4f208~b184 diff --git a/VPP_STABLE_VER_UBUNTU_BIONIC b/VPP_STABLE_VER_UBUNTU_BIONIC index a1a7752772..c67eb74793 100644 --- a/VPP_STABLE_VER_UBUNTU_BIONIC +++ b/VPP_STABLE_VER_UBUNTU_BIONIC @@ -1 +1 @@ -21.01-rc0~225-gdfffdd7fa +21.01-rc0~283-g5f4f2081c diff --git a/resources/api/vpp/supported_crcs.yaml b/resources/api/vpp/supported_crcs.yaml index 7213f06389..21b14904f3 100644 --- a/resources/api/vpp/supported_crcs.yaml +++ b/resources/api/vpp/supported_crcs.yaml @@ -30,8 +30,8 @@ # Use bash command "env LC_COLLATE=C sort -u" if not clear. # https://logs.fd.io/production/vex-yul-rot-jenkins-1 -# /vpp-merge-master-ubuntu1804-x86_64/65/ -21.01-rc0~163: +# /vpp-merge-master-ubuntu1804-x86_64/184/ +21.01-rc0~283: acl_add_replace: '0x1cabdeab' # dev acl_add_replace_reply: '0xac407b0c' # dev acl_details: '0x7a97f21c' # perf teardown @@ -184,6 +184,8 @@ nat44_interface_addr_dump: '0x51077d14' # dev teardown nat44_interface_details: '0x5d286289' # dev teardown nat44_interface_dump: '0x51077d14' # dev teardown + nat44_plugin_enable_disable: '0xdea0d501' # dev + nat44_plugin_enable_disable_reply: '0xe8d4e804' # dev nat44_static_mapping_details: '0x1a433ef7' # dev teardown nat44_static_mapping_dump: '0x51077d14' # dev teardown nat44_user_details: '0x355896c2' # dev teardown diff --git a/resources/libraries/python/NATUtil.py b/resources/libraries/python/NATUtil.py index 620e14aea1..a9f760768e 100644 --- a/resources/libraries/python/NATUtil.py +++ b/resources/libraries/python/NATUtil.py @@ -27,7 +27,7 @@ from resources.libraries.python.PapiExecutor import PapiSocketExecutor class NatConfigFlags(IntEnum): - """Common NAT plugin APIs""" + """NAT plugin configuration flags""" NAT_IS_NONE = 0x00 NAT_IS_TWICE_NAT = 0x01 NAT_IS_SELF_TWICE_NAT = 0x02 @@ -39,6 +39,15 @@ class NatConfigFlags(IntEnum): NAT_IS_EXT_HOST_VALID = 0x80 +class Nat44ConfigFlags(IntEnum): + """NAT44 configuration flags""" + NAT44_IS_ENDPOINT_INDEPENDENT = 0x00 + NAT44_IS_ENDPOINT_DEPENDENT = 0x01 + NAT44_IS_STATIC_MAPPING_ONLY = 0x02 + NAT44_IS_CONNECTION_TRACKING = 0x04 + NAT44_IS_OUT2IN_DPO = 0x08 + + class NatAddrPortAllocAlg(IntEnum): """NAT Address and port assignment algorithms.""" NAT_ALLOC_ALG_DEFAULT = 0 @@ -53,6 +62,60 @@ class NATUtil: pass @staticmethod + def enable_nat44_plugin( + node, inside_vrf=0, outside_vrf=0, users=0, user_memory=0, + sessions=0, session_memory=0, user_sessions=0, mode=u""): + """Enable NAT44 plugin. + + :param node: DUT node. + :param inside_vrf: Inside VRF ID. + :param outside_vrf: Outside VRF ID. + :param users: Maximum number of users. Used only in endpoint-independent + mode. + :param user_memory: User memory size - overwrite auto calculated hash + allocation parameter if non-zero. + :param sessions: Maximum number of sessions. + :param session_memory: Session memory size - overwrite auto calculated + hash allocation parameter if non-zero. + :param user_sessions: Maximum number of sessions per user. Used only in + endpoint-independent mode. + :param mode: NAT44 mode. Valid values: + - endpoint-independent + - endpoint-dependent + - static-mapping-only + - connection-tracking + - out2in-dpo + :type node: dict + :type inside_vrf: str or int + :type outside_vrf: str or int + :type users: str or int + :type user_memory: str or int + :type sessions: str or int + :type session_memory: str or int + :type user_sessions: str or int + :type mode: str + """ + cmd = u"nat44_plugin_enable_disable" + err_msg = f"Failed to enable NAT44 plugin on the host {node[u'host']}!" + args_in = dict( + enable=True, + inside_vrf=int(inside_vrf), + outside_vrf=int(outside_vrf), + users=int(users), + user_memory=int(user_memory), + sessions=int(sessions), + session_memory=int(session_memory), + user_sessions=int(user_sessions), + flags=getattr( + Nat44ConfigFlags, + f"NAT44_IS_{mode.replace(u'-', u'_').upper()}" + ).value + ) + + with PapiSocketExecutor(node) as papi_exec: + papi_exec.add(cmd, **args_in).get_reply(err_msg) + + @staticmethod def set_nat44_interface(node, interface, flag): """Set inside and outside interfaces for NAT44. @@ -200,6 +263,9 @@ class NATUtil: :returns: Value of max_translations_per_thread NAT44 parameter. :rtype: int """ + # vpp-device tests have not dedicated physical core so + # ${thr_count_int} == 0 but we need to use one thread + threads = 1 if not int(threads) else int(threads) rest, mult = modf(log2(sessions/(10*threads))) return 2 ** (int(mult) + (1 if rest else 0)) * 10 diff --git a/resources/libraries/robot/ip/nat.robot b/resources/libraries/robot/ip/nat.robot index e80e1e1c85..dee04f0b61 100644 --- a/resources/libraries/robot/ip/nat.robot +++ b/resources/libraries/robot/ip/nat.robot @@ -40,6 +40,9 @@ | Initialize NAT44 endpoint-dependent mode in circular topology | | [Documentation] | Initialization of NAT44 endpoint-dependent mode on DUT1 | | +| | ${max_sessions}= | Compute Max Translations Per Thread +| | ... | ${n_sessions} | ${thr_count_int} +| | Enable NAT44 Plugin | ${dut1} | mode=${nat_mode} | sessions=${max_sessions} | | Configure inside and outside interfaces | | ... | ${dut1} | ${DUT1_${int}1}[0] | ${DUT1_${int}2}[0] | | Set NAT44 Address Range diff --git a/tests/vpp/device/ip4/eth2p-ethip4tcp-nat44ed-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4tcp-nat44ed-dev.robot index 0a60b3f2e1..c72fae1870 100644 --- a/tests/vpp/device/ip4/eth2p-ethip4tcp-nat44ed-dev.robot +++ b/tests/vpp/device/ip4/eth2p-ethip4tcp-nat44ed-dev.robot @@ -71,7 +71,7 @@ | ${dst_port}= | 8080 # NAT settings | ${nat_mode}= | endpoint-dependent -| ${max_translations_per_thread}= | 81920 +| ${n_sessions}= | ${64512} | ${in_net}= | 192.168.0.0 | ${in_mask}= | ${22} | ${out_net}= | 68.142.68.0 @@ -98,9 +98,6 @@ | | Given Set Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | And Add NAT to all DUTs | nat_mode=${nat_mode} -| | And Add NAT max translations per thread to all DUTs -| | ... | ${max_translations_per_thread} | | And Apply startup configuration on all VPP DUTs | with_trace=${True} | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface diff --git a/tests/vpp/device/ip4/eth2p-ethip4udp-nat44ed-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4udp-nat44ed-dev.robot index e4e5241b18..18f648f2dc 100644 --- a/tests/vpp/device/ip4/eth2p-ethip4udp-nat44ed-dev.robot +++ b/tests/vpp/device/ip4/eth2p-ethip4udp-nat44ed-dev.robot @@ -71,7 +71,7 @@ | ${dst_port}= | 8080 # NAT settings | ${nat_mode}= | endpoint-dependent -| ${max_translations_per_thread}= | 81920 +| ${n_sessions}= | ${64512} | ${in_net}= | 192.168.0.0 | ${in_mask}= | ${22} | ${out_net}= | 68.142.68.0 @@ -98,9 +98,6 @@ | | Given Set Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | And Add NAT to all DUTs | nat_mode=${nat_mode} -| | And Add NAT max translations per thread to all DUTs -| | ... | ${max_translations_per_thread} | | And Apply startup configuration on all VPP DUTs | with_trace=${True} | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.robot index 905c5526f8..75127b64b6 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.robot @@ -122,11 +122,6 @@ | | Given Set Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | And Add NAT to all DUTs | nat_mode=${nat_mode} -| | ${max_translations_per_thread}= | Compute Max Translations Per Thread -| | ... | ${n_sessions} | ${thr_count_int} -| | And Add NAT max translations per thread to all DUTs -| | ... | ${max_translations_per_thread} | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.robot index 836f60208a..6cfa95bb78 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.robot @@ -122,11 +122,6 @@ | | Given Set Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | And Add NAT to all DUTs | nat_mode=${nat_mode} -| | ${max_translations_per_thread}= | Compute Max Translations Per Thread -| | ... | ${n_sessions} | ${thr_count_int} -| | And Add NAT max translations per thread to all DUTs -| | ... | ${max_translations_per_thread} | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot index 674cab0b1c..2907e32fc9 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot @@ -92,7 +92,7 @@ | ${trial_duration}= | ${1.1} | ${trial_multiplicity}= | ${1} # Main heap size multiplicator -| ${heap_size_mult}= | ${3} +| ${heap_size_mult}= | ${7} *** Keywords *** | Local Template @@ -124,11 +124,6 @@ | | Given Set Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | And Add NAT to all DUTs | nat_mode=${nat_mode} -| | ${max_translations_per_thread}= | Compute Max Translations Per Thread -| | ... | ${n_sessions} | ${thr_count_int} -| | And Add NAT max translations per thread to all DUTs -| | ... | ${max_translations_per_thread} | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.robot index 873ac1a30a..5059253871 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.robot @@ -122,11 +122,6 @@ | | Given Set Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | And Add NAT to all DUTs | nat_mode=${nat_mode} -| | ${max_translations_per_thread}= | Compute Max Translations Per Thread -| | ... | ${n_sessions} | ${thr_count_int} -| | And Add NAT max translations per thread to all DUTs -| | ... | ${max_translations_per_thread} | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot index 39e81ec690..32851f5576 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot @@ -124,11 +124,6 @@ | | Given Set Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | And Add NAT to all DUTs | nat_mode=${nat_mode} -| | ${max_translations_per_thread}= | Compute Max Translations Per Thread -| | ... | ${n_sessions} | ${thr_count_int} -| | And Add NAT max translations per thread to all DUTs -| | ... | ${max_translations_per_thread} | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.robot index cfdcfac9ce..a9865fdc7e 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.robot @@ -122,11 +122,6 @@ | | Given Set Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | And Add NAT to all DUTs | nat_mode=${nat_mode} -| | ${max_translations_per_thread}= | Compute Max Translations Per Thread -| | ... | ${n_sessions} | ${thr_count_int} -| | And Add NAT max translations per thread to all DUTs -| | ... | ${max_translations_per_thread} | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.robot index 89ba6e4c9d..57b25a270e 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.robot @@ -110,11 +110,6 @@ | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | And Add NAT to all DUTs | nat_mode=${nat_mode} -| | ${max_translations_per_thread}= | Compute Max Translations Per Thread -| | ... | ${n_sessions} | ${thr_count_int} -| | And Add NAT max translations per thread to all DUTs -| | ... | ${max_translations_per_thread} | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.robot index 7ecdf09e44..29e7e514fa 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.robot @@ -122,11 +122,6 @@ | | Given Set Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | And Add NAT to all DUTs | nat_mode=${nat_mode} -| | ${max_translations_per_thread}= | Compute Max Translations Per Thread -| | ... | ${n_sessions} | ${thr_count_int} -| | And Add NAT max translations per thread to all DUTs -| | ... | ${max_translations_per_thread} | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.robot index 0f421e3687..d184ae9082 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.robot @@ -110,11 +110,6 @@ | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | And Add NAT to all DUTs | nat_mode=${nat_mode} -| | ${max_translations_per_thread}= | Compute Max Translations Per Thread -| | ... | ${n_sessions} | ${thr_count_int} -| | And Add NAT max translations per thread to all DUTs -| | ... | ${max_translations_per_thread} | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot index e375a7558d..0b2556134f 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot @@ -92,7 +92,7 @@ | ${trial_duration}= | ${1.1} | ${trial_multiplicity}= | ${1} # Main heap size multiplicator -| ${heap_size_mult}= | ${3} +| ${heap_size_mult}= | ${7} *** Keywords *** | Local Template @@ -124,11 +124,6 @@ | | Given Set Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | And Add NAT to all DUTs | nat_mode=${nat_mode} -| | ${max_translations_per_thread}= | Compute Max Translations Per Thread -| | ... | ${n_sessions} | ${thr_count_int} -| | And Add NAT max translations per thread to all DUTs -| | ... | ${max_translations_per_thread} | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.robot index 0f1694a3c3..564874f3b5 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.robot @@ -112,11 +112,6 @@ | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | And Add NAT to all DUTs | nat_mode=${nat_mode} -| | ${max_translations_per_thread}= | Compute Max Translations Per Thread -| | ... | ${n_sessions} | ${thr_count_int} -| | And Add NAT max translations per thread to all DUTs -| | ... | ${max_translations_per_thread} | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.robot index 98a00a655d..f04a476517 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.robot @@ -122,11 +122,6 @@ | | Given Set Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | And Add NAT to all DUTs | nat_mode=${nat_mode} -| | ${max_translations_per_thread}= | Compute Max Translations Per Thread -| | ... | ${n_sessions} | ${thr_count_int} -| | And Add NAT max translations per thread to all DUTs -| | ... | ${max_translations_per_thread} | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.robot index b201e36cfe..613687d95c 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.robot @@ -110,11 +110,6 @@ | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | And Add NAT to all DUTs | nat_mode=${nat_mode} -| | ${max_translations_per_thread}= | Compute Max Translations Per Thread -| | ... | ${n_sessions} | ${thr_count_int} -| | And Add NAT max translations per thread to all DUTs -| | ... | ${max_translations_per_thread} | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot index 97c68d82fd..6f5f7ddb73 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot @@ -124,11 +124,6 @@ | | Given Set Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | And Add NAT to all DUTs | nat_mode=${nat_mode} -| | ${max_translations_per_thread}= | Compute Max Translations Per Thread -| | ... | ${n_sessions} | ${thr_count_int} -| | And Add NAT max translations per thread to all DUTs -| | ... | ${max_translations_per_thread} | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.robot index dfc88b375b..217af61733 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.robot @@ -112,11 +112,6 @@ | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | And Add NAT to all DUTs | nat_mode=${nat_mode} -| | ${max_translations_per_thread}= | Compute Max Translations Per Thread -| | ... | ${n_sessions} | ${thr_count_int} -| | And Add NAT max translations per thread to all DUTs -| | ... | ${max_translations_per_thread} | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface |