diff options
author | Vratko Polak <vrpolak@cisco.com> | 2024-04-30 14:54:57 +0200 |
---|---|---|
committer | Vratko Polak <vrpolak@cisco.com> | 2024-04-30 14:54:57 +0200 |
commit | b8f31fc3da4b0a6ab5805eea61af0fe7e869a453 (patch) | |
tree | 55741f7bc139244dce22896a8950e018ecc92819 | |
parent | 6f17f26958d120f5938778035210195e7ee1f79b (diff) |
feat(profiles): Do not repeat seeds in 6p profiles
On one hand, using seed==1 for all W-E streams
and seed=2 for all E-W streams would make 6p tests
even more comparable with 2p tests.
But current rnd profiles were mixing the two seed values.
On the other hand, using unique seed values for each stream
would ensure VPP is less likely to deviate from average preformance.
As the second approach also results in smaller profile files,
this patch applies that approach.
Change-Id: If0f57282a2899a1a4fb154dd6ed810064cb5c212
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
12 files changed, 18 insertions, 66 deletions
diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd10000-2p.py b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd10000-2p.py index 1149a0403b..142694b772 100644 --- a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd10000-2p.py +++ b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd10000-2p.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later # @@ -47,14 +47,12 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "10.0.0.1", "dst_start_ip": "20.0.0.0", "dst_end_ip": "20.0.39.15", - "seed": 1 }, # Direction E --> W: { "src_start_ip": "20.0.0.1", "dst_start_ip": "10.0.0.0", "dst_end_ip": "10.0.39.15", - "seed": 2 } ] self.pkt_base = [] @@ -85,7 +83,7 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=self.pkt_data[i]["dst_start_ip"], max_value=self.pkt_data[i]["dst_end_ip"], size=4, - seed=self.pkt_data[i]["seed"], + seed=i + 1, limit=(2**24 - 1) ), STLVmWrFlowVar( diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd10000-6p.py b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd10000-6p.py index 34ca59fe84..0254644743 100644 --- a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd10000-6p.py +++ b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd10000-6p.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later # @@ -47,42 +47,36 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "10.0.0.1", "dst_start_ip": "20.0.0.0", "dst_end_ip": "20.0.39.15", - "seed": 1 }, # Direction W --> E: { "src_start_ip": "30.0.0.1", "dst_start_ip": "40.0.0.0", "dst_end_ip": "40.0.39.15", - "seed": 2 }, # Direction W --> E: { "src_start_ip": "50.0.0.1", "dst_start_ip": "60.0.0.0", "dst_end_ip": "60.0.39.15", - "seed": 1 }, # Direction E --> W: { "src_start_ip": "20.0.0.1", "dst_start_ip": "10.0.0.0", "dst_end_ip": "10.0.39.15", - "seed": 2 }, # Direction E --> W: { "src_start_ip": "40.0.0.1", "dst_start_ip": "30.0.0.0", "dst_end_ip": "30.0.39.15", - "seed": 1 }, # Direction E --> W: { "src_start_ip": "60.0.0.1", "dst_start_ip": "50.0.0.0", "dst_end_ip": "50.0.39.15", - "seed": 2 } ] self.pkt_base = [] @@ -113,7 +107,7 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=self.pkt_data[i]["dst_start_ip"], max_value=self.pkt_data[i]["dst_end_ip"], size=4, - seed=self.pkt_data[i]["seed"], + seed=i + 1, limit=(2**24 - 1) ), STLVmWrFlowVar( diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd100000-2p.py b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd100000-2p.py index 955e394c56..8f66f13680 100644 --- a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd100000-2p.py +++ b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd100000-2p.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later # @@ -47,14 +47,12 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "10.0.0.1", "dst_start_ip": "20.0.0.0", "dst_end_ip": "20.1.134.159", - "seed": 1 }, # Direction E --> W: { "src_start_ip": "20.0.0.1", "dst_start_ip": "10.0.0.0", "dst_end_ip": "10.1.134.159", - "seed": 2 } ] self.pkt_base = [] @@ -85,7 +83,7 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=self.pkt_data[i]["dst_start_ip"], max_value=self.pkt_data[i]["dst_end_ip"], size=4, - seed=self.pkt_data[i]["seed"], + seed=i + 1, limit=(2**24 - 1) ), STLVmWrFlowVar( diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd100000-6p.py b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd100000-6p.py index 23de4e48a3..b158a1fadd 100644 --- a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd100000-6p.py +++ b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd100000-6p.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later # @@ -47,42 +47,36 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "10.0.0.1", "dst_start_ip": "20.0.0.0", "dst_end_ip": "20.1.134.159", - "seed": 1 }, # Direction W --> E: { "src_start_ip": "30.0.0.1", "dst_start_ip": "40.0.0.0", "dst_end_ip": "40.1.134.159", - "seed": 2 }, # Direction W --> E: { "src_start_ip": "50.0.0.1", "dst_start_ip": "60.0.0.0", "dst_end_ip": "60.1.134.159", - "seed": 1 }, # Direction E --> W: { "src_start_ip": "20.0.0.1", "dst_start_ip": "10.0.0.0", "dst_end_ip": "10.1.134.159", - "seed": 2 }, # Direction E --> W: { "src_start_ip": "40.0.0.1", "dst_start_ip": "30.0.0.0", "dst_end_ip": "30.1.134.159", - "seed": 1 }, # Direction E --> W: { "src_start_ip": "60.0.0.1", "dst_start_ip": "50.0.0.0", "dst_end_ip": "50.1.134.159", - "seed": 2 } ] self.pkt_base = [] @@ -113,7 +107,7 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=self.pkt_data[i]["dst_start_ip"], max_value=self.pkt_data[i]["dst_end_ip"], size=4, - seed=self.pkt_data[i]["seed"], + seed=i + 1, limit=(2**24 - 1) ), STLVmWrFlowVar( diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd1000000-2p.py b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd1000000-2p.py index 3a03303e60..f132e2e02f 100644 --- a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd1000000-2p.py +++ b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd1000000-2p.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later # @@ -47,14 +47,12 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "10.0.0.1", "dst_start_ip": "20.0.0.0", "dst_end_ip": "20.15.66.63", - "seed": 1 }, # Direction E --> W: { "src_start_ip": "20.0.0.1", "dst_start_ip": "10.0.0.0", "dst_end_ip": "10.15.66.63", - "seed": 2 } ] self.pkt_base = [] @@ -85,7 +83,7 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=self.pkt_data[i]["dst_start_ip"], max_value=self.pkt_data[i]["dst_end_ip"], size=4, - seed=self.pkt_data[i]["seed"], + seed=i + 1, limit=(2**24 - 1) ), STLVmWrFlowVar( diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd1000000-6p.py b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd1000000-6p.py index 141a5f2123..639bf52723 100644 --- a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd1000000-6p.py +++ b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd1000000-6p.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later # @@ -47,42 +47,36 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "10.0.0.1", "dst_start_ip": "20.0.0.0", "dst_end_ip": "20.15.66.63", - "seed": 1 }, # Direction W --> E: { "src_start_ip": "30.0.0.1", "dst_start_ip": "40.0.0.0", "dst_end_ip": "40.15.66.63", - "seed": 2 }, # Direction W --> E: { "src_start_ip": "50.0.0.1", "dst_start_ip": "60.0.0.0", "dst_end_ip": "60.15.66.63", - "seed": 1 }, # Direction E --> W: { "src_start_ip": "20.0.0.1", "dst_start_ip": "10.0.0.0", "dst_end_ip": "10.15.66.63", - "seed": 2 }, # Direction E --> W: { "src_start_ip": "40.0.0.1", "dst_start_ip": "30.0.0.0", "dst_end_ip": "30.15.66.63", - "seed": 1 }, # Direction E --> W: { "src_start_ip": "60.0.0.1", "dst_start_ip": "50.0.0.0", "dst_end_ip": "50.15.66.63", - "seed": 2 } ] self.pkt_base = [] @@ -113,7 +107,7 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=self.pkt_data[i]["dst_start_ip"], max_value=self.pkt_data[i]["dst_end_ip"], size=4, - seed=self.pkt_data[i]["seed"], + seed=i + 1, limit=(2**24 - 1) ), STLVmWrFlowVar( diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd10000-2p.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd10000-2p.py index e3d39cc31e..eba560ae6d 100644 --- a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd10000-2p.py +++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd10000-2p.py @@ -47,14 +47,12 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "2100::1", "dst_start_ip": "2200::0", "dst_end_ip": "2200::270F", - "seed": 1 }, # Direction E --> W: { "src_start_ip": "2200::1", "dst_start_ip": "2100::0", "dst_end_ip": "2100::270F", - "seed": 2 } ] self.pkt_base = [] @@ -89,7 +87,7 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=base, max_value=base + count, size=8, - seed=self.pkt_data[i]["seed"], + seed=i + 1, limit=(2**24 - 1) ), STLVmWrFlowVar( diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd10000-6p.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd10000-6p.py index 564ffbb83d..2d20231177 100644 --- a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd10000-6p.py +++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd10000-6p.py @@ -47,42 +47,36 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "2100::1", "dst_start_ip": "2200::0", "dst_end_ip": "2200::270F", - "seed": 1 }, # Direction W --> E: { "src_start_ip": "2300::1", "dst_start_ip": "2400::0", "dst_end_ip": "2400::270F", - "seed": 2 }, # Direction W --> E: { "src_start_ip": "2500::1", "dst_start_ip": "2600::0", "dst_end_ip": "2600::270F", - "seed": 1 }, # Direction E --> W: { "src_start_ip": "2200::1", "dst_start_ip": "2100::0", "dst_end_ip": "2100::270F", - "seed": 2 }, # Direction E --> W: { "src_start_ip": "2400::1", "dst_start_ip": "2300::0", "dst_end_ip": "2300::270F", - "seed": 1 }, # Direction E --> W: { "src_start_ip": "2600::1", "dst_start_ip": "2500::0", "dst_end_ip": "2500::270F", - "seed": 2 } ] self.pkt_base = [] @@ -117,7 +111,7 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=base, max_value=base + count, size=8, - seed=self.pkt_data[i]["seed"], + seed=i + 1, limit=(2**24 - 1) ), STLVmWrFlowVar( diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd100000-2p.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd100000-2p.py index 8948e785a4..1aa01fa281 100644 --- a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd100000-2p.py +++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd100000-2p.py @@ -47,14 +47,12 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "2100::1", "dst_start_ip": "2200::0", "dst_end_ip": "2200::1:869F", - "seed": 1 }, # Direction E --> W: { "src_start_ip": "2200::1", "dst_start_ip": "2100::0", "dst_end_ip": "2100::1:869F", - "seed": 2 } ] self.pkt_base = [] @@ -89,7 +87,7 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=base, max_value=base + count, size=8, - seed=self.pkt_data[i]["seed"], + seed=i + 1, limit=(2**24 - 1) ), STLVmWrFlowVar( diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd100000-6p.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd100000-6p.py index 374be384ef..854da9bf0b 100644 --- a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd100000-6p.py +++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd100000-6p.py @@ -47,42 +47,36 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "2100::1", "dst_start_ip": "2200::0", "dst_end_ip": "2200::1:869F", - "seed": 1 }, # Direction W --> E: { "src_start_ip": "2300::1", "dst_start_ip": "2400::0", "dst_end_ip": "2400::1:869F", - "seed": 2 }, # Direction W --> E: { "src_start_ip": "2500::1", "dst_start_ip": "2600::0", "dst_end_ip": "2600::1:869F", - "seed": 1 }, # Direction E --> W: { "src_start_ip": "2200::1", "dst_start_ip": "2100::0", "dst_end_ip": "2100::1:869F", - "seed": 2 }, # Direction E --> W: { "src_start_ip": "2400::1", "dst_start_ip": "2300::0", "dst_end_ip": "2300::1:869F", - "seed": 1 }, # Direction E --> W: { "src_start_ip": "2600::1", "dst_start_ip": "2500::0", "dst_end_ip": "2500::1:869F", - "seed": 2 } ] self.pkt_base = [] @@ -117,7 +111,7 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=base, max_value=base + count, size=8, - seed=self.pkt_data[i]["seed"], + seed=i + 1, limit=(2**24 - 1) ), STLVmWrFlowVar( diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd1000000-2p.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd1000000-2p.py index 735888d265..d35d283e4f 100644 --- a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd1000000-2p.py +++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd1000000-2p.py @@ -47,14 +47,12 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "2100::1", "dst_start_ip": "2200::0", "dst_end_ip": "2200::F:423F", - "seed": 1 }, # Direction E --> W: { "src_start_ip": "2200::1", "dst_start_ip": "2100::0", "dst_end_ip": "2100::F:423F", - "seed": 2 } ] self.pkt_base = [] @@ -89,7 +87,7 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=base, max_value=base + count, size=8, - seed=self.pkt_data[i]["seed"], + seed=i + 1, limit=(2**24 - 1) ), STLVmWrFlowVar( diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd1000000-6p.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd1000000-6p.py index c0e3ee4ab5..71bd9b675e 100644 --- a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd1000000-6p.py +++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd1000000-6p.py @@ -47,42 +47,36 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "2100::1", "dst_start_ip": "2200::0", "dst_end_ip": "2200::F:423F", - "seed": 1 }, # Direction W --> E: { "src_start_ip": "2300::1", "dst_start_ip": "2400::0", "dst_end_ip": "2400::F:423F", - "seed": 2 }, # Direction W --> E: { "src_start_ip": "2500::1", "dst_start_ip": "2600::0", "dst_end_ip": "2600::F:423F", - "seed": 1 }, # Direction E --> W: { "src_start_ip": "2200::1", "dst_start_ip": "2100::0", "dst_end_ip": "2100::F:423F", - "seed": 2 }, # Direction E --> W: { "src_start_ip": "2400::1", "dst_start_ip": "2300::0", "dst_end_ip": "2300::F:423F", - "seed": 1 }, # Direction E --> W: { "src_start_ip": "2600::1", "dst_start_ip": "2500::0", "dst_end_ip": "2500::F:423F", - "seed": 2 } ] self.pkt_base = [] @@ -117,7 +111,7 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=base, max_value=base + count, size=8, - seed=self.pkt_data[i]["seed"], + seed=i + 1, limit=(2**24 - 1) ), STLVmWrFlowVar( |