job-spec: Replace TRex scale2m-tg tests by scale20k-tg

Change-Id: If7e00460fee4eee50479dc089c026670dcf3edf9
Signed-off-by: Tibor Frank <tifrank@cisco.com>

diff --git a/resources/job_specs/report_coverage/1n-aws/trex-00.md b/resources/job_specs/report_coverage/1n-aws/trex-00.md
index 29837a0..ba8246b 100644 (file)
--- a/resources/job_specs/report_coverage/1n-aws/trex-00.md
+++ b/resources/job_specs/report_coverage/1n-aws/trex-00.md
@@ -5,19 +5,19 @@
 - AND 1518b AND ndrpdr AND nitro-50g AND - AND ethip4-ip4base-tg
 - AND 9000b AND ndrpdr AND nitro-50g AND - AND ethip4-ip4base-tg
 - AND imix AND ndrpdr AND nitro-50g AND - AND ethip4-ip4base-tg
-##### ethip4-ip4scale2m-tg
-- AND 64b AND ndrpdr AND nitro-50g AND - AND ethip4-ip4scale2m-tg
-- AND 1518b AND ndrpdr AND nitro-50g AND - AND ethip4-ip4scale2m-tg
-- AND 9000b AND ndrpdr AND nitro-50g AND - AND ethip4-ip4scale2m-tg
-- AND imix AND ndrpdr AND nitro-50g AND - AND ethip4-ip4scale2m-tg
+##### ethip4-ip4scale20k-tg
+- AND 64b AND ndrpdr AND nitro-50g AND - AND ethip4-ip4scale20k-tg
+- AND 1518b AND ndrpdr AND nitro-50g AND - AND ethip4-ip4scale20k-tg
+- AND 9000b AND ndrpdr AND nitro-50g AND - AND ethip4-ip4scale20k-tg
+- AND imix AND ndrpdr AND nitro-50g AND - AND ethip4-ip4scale20k-tg
 ## ./ip6
 ##### ethip6-ip6base-tg
 - AND 78b AND ndrpdr AND nitro-50g AND - AND ethip6-ip6base-tg
 - AND 1518b AND ndrpdr AND nitro-50g AND - AND ethip6-ip6base-tg
 - AND 9000b AND ndrpdr AND nitro-50g AND - AND ethip6-ip6base-tg
 - AND imix AND ndrpdr AND nitro-50g AND - AND ethip6-ip6base-tg
-##### ethip6-ip6scale2m-tg
-- AND 78b AND ndrpdr AND nitro-50g AND - AND ethip6-ip6scale2m-tg
-- AND 1518b AND ndrpdr AND nitro-50g AND - AND ethip6-ip6scale2m-tg
-- AND 9000b AND ndrpdr AND nitro-50g AND - AND ethip6-ip6scale2m-tg
-- AND imix AND ndrpdr AND nitro-50g AND - AND ethip6-ip6scale2m-tg
\ No newline at end of file
+##### ethip6-ip6scale20k-tg
+- AND 78b AND ndrpdr AND nitro-50g AND - AND ethip6-ip6scale20k-tg
+- AND 1518b AND ndrpdr AND nitro-50g AND - AND ethip6-ip6scale20k-tg
+- AND 9000b AND ndrpdr AND nitro-50g AND - AND ethip6-ip6scale20k-tg
+- AND imix AND ndrpdr AND nitro-50g AND - AND ethip6-ip6scale20k-tg
\ No newline at end of file

diff --git a/resources/job_specs/report_iterative/1n-aws/trex-mrr-00.md b/resources/job_specs/report_iterative/1n-aws/trex-mrr-00.md
index da10596..8fe2d54 100644 (file)
--- a/resources/job_specs/report_iterative/1n-aws/trex-mrr-00.md
+++ b/resources/job_specs/report_iterative/1n-aws/trex-mrr-00.md
@@ -2,10 +2,10 @@
 ## ./ip4
 ##### ethip4-ip4base-tg
 - AND 64b AND mrr AND nitro-50g AND - AND ethip4-ip4base-tg
