From 969b1e55783dd65b837e61656818b7b470667d0e Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Fri, 31 May 2024 14:23:38 +0200 Subject: feat(profiles): Do not share seeds between streams Avoiding any predictable memory access patterns is more important than similarity between 2p and 6p profiles. + Seed values now match parts of IP source address. Change-Id: Ib1830cf9d3e7b329e54de19a92ecea77c8baeeb5 Signed-off-by: Vratko Polak (cherry picked from commit 3151535b07b7602e73925224250670af9449db68) --- .../trex/trex-stl-ethip4-ip4dst-rnd10000-6p.py | 10 +++++----- .../trex/trex-stl-ethip4-ip4dst-rnd100000-6p.py | 10 +++++----- .../trex/trex-stl-ethip4-ip4dst-rnd1000000-6p.py | 10 +++++----- .../trex/trex-stl-ethip6-ip6dst-rnd10000-6p.py | 8 ++++---- .../trex/trex-stl-ethip6-ip6dst-rnd100000-6p.py | 8 ++++---- .../trex/trex-stl-ethip6-ip6dst-rnd1000000-6p.py | 8 ++++---- 6 files changed, 27 insertions(+), 27 deletions(-) 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..58363b9811 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 # @@ -54,14 +54,14 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "30.0.0.1", "dst_start_ip": "40.0.0.0", "dst_end_ip": "40.0.39.15", - "seed": 2 + "seed": 3 }, # 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 + "seed": 5 }, # Direction E --> W: { @@ -75,14 +75,14 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "40.0.0.1", "dst_start_ip": "30.0.0.0", "dst_end_ip": "30.0.39.15", - "seed": 1 + "seed": 4 }, # 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 + "seed": 6 } ] self.pkt_base = [] 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..d3bc3ce60f 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 # @@ -54,14 +54,14 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "30.0.0.1", "dst_start_ip": "40.0.0.0", "dst_end_ip": "40.1.134.159", - "seed": 2 + "seed": 3 }, # 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 + "seed": 5 }, # Direction E --> W: { @@ -75,14 +75,14 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "40.0.0.1", "dst_start_ip": "30.0.0.0", "dst_end_ip": "30.1.134.159", - "seed": 1 + "seed": 4 }, # 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 + "seed": 6 } ] self.pkt_base = [] 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..c0e6b66101 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 # @@ -54,14 +54,14 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "30.0.0.1", "dst_start_ip": "40.0.0.0", "dst_end_ip": "40.15.66.63", - "seed": 2 + "seed": 3 }, # 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 + "seed": 5 }, # Direction E --> W: { @@ -75,14 +75,14 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "40.0.0.1", "dst_start_ip": "30.0.0.0", "dst_end_ip": "30.15.66.63", - "seed": 1 + "seed": 4 }, # 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 + "seed": 6 } ] self.pkt_base = [] 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..b5714782e1 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 @@ -54,14 +54,14 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "2300::1", "dst_start_ip": "2400::0", "dst_end_ip": "2400::270F", - "seed": 2 + "seed": 3 }, # Direction W --> E: { "src_start_ip": "2500::1", "dst_start_ip": "2600::0", "dst_end_ip": "2600::270F", - "seed": 1 + "seed": 5 }, # Direction E --> W: { @@ -75,14 +75,14 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "2400::1", "dst_start_ip": "2300::0", "dst_end_ip": "2300::270F", - "seed": 1 + "seed": 4 }, # Direction E --> W: { "src_start_ip": "2600::1", "dst_start_ip": "2500::0", "dst_end_ip": "2500::270F", - "seed": 2 + "seed": 6 } ] self.pkt_base = [] 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..46e857b788 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 @@ -54,14 +54,14 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "2300::1", "dst_start_ip": "2400::0", "dst_end_ip": "2400::1:869F", - "seed": 2 + "seed": 3 }, # Direction W --> E: { "src_start_ip": "2500::1", "dst_start_ip": "2600::0", "dst_end_ip": "2600::1:869F", - "seed": 1 + "seed": 5 }, # Direction E --> W: { @@ -75,14 +75,14 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "2400::1", "dst_start_ip": "2300::0", "dst_end_ip": "2300::1:869F", - "seed": 1 + "seed": 4 }, # Direction E --> W: { "src_start_ip": "2600::1", "dst_start_ip": "2500::0", "dst_end_ip": "2500::1:869F", - "seed": 2 + "seed": 6 } ] self.pkt_base = [] 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..b090e48068 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 @@ -54,14 +54,14 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "2300::1", "dst_start_ip": "2400::0", "dst_end_ip": "2400::F:423F", - "seed": 2 + "seed": 3 }, # Direction W --> E: { "src_start_ip": "2500::1", "dst_start_ip": "2600::0", "dst_end_ip": "2600::F:423F", - "seed": 1 + "seed": 5 }, # Direction E --> W: { @@ -75,14 +75,14 @@ class TrafficStreams(TrafficStreamsScaleClass): "src_start_ip": "2400::1", "dst_start_ip": "2300::0", "dst_end_ip": "2300::F:423F", - "seed": 1 + "seed": 4 }, # Direction E --> W: { "src_start_ip": "2600::1", "dst_start_ip": "2500::0", "dst_end_ip": "2500::F:423F", - "seed": 2 + "seed": 6 } ] self.pkt_base = [] -- cgit 1.2.3-korg