Revert "feat(profiles): Do not repeat seeds in 6p profiles"

This reverts commit b8f31fc3da4b0a6ab5805eea61af0fe7e869a453.

Change-Id: I65f79bb323f48d9e7b3ed7a1990db1b1486da26e
Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch>

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 142694b..1149a04 100644 (file)
--- 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 0254644..34ca59f 100644 (file)
--- 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 8f66f13..955e394 100644 (file)
--- 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 b158a1f..23de4e4 100644 (file)
--- 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 f132e2e..3a03303 100644 (file)
--- 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 639bf52..141a5f2 100644 (file)
--- 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 eba560a..e3d39cc 100644 (file)
--- 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 2d20231..564ffbb 100644 (file)
--- 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 1aa01fa..8948e78 100644 (file)
--- 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 854da9b..374be38 100644 (file)
--- 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 d35d283..735888d 100644 (file)
--- 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 71bd9b6..c0e3ee4 100644 (file)
--- 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(