-##### ethip4-ip4scale2m-tg
-- AND 64b AND mrr AND nitro-50g AND - AND ethip4-ip4scale2m-tg
+##### ethip4-ip4scale20k-tg
+- AND 64b AND mrr AND nitro-50g AND - AND ethip4-ip4scale20k-tg
 ## ./ip6
 ##### ethip6-ip6base-tg
 - AND 78b AND mrr AND nitro-50g AND - AND ethip6-ip6base-tg
-##### ethip6-ip6scale2m-tg
-- AND 78b AND mrr AND nitro-50g AND - AND ethip6-ip6scale2m-tg
+##### ethip6-ip6scale20k-tg
+- AND 78b AND mrr AND nitro-50g AND - AND ethip6-ip6scale20k-tg

diff --git a/resources/job_specs/report_iterative/1n-aws/trex-ndrpdr-00.md b/resources/job_specs/report_iterative/1n-aws/trex-ndrpdr-00.md
index 1597a28..280fc96 100644 (file)
--- a/resources/job_specs/report_iterative/1n-aws/trex-ndrpdr-00.md
+++ b/resources/job_specs/report_iterative/1n-aws/trex-ndrpdr-00.md
@@ -2,10 +2,10 @@
 ## ./ip4
 ##### ethip4-ip4base-tg
 - AND 64b AND ndrpdr AND nitro-50g AND - AND ethip4-ip4base-tg
-##### ethip4-ip4scale2m-tg
-- AND 64b AND ndrpdr AND nitro-50g AND - AND ethip4-ip4scale2m-tg
+##### ethip4-ip4scale20k-tg
+- AND 64b AND ndrpdr AND nitro-50g AND - AND ethip4-ip4scale20k-tg
 ## ./ip6
 ##### ethip6-ip6base-tg
 - AND 78b AND ndrpdr AND nitro-50g AND - AND ethip6-ip6base-tg
-##### ethip6-ip6scale2m-tg
-- AND 78b AND ndrpdr AND nitro-50g AND - AND ethip6-ip6scale2m-tg
\ No newline at end of file
+##### ethip6-ip6scale20k-tg
+- AND 78b AND ndrpdr AND nitro-50g AND - AND ethip6-ip6scale20k-tg
\ No newline at end of file

diff --git a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4-ip4scale2m-tg-ndrpdr.robot b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4-ip4scale20k-tg-ndrpdr.robot
similarity index 90%
rename from tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4-ip4scale2m-tg-ndrpdr.robot
rename to tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4-ip4scale20k-tg-ndrpdr.robot
index 83f7b6c..b227eb7 100644 (file)
--- a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4-ip4scale2m-tg-ndrpdr.robot
+++ b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4-ip4scale20k-tg-ndrpdr.robot
@@ -17,8 +17,8 @@
 | Force Tags | 1_NODE_SINGLE_LINK_TOPO | 2_NODE_SINGLE_LINK_TOPO
 | ... | 3_NODE_SINGLE_LINK_TOPO
 | ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | N2N
-| ... | SCALE | IP4SCALE2M | TG_DRV_IGB_UIO
-| ... | ethip4-ip4scale2m-tg
+| ... | SCALE | IP4SCALE20K | TG_DRV_IGB_UIO
+| ... | ethip4-ip4scale20k-tg
 |
 | Suite Setup | Setup suite topology interfaces with no DUT | performance_tg_nic
 | Suite Teardown | Tear down suite | performance
@@ -43,7 +43,7 @@
 | ... | library.
 | ... | Test packets are generated by TG on links to TG. \
 | ... | TG traffic profile contains two L3 flow-groups (flow-group per \
-| ... | direction, 1M flows per flow-group) with all packets containing \
+| ... | direction, 10k flows per flow-group) with all packets containing \
 | ... | Ethernet header, IPv4 header with IP protocol=61 and static payload. \
 | ... | MAC addresses are matching MAC addresses of the TG node interfaces.
 | ... |
@@ -54,7 +54,7 @@
 | ${nic_pfs}= | 2
 | ${osi_layer}= | L2
 | ${overhead}= | ${0}
-| ${rts_per_flow}= | ${1000000}
+| ${rts_per_flow}= | ${10000}
 # Traffic profile
 | ${traffic_profile}= | trex-stl-2n-ethip4-ip4dst${rts_per_flow}
 
