From b7a4227668f850b50c05a51444f4d26333c62611 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Thu, 25 Apr 2024 05:00:10 +0000 Subject: Revert "fix(ip6scale): Unify rnd profiles" This reverts commit b06f091ae65a7323231d84d188b863698169508b. Reason for revert: . Change-Id: I99b7c3365e7e74aadcf366c8ca284ad458dcc8e6 Signed-off-by: Peter Mikus --- .../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 | 6 ++++-- .../trex/trex-stl-ethip6-ip6dst-rnd100000-6p.py | 10 ++++++++-- .../trex/trex-stl-ethip6-ip6dst-rnd1000000-2p.py | 6 ++++-- .../trex/trex-stl-ethip6-ip6dst-rnd1000000-6p.py | 17 ++++++++--------- 6 files changed, 34 insertions(+), 17 deletions(-) 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..4658e764c2 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 = [] @@ -82,12 +84,12 @@ class TrafficStreams(TrafficStreamsScaleClass): self.pkt_vm.append( STLScVmRaw( [ - STLVmFlowVarRepeatableRandom( + STLVmFlowVar( name="ipv6_dst", 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..5d1b265a77 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 = [] @@ -106,12 +112,12 @@ class TrafficStreams(TrafficStreamsScaleClass): self.pkt_vm.append( STLScVmRaw( [ - STLVmFlowVarRepeatableRandom( + STLVmFlowVar( name="ipv6_dst", 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..8db6a6447b 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 = [] @@ -82,12 +84,12 @@ class TrafficStreams(TrafficStreamsScaleClass): self.pkt_vm.append( STLScVmRaw( [ - STLVmFlowVarRepeatableRandom( + STLVmFlowVar( name="ipv6_dst", 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..4a1307c510 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 @@ -46,37 +46,37 @@ class TrafficStreams(TrafficStreamsScaleClass): { "src_start_ip": "2100::1", "dst_start_ip": "2200::0", - "dst_end_ip": "2200::F:423F", + "dst_end_ip": "2200::F:423F" }, # Direction W --> E: { "src_start_ip": "2300::1", "dst_start_ip": "2400::0", - "dst_end_ip": "2400::F:423F", + "dst_end_ip": "2400::F:423F" }, # Direction W --> E: { "src_start_ip": "2500::1", "dst_start_ip": "2600::0", - "dst_end_ip": "2600::F:423F", + "dst_end_ip": "2600::F:423F" }, # Direction E --> W: { "src_start_ip": "2200::1", "dst_start_ip": "2100::0", - "dst_end_ip": "2100::F:423F", + "dst_end_ip": "2100::F:423F" }, # Direction E --> W: { "src_start_ip": "2400::1", "dst_start_ip": "2300::0", - "dst_end_ip": "2300::F:423F", + "dst_end_ip": "2300::F:423F" }, # Direction E --> W: { "src_start_ip": "2600::1", "dst_start_ip": "2500::0", - "dst_end_ip": "2500::F:423F", + "dst_end_ip": "2500::F:423F" } ] self.pkt_base = [] @@ -106,13 +106,12 @@ class TrafficStreams(TrafficStreamsScaleClass): self.pkt_vm.append( STLScVmRaw( [ - STLVmFlowVarRepeatableRandom( + STLVmFlowVar( name="ipv6_dst", min_value=base, max_value=base + count, size=8, - seed=i + 1, - limit=(2**24 - 1) + op="inc" ), STLVmWrFlowVar( fv_name="ipv6_dst", -- cgit 1.2.3-korg