From ad9b1d6c106b25cbd7bef4bd38faa626e9714c76 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Wed, 1 May 2024 04:55:46 +0000 Subject: [PATCH] Revert "feat(profiles): Do not repeat seeds in 6p profiles" This reverts commit b8f31fc3da4b0a6ab5805eea61af0fe7e869a453. Change-Id: I65f79bb323f48d9e7b3ed7a1990db1b1486da26e Signed-off-by: Peter Mikus --- .../trex/trex-stl-ethip4-ip4dst-rnd10000-2p.py | 6 ++++-- .../trex/trex-stl-ethip4-ip4dst-rnd10000-6p.py | 10 ++++++++-- .../trex/trex-stl-ethip4-ip4dst-rnd100000-2p.py | 6 ++++-- .../trex/trex-stl-ethip4-ip4dst-rnd100000-6p.py | 10 ++++++++-- .../trex/trex-stl-ethip4-ip4dst-rnd1000000-2p.py | 6 ++++-- .../trex/trex-stl-ethip4-ip4dst-rnd1000000-6p.py | 10 ++++++++-- .../trex/trex-stl-ethip6-ip6dst-rnd10000-2p.py | 4 +++- .../trex/trex-stl-ethip6-ip6dst-rnd10000-6p.py | 8 +++++++- .../trex/trex-stl-ethip6-ip6dst-rnd100000-2p.py | 4 +++- .../trex/trex-stl-ethip6-ip6dst-rnd100000-6p.py | 8 +++++++- .../trex/trex-stl-ethip6-ip6dst-rnd1000000-2p.py | 4 +++- .../trex/trex-stl-ethip6-ip6dst-rnd1000000-6p.py | 8 +++++++- 12 files changed, 66 insertions(+), 18 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 142694b772..1149a0403b 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) 2024 Cisco and/or its affiliates. +# Copyright (c) 2023 Cisco and/or its affiliates. # # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later # @@ -47,12 +47,14 @@ 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 = [] @@ -83,7 +85,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=i + 1, + seed=self.pkt_data[i]["seed"], 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 0254644743..34ca59fe84 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) 2024 Cisco and/or its affiliates. +# Copyright (c) 2023 Cisco and/or its affiliates. # # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later # @@ -47,36 +47,42 @@ 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 = [] @@ -107,7 +113,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=i + 1, + seed=self.pkt_data[i]["seed"], 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 8f66f13680..955e394c56 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) 2024 Cisco and/or its affiliates. +# Copyright (c) 2023 Cisco and/or its affiliates. # # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later # @@ -47,12 +47,14 @@ 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 = [] @@ -83,7 +85,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=i + 1, + seed=self.pkt_data[i]["seed"], 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 b158a1fadd..23de4e48a3 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) 2024 Cisco and/or its affiliates. +# Copyright (c) 2023 Cisco and/or its affiliates. # # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later # @@ -47,36 +47,42 @@ 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 = [] @@ -107,7 +113,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=i + 1, + seed=self.pkt_data[i]["seed"], 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 f132e2e02f..3a03303e60 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) 2024 Cisco and/or its affiliates. +# Copyright (c) 2023 Cisco and/or its affiliates. # # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later # @@ -47,12 +47,14 @@ 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 = [] @@ -83,7 +85,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=i + 1, + seed=self.pkt_data[i]["seed"], 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 639bf52723..141a5f2123 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) 2024 Cisco and/or its affiliates. +# Copyright (c) 2023 Cisco and/or its affiliates. # # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later # @@ -47,36 +47,42 @@ 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 = [] @@ -107,7 +113,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=i + 1, + seed=self.pkt_data[i]["seed"], 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 eba560ae6d..e3d39cc31e 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,12 +47,14 @@ 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 = [] @@ -87,7 +89,7 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=base, max_value=base + count, size=8, - seed=i + 1, + seed=self.pkt_data[i]["seed"], 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 2d20231177..564ffbb83d 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,36 +47,42 @@ 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 = [] @@ -111,7 +117,7 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=base, max_value=base + count, size=8, - seed=i + 1, + seed=self.pkt_data[i]["seed"], 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 1aa01fa281..8948e785a4 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,12 +47,14 @@ 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 = [] @@ -87,7 +89,7 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=base, max_value=base + count, size=8, - seed=i + 1, + seed=self.pkt_data[i]["seed"], 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 854da9bf0b..374be384ef 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,36 +47,42 @@ 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 = [] @@ -111,7 +117,7 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=base, max_value=base + count, size=8, - seed=i + 1, + seed=self.pkt_data[i]["seed"], 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 d35d283e4f..735888d265 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,12 +47,14 @@ 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 = [] @@ -87,7 +89,7 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=base, max_value=base + count, size=8, - seed=i + 1, + seed=self.pkt_data[i]["seed"], 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 71bd9b675e..c0e3ee4ab5 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,36 +47,42 @@ 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 = [] @@ -111,7 +117,7 @@ class TrafficStreams(TrafficStreamsScaleClass): min_value=base, max_value=base + count, size=8, - seed=i + 1, + seed=self.pkt_data[i]["seed"], limit=(2**24 - 1) ), STLVmWrFlowVar( -- 2.16.6