@@ -76,18 +76,18 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 64B--ethip4-ip4scale2m-tg-ndrpdr
+| 64B--ethip4-ip4scale20k-tg-ndrpdr
 | | [Tags] | 64B
 | | frame_size=${64}
 
-| 1518B--ethip4-ip4scale2m-tg-ndrpdr
+| 1518B--ethip4-ip4scale20k-tg-ndrpdr
 | | [Tags] | 1518B
 | | frame_size=${1518}
 
-| 9000B--ethip4-ip4scale2m-tg-ndrpdr
+| 9000B--ethip4-ip4scale20k-tg-ndrpdr
 | | [Tags] | 9000B
 | | frame_size=${9000}
 
-| IMIX--ethip4-ip4scale2m-tg-ndrpdr
+| IMIX--ethip4-ip4scale20k-tg-ndrpdr
 | | [Tags] | IMIX
 | | frame_size=IMIX_v4_1

diff --git a/tests/trex/perf/ip6/1n1l-10ge2p1x710-ethip6-ip6scale2m-tg-ndrpdr.robot b/tests/trex/perf/ip6/1n1l-10ge2p1x710-ethip6-ip6scale20k-tg-ndrpdr.robot
similarity index 90%
rename from tests/trex/perf/ip6/1n1l-10ge2p1x710-ethip6-ip6scale2m-tg-ndrpdr.robot
rename to tests/trex/perf/ip6/1n1l-10ge2p1x710-ethip6-ip6scale20k-tg-ndrpdr.robot
index 096caf3..080b404 100644 (file)
--- a/tests/trex/perf/ip6/1n1l-10ge2p1x710-ethip6-ip6scale2m-tg-ndrpdr.robot
+++ b/tests/trex/perf/ip6/1n1l-10ge2p1x710-ethip6-ip6scale20k-tg-ndrpdr.robot
@@ -17,8 +17,8 @@
 | Force Tags | 1_NODE_SINGLE_LINK_TOPO | 2_NODE_SINGLE_LINK_TOPO
 | ... | 3_NODE_SINGLE_LINK_TOPO
 | ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | N2N
-| ... | SCALE | IP6SCALE2M | TG_DRV_IGB_UIO
-| ... | ethip6-ip6scale2m-tg
+| ... | SCALE | IP6SCALE20K | TG_DRV_IGB_UIO
+| ... | ethip6-ip6scale20k-tg
 |
 | Suite Setup | Setup suite topology interfaces with no DUT | performance_tg_nic
 | Suite Teardown | Tear down suite | performance
@@ -43,7 +43,7 @@
 | ... | library.
 | ... | Test packets are generated by TG on links to TG. \
 | ... | TG traffic profile contains two L3 flow-groups (flow-group per \
-| ... | direction, 254 flows per flow-group) with all packets containing \
+| ... | direction, 10k flows per flow-group) with all packets containing \
 | ... | Ethernet header, IPv6 header with static payload. \
 | ... | MAC addresses are matching MAC addresses of the TG node interfaces.
 | ... |
@@ -54,7 +54,7 @@
 | ${nic_pfs}= | 2
 | ${osi_layer}= | L3
 | ${overhead}= | ${0}
-| ${rts_per_flow}= | ${1000000}
+| ${rts_per_flow}= | ${10000}
 # Traffic profile:
 | ${traffic_profile}= | trex-stl-ethip6-ip6dst${rts_per_flow}
 
@@ -76,18 +76,18 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 78B--ethip6-ip6scale2m-tg-ndrpdr
+| 78B--ethip6-ip6scale20k-tg-ndrpdr
 | | [Tags] | 78B
 | | frame_size=${78}
 
-| 1518B--ethip6-ip6scale2m-tg-ndrpdr
+| 1518B--ethip6-ip6scale20k-tg-ndrpdr
 | | [Tags] | 1518B
 | | frame_size=${1518}
 
-| 9000B--ethip6-ip6scale2m-tg-ndrpdr
+| 9000B--ethip6-ip6scale20k-tg-ndrpdr
 | | [Tags] | 9000B
 | | frame_size=${9000}
 
-| IMIX--ethip6-ip6scale2m-tg-ndrpdr
+| IMIX--ethip6-ip6scale20k-tg-ndrpdr
 | | [Tags] | IMIX
 | | frame_size=IMIX_v4_1