diff options
| author |   Jan Gelety <jgelety@cisco.com> | 2020-09-16 16:45:36 +0200 |
|---|---|---|
| committer | Jan Gelety <jgelety@cisco.com> | 2020-10-23 14:53:19 +0200 |
| commit | 07ec871862034f7f439ed269fc30c55f6f95e066 (patch) | |
| tree | 8b92ced1bf561a16fcc2738e49c7dd98f5a52198 /tests/vpp | |
| parent | 905ab17015b24183770e3b55517482e30904d7f4 (diff) | |
CSIT-1597 NAT44 API: dynamic config
- cover API changes in VPP: https://gerrit.fd.io/r/c/vpp/+/29463
- update vpp stable to version 21.01-rc0~283-g5f4f2081c
Change-Id: I079c10e4537448c3b078f22c3fe4ed266a5e2e2c
Signed-off-by: Jan Gelety <jgelety@cisco.com>
Diffstat (limited to 'tests/vpp')
17 files changed, 4 insertions, 85 deletions
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 |