aboutsummaryrefslogtreecommitdiffstats
path: root/GPL
diff options
context:
space:
mode:
authorPeter Mikus <peter.mikus@protonmail.ch>2024-05-01 04:54:27 +0000
committerPeter Mikus <peter.mikus@protonmail.ch>2024-05-01 04:55:07 +0000
commit2a23f2c162050e53d2fd9a53a12de295c8e1f3e3 (patch)
tree90a3362a15c889a7dc58b4d5024f1147c6bc95ae /GPL
parente3d82022e7230656a29af6b5273664f7dbacf5b8 (diff)
Revert "style(scale): Apply black to new traffic profiles"
This reverts commit 4e2635deff33db4bea476003ac222ffd9ab504b1. Change-Id: Idb9145fbf13e7943392a72f77ef9a1b479187732 Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch>
Diffstat (limited to 'GPL')
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd10000-2p.py16
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd10000-6p.py16
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd100000-2p.py16
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd100000-6p.py16
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd1000000-2p.py16
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd1000000-6p.py16
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst10000-2p.py22
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst10000-6p.py30
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst100000-2p.py22
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst100000-6p.py30
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst1000000-2p.py22
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst1000000-6p.py30
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd10000-2p.py16
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd10000-6p.py16
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd100000-2p.py16
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd100000-6p.py16
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd1000000-2p.py16
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd1000000-6p.py16
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst10000-2p.py20
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst10000-6p.py28
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst100000-2p.py20
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst100000-6p.py28
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst1000000-2p.py20
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst1000000-6p.py28
24 files changed, 246 insertions, 246 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 2ae8580bab..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
@@ -53,7 +53,7 @@ class TrafficStreams(TrafficStreamsScaleClass):
"src_start_ip": "20.0.0.1",
"dst_start_ip": "10.0.0.0",
"dst_end_ip": "10.0.39.15",
- },
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -68,11 +68,11 @@ class TrafficStreams(TrafficStreamsScaleClass):
"""
for i in range(len(self.pkt_data)):
self.pkt_base.append(
- Ether()
- / IP(
+ Ether() /
+ IP(
src=self.pkt_data[i]["src_start_ip"],
dst=self.pkt_data[i]["dst_start_ip"],
- proto=61,
+ proto=61
)
)
self.pkt_vm.append(
@@ -84,15 +84,15 @@ class TrafficStreams(TrafficStreamsScaleClass):
max_value=self.pkt_data[i]["dst_end_ip"],
size=4,
seed=i + 1,
- limit=(2**24 - 1),
+ limit=(2**24 - 1)
),
STLVmWrFlowVar(
fv_name="dst",
- pkt_offset="IP.dst",
+ pkt_offset="IP.dst"
),
STLVmFixIpv4(
- offset="IP",
- ),
+ offset="IP"
+ )
]
)
)
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 9a20db30fe..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
@@ -77,7 +77,7 @@ class TrafficStreams(TrafficStreamsScaleClass):
"src_start_ip": "60.0.0.1",
"dst_start_ip": "50.0.0.0",
"dst_end_ip": "50.0.39.15",
- },
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -92,11 +92,11 @@ class TrafficStreams(TrafficStreamsScaleClass):
"""
for i in range(len(self.pkt_data)):
self.pkt_base.append(
- Ether()
- / IP(
+ Ether() /
+ IP(
src=self.pkt_data[i]["src_start_ip"],
dst=self.pkt_data[i]["dst_start_ip"],
- proto=61,
+ proto=61
)
)
self.pkt_vm.append(
@@ -108,15 +108,15 @@ class TrafficStreams(TrafficStreamsScaleClass):
max_value=self.pkt_data[i]["dst_end_ip"],
size=4,
seed=i + 1,
- limit=(2**24 - 1),
+ limit=(2**24 - 1)
),
STLVmWrFlowVar(
fv_name="dst",
- pkt_offset="IP.dst",
+ pkt_offset="IP.dst"
),
STLVmFixIpv4(
- offset="IP",
- ),
+ offset="IP"
+ )
]
)
)
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 29a3731a1c..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
@@ -53,7 +53,7 @@ class TrafficStreams(TrafficStreamsScaleClass):
"src_start_ip": "20.0.0.1",
"dst_start_ip": "10.0.0.0",
"dst_end_ip": "10.1.134.159",
- },
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -68,11 +68,11 @@ class TrafficStreams(TrafficStreamsScaleClass):
"""
for i in range(len(self.pkt_data)):
self.pkt_base.append(
- Ether()
- / IP(
+ Ether() /
+ IP(
src=self.pkt_data[i]["src_start_ip"],
dst=self.pkt_data[i]["dst_start_ip"],
- proto=61,
+ proto=61
)
)
self.pkt_vm.append(
@@ -84,15 +84,15 @@ class TrafficStreams(TrafficStreamsScaleClass):
max_value=self.pkt_data[i]["dst_end_ip"],
size=4,
seed=i + 1,
- limit=(2**24 - 1),
+ limit=(2**24 - 1)
),
STLVmWrFlowVar(
fv_name="dst",
- pkt_offset="IP.dst",
+ pkt_offset="IP.dst"
),
STLVmFixIpv4(
- offset="IP",
- ),
+ offset="IP"
+ )
]
)
)
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 6bb304931e..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
@@ -77,7 +77,7 @@ class TrafficStreams(TrafficStreamsScaleClass):
"src_start_ip": "60.0.0.1",
"dst_start_ip": "50.0.0.0",
"dst_end_ip": "50.1.134.159",
- },
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -92,11 +92,11 @@ class TrafficStreams(TrafficStreamsScaleClass):
"""
for i in range(len(self.pkt_data)):
self.pkt_base.append(
- Ether()
- / IP(
+ Ether() /
+ IP(
src=self.pkt_data[i]["src_start_ip"],
dst=self.pkt_data[i]["dst_start_ip"],
- proto=61,
+ proto=61
)
)
self.pkt_vm.append(
@@ -108,15 +108,15 @@ class TrafficStreams(TrafficStreamsScaleClass):
max_value=self.pkt_data[i]["dst_end_ip"],
size=4,
seed=i + 1,
- limit=(2**24 - 1),
+ limit=(2**24 - 1)
),
STLVmWrFlowVar(
fv_name="dst",
- pkt_offset="IP.dst",
+ pkt_offset="IP.dst"
),
STLVmFixIpv4(
- offset="IP",
- ),
+ offset="IP"
+ )
]
)
)
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 028331264e..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
@@ -53,7 +53,7 @@ class TrafficStreams(TrafficStreamsScaleClass):
"src_start_ip": "20.0.0.1",
"dst_start_ip": "10.0.0.0",
"dst_end_ip": "10.15.66.63",
- },
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -68,11 +68,11 @@ class TrafficStreams(TrafficStreamsScaleClass):
"""
for i in range(len(self.pkt_data)):
self.pkt_base.append(
- Ether()
- / IP(
+ Ether() /
+ IP(
src=self.pkt_data[i]["src_start_ip"],
dst=self.pkt_data[i]["dst_start_ip"],
- proto=61,
+ proto=61
)
)
self.pkt_vm.append(
@@ -84,15 +84,15 @@ class TrafficStreams(TrafficStreamsScaleClass):
max_value=self.pkt_data[i]["dst_end_ip"],
size=4,
seed=i + 1,
- limit=(2**24 - 1),
+ limit=(2**24 - 1)
),
STLVmWrFlowVar(
fv_name="dst",
- pkt_offset="IP.dst",
+ pkt_offset="IP.dst"
),
STLVmFixIpv4(
- offset="IP",
- ),
+ offset="IP"
+ )
]
)
)
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 1f6df62ae4..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
@@ -77,7 +77,7 @@ class TrafficStreams(TrafficStreamsScaleClass):
"src_start_ip": "60.0.0.1",
"dst_start_ip": "50.0.0.0",
"dst_end_ip": "50.15.66.63",
- },
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -92,11 +92,11 @@ class TrafficStreams(TrafficStreamsScaleClass):
"""
for i in range(len(self.pkt_data)):
self.pkt_base.append(
- Ether()
- / IP(
+ Ether() /
+ IP(
src=self.pkt_data[i]["src_start_ip"],
dst=self.pkt_data[i]["dst_start_ip"],
- proto=61,
+ proto=61
)
)
self.pkt_vm.append(
@@ -108,15 +108,15 @@ class TrafficStreams(TrafficStreamsScaleClass):
max_value=self.pkt_data[i]["dst_end_ip"],
size=4,
seed=i + 1,
- limit=(2**24 - 1),
+ limit=(2**24 - 1)
),
STLVmWrFlowVar(
fv_name="dst",
- pkt_offset="IP.dst",
+ pkt_offset="IP.dst"
),
STLVmFixIpv4(
- offset="IP",
- ),
+ offset="IP"
+ )
]
)
)
diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst10000-2p.py b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst10000-2p.py
index a5131bf4d3..2dda26ddaf 100644
--- a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst10000-2p.py
+++ b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst10000-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
#
@@ -46,14 +46,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",
+ "dst_end_ip": "20.0.39.15"
},
# Direction E --> W:
{
"src_start_ip": "20.0.0.1",
"dst_start_ip": "10.0.0.0",
- "dst_end_ip": "10.0.39.15",
- },
+ "dst_end_ip": "10.0.39.15"
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -68,11 +68,11 @@ class TrafficStreams(TrafficStreamsScaleClass):
"""
for i in range(len(self.pkt_data)):
self.pkt_base.append(
- Ether()
- / IP(
+ Ether() /
+ IP(
src=self.pkt_data[i]["src_start_ip"],
dst=self.pkt_data[i]["dst_start_ip"],
- proto=61,
+ proto=61
)
)
self.pkt_vm.append(
@@ -83,15 +83,15 @@ class TrafficStreams(TrafficStreamsScaleClass):
min_value=self.pkt_data[i]["dst_start_ip"],
max_value=self.pkt_data[i]["dst_end_ip"],
size=4,
- op="inc",
+ op="inc"
),
STLVmWrFlowVar(
fv_name="dst",
- pkt_offset="IP.dst",
+ pkt_offset="IP.dst"
),
STLVmFixIpv4(
- offset="IP",
- ),
+ offset="IP"
+ )
]
)
)
diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst10000-6p.py b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst10000-6p.py
index 922e345ab8..94a47a8bb6 100644
--- a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst10000-6p.py
+++ b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst10000-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
#
@@ -46,38 +46,38 @@ class TrafficStreams(TrafficStreamsScaleClass):
{
"src_start_ip": "10.0.0.1",
"dst_start_ip": "20.0.0.0",
- "dst_end_ip": "20.0.39.15",
+ "dst_end_ip": "20.0.39.15"
},
# Direction W --> E:
{
"src_start_ip": "30.0.0.1",
"dst_start_ip": "40.0.0.0",
- "dst_end_ip": "40.0.39.15",
+ "dst_end_ip": "40.0.39.15"
},
# Direction W --> E:
{
"src_start_ip": "50.0.0.1",
"dst_start_ip": "60.0.0.0",
- "dst_end_ip": "60.0.39.15",
+ "dst_end_ip": "60.0.39.15"
},
# Direction E --> W:
{
"src_start_ip": "20.0.0.1",
"dst_start_ip": "10.0.0.0",
- "dst_end_ip": "10.0.39.15",
+ "dst_end_ip": "10.0.39.15"
},
# Direction E --> W:
{
"src_start_ip": "40.0.0.1",
"dst_start_ip": "30.0.0.0",
- "dst_end_ip": "30.0.39.15",
+ "dst_end_ip": "30.0.39.15"
},
# Direction E --> W:
{
"src_start_ip": "60.0.0.1",
"dst_start_ip": "50.0.0.0",
- "dst_end_ip": "50.0.39.15",
- },
+ "dst_end_ip": "50.0.39.15"
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -92,11 +92,11 @@ class TrafficStreams(TrafficStreamsScaleClass):
"""
for i in range(len(self.pkt_data)):
self.pkt_base.append(
- Ether()
- / IP(
+ Ether() /
+ IP(
src=self.pkt_data[i]["src_start_ip"],
dst=self.pkt_data[i]["dst_start_ip"],
- proto=61,
+ proto=61
)
)
self.pkt_vm.append(
@@ -107,15 +107,15 @@ class TrafficStreams(TrafficStreamsScaleClass):
min_value=self.pkt_data[i]["dst_start_ip"],
max_value=self.pkt_data[i]["dst_end_ip"],
size=4,
- op="inc",
+ op="inc"
),
STLVmWrFlowVar(
fv_name="dst",
- pkt_offset="IP.dst",
+ pkt_offset="IP.dst"
),
STLVmFixIpv4(
- offset="IP",
- ),
+ offset="IP"
+ )
]
)
)
diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst100000-2p.py b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst100000-2p.py
index 045a127dde..a8d223b854 100644
--- a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst100000-2p.py
+++ b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst100000-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
#
@@ -46,14 +46,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",
+ "dst_end_ip": "20.1.134.159"
},
# Direction E --> W:
{
"src_start_ip": "20.0.0.1",
"dst_start_ip": "10.0.0.0",
- "dst_end_ip": "10.1.134.159",
- },
+ "dst_end_ip": "10.1.134.159"
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -68,11 +68,11 @@ class TrafficStreams(TrafficStreamsScaleClass):
"""
for i in range(len(self.pkt_data)):
self.pkt_base.append(
- Ether()
- / IP(
+ Ether() /
+ IP(
src=self.pkt_data[i]["src_start_ip"],
dst=self.pkt_data[i]["dst_start_ip"],
- proto=61,
+ proto=61
)
)
self.pkt_vm.append(
@@ -83,15 +83,15 @@ class TrafficStreams(TrafficStreamsScaleClass):
min_value=self.pkt_data[i]["dst_start_ip"],
max_value=self.pkt_data[i]["dst_end_ip"],
size=4,
- op="inc",
+ op="inc"
),
STLVmWrFlowVar(
fv_name="dst",
- pkt_offset="IP.dst",
+ pkt_offset="IP.dst"
),
STLVmFixIpv4(
- offset="IP",
- ),
+ offset="IP"
+ )
]
)
)
diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst100000-6p.py b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst100000-6p.py
index 1bce4934e3..76042447ca 100644
--- a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst100000-6p.py
+++ b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst100000-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
#
@@ -46,38 +46,38 @@ class TrafficStreams(TrafficStreamsScaleClass):
{
"src_start_ip": "10.0.0.1",
"dst_start_ip": "20.0.0.0",
- "dst_end_ip": "20.1.134.159",
+ "dst_end_ip": "20.1.134.159"
},
# Direction W --> E:
{
"src_start_ip": "30.0.0.1",
"dst_start_ip": "40.0.0.0",
- "dst_end_ip": "40.1.134.159",
+ "dst_end_ip": "40.1.134.159"
},
# Direction W --> E:
{
"src_start_ip": "50.0.0.1",
"dst_start_ip": "60.0.0.0",
- "dst_end_ip": "60.1.134.159",
+ "dst_end_ip": "60.1.134.159"
},
# Direction E --> W:
{
"src_start_ip": "20.0.0.1",
"dst_start_ip": "10.0.0.0",
- "dst_end_ip": "10.1.134.159",
+ "dst_end_ip": "10.1.134.159"
},
# Direction E --> W:
{
"src_start_ip": "40.0.0.1",
"dst_start_ip": "30.0.0.0",
- "dst_end_ip": "30.1.134.159",
+ "dst_end_ip": "30.1.134.159"
},
# Direction E --> W:
{
"src_start_ip": "60.0.0.1",
"dst_start_ip": "50.0.0.0",
- "dst_end_ip": "50.1.134.159",
- },
+ "dst_end_ip": "50.1.134.159"
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -92,11 +92,11 @@ class TrafficStreams(TrafficStreamsScaleClass):
"""
for i in range(len(self.pkt_data)):
self.pkt_base.append(
- Ether()
- / IP(
+ Ether() /
+ IP(
src=self.pkt_data[i]["src_start_ip"],
dst=self.pkt_data[i]["dst_start_ip"],
- proto=61,
+ proto=61
)
)
self.pkt_vm.append(
@@ -107,15 +107,15 @@ class TrafficStreams(TrafficStreamsScaleClass):
min_value=self.pkt_data[i]["dst_start_ip"],
max_value=self.pkt_data[i]["dst_end_ip"],
size=4,
- op="inc",
+ op="inc"
),
STLVmWrFlowVar(
fv_name="dst",
- pkt_offset="IP.dst",
+ pkt_offset="IP.dst"
),
STLVmFixIpv4(
- offset="IP",
- ),
+ offset="IP"
+ )
]
)
)
diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst1000000-2p.py b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst1000000-2p.py
index 6fc6b10d9d..f2e7938ff2 100644
--- a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst1000000-2p.py
+++ b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst1000000-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
#
@@ -46,14 +46,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",
+ "dst_end_ip": "20.15.66.63"
},
# Direction E --> W:
{
"src_start_ip": "20.0.0.1",
"dst_start_ip": "10.0.0.0",
- "dst_end_ip": "10.15.66.63",
- },
+ "dst_end_ip": "10.15.66.63"
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -68,11 +68,11 @@ class TrafficStreams(TrafficStreamsScaleClass):
"""
for i in range(len(self.pkt_data)):
self.pkt_base.append(
- Ether()
- / IP(
+ Ether() /
+ IP(
src=self.pkt_data[i]["src_start_ip"],
dst=self.pkt_data[i]["dst_start_ip"],
- proto=61,
+ proto=61
)
)
self.pkt_vm.append(
@@ -83,15 +83,15 @@ class TrafficStreams(TrafficStreamsScaleClass):
min_value=self.pkt_data[i]["dst_start_ip"],
max_value=self.pkt_data[i]["dst_end_ip"],
size=4,
- op="inc",
+ op="inc"
),
STLVmWrFlowVar(
fv_name="dst",
- pkt_offset="IP.dst",
+ pkt_offset="IP.dst"
),
STLVmFixIpv4(
- offset="IP",
- ),
+ offset="IP"
+ )
]
)
)
diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst1000000-6p.py b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst1000000-6p.py
index a08955f5bc..6474b43470 100644
--- a/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst1000000-6p.py
+++ b/GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst1000000-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
#
@@ -46,38 +46,38 @@ class TrafficStreams(TrafficStreamsScaleClass):
{
"src_start_ip": "10.0.0.1",
"dst_start_ip": "20.0.0.0",
- "dst_end_ip": "20.15.66.63",
+ "dst_end_ip": "20.15.66.63"
},
# Direction W --> E:
{
"src_start_ip": "30.0.0.1",
"dst_start_ip": "40.0.0.0",
- "dst_end_ip": "40.15.66.63",
+ "dst_end_ip": "40.15.66.63"
},
# Direction W --> E:
{
"src_start_ip": "50.0.0.1",
"dst_start_ip": "60.0.0.0",
- "dst_end_ip": "60.15.66.63",
+ "dst_end_ip": "60.15.66.63"
},
# Direction E --> W:
{
"src_start_ip": "20.0.0.1",
"dst_start_ip": "10.0.0.0",
- "dst_end_ip": "10.15.66.63",
+ "dst_end_ip": "10.15.66.63"
},
# Direction E --> W:
{
"src_start_ip": "40.0.0.1",
"dst_start_ip": "30.0.0.0",
- "dst_end_ip": "30.15.66.63",
+ "dst_end_ip": "30.15.66.63"
},
# Direction E --> W:
{
"src_start_ip": "60.0.0.1",
"dst_start_ip": "50.0.0.0",
- "dst_end_ip": "50.15.66.63",
- },
+ "dst_end_ip": "50.15.66.63"
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -92,11 +92,11 @@ class TrafficStreams(TrafficStreamsScaleClass):
"""
for i in range(len(self.pkt_data)):
self.pkt_base.append(
- Ether()
- / IP(
+ Ether() /
+ IP(
src=self.pkt_data[i]["src_start_ip"],
dst=self.pkt_data[i]["dst_start_ip"],
- proto=61,
+ proto=61
)
)
self.pkt_vm.append(
@@ -107,15 +107,15 @@ class TrafficStreams(TrafficStreamsScaleClass):
min_value=self.pkt_data[i]["dst_start_ip"],
max_value=self.pkt_data[i]["dst_end_ip"],
size=4,
- op="inc",
+ op="inc"
),
STLVmWrFlowVar(
fv_name="dst",
- pkt_offset="IP.dst",
+ pkt_offset="IP.dst"
),
STLVmFixIpv4(
- offset="IP",
- ),
+ offset="IP"
+ )
]
)
)
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 585629f7b5..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
@@ -53,7 +53,7 @@ class TrafficStreams(TrafficStreamsScaleClass):
"src_start_ip": "2200::1",
"dst_start_ip": "2100::0",
"dst_end_ip": "2100::270F",
- },
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -69,14 +69,14 @@ class TrafficStreams(TrafficStreamsScaleClass):
for i in range(len(self.pkt_data)):
base, count = self._get_start_end_ipv6(
self.pkt_data[i]["dst_start_ip"],
- self.pkt_data[i]["dst_end_ip"],
+ self.pkt_data[i]["dst_end_ip"]
)
self.pkt_base.append(
- Ether()
- / IPv6(
+ Ether() /
+ IPv6(
src=self.pkt_data[i]["src_start_ip"],
- dst=self.pkt_data[i]["dst_start_ip"],
+ dst=self.pkt_data[i]["dst_start_ip"]
)
)
self.pkt_vm.append(
@@ -88,13 +88,13 @@ class TrafficStreams(TrafficStreamsScaleClass):
max_value=base + count,
size=8,
seed=i + 1,
- limit=(2**24 - 1),
+ limit=(2**24 - 1)
),
STLVmWrFlowVar(
fv_name="ipv6_dst",
pkt_offset="IPv6.dst",
- offset_fixup=8,
- ),
+ offset_fixup=8
+ )
]
)
)
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 3227cb348d..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
@@ -77,7 +77,7 @@ class TrafficStreams(TrafficStreamsScaleClass):
"src_start_ip": "2600::1",
"dst_start_ip": "2500::0",
"dst_end_ip": "2500::270F",
- },
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -93,14 +93,14 @@ class TrafficStreams(TrafficStreamsScaleClass):
for i in range(len(self.pkt_data)):
base, count = self._get_start_end_ipv6(
self.pkt_data[i]["dst_start_ip"],
- self.pkt_data[i]["dst_end_ip"],
+ self.pkt_data[i]["dst_end_ip"]
)
self.pkt_base.append(
- Ether()
- / IPv6(
+ Ether() /
+ IPv6(
src=self.pkt_data[i]["src_start_ip"],
- dst=self.pkt_data[i]["dst_start_ip"],
+ dst=self.pkt_data[i]["dst_start_ip"]
)
)
self.pkt_vm.append(
@@ -112,13 +112,13 @@ class TrafficStreams(TrafficStreamsScaleClass):
max_value=base + count,
size=8,
seed=i + 1,
- limit=(2**24 - 1),
+ limit=(2**24 - 1)
),
STLVmWrFlowVar(
fv_name="ipv6_dst",
pkt_offset="IPv6.dst",
- offset_fixup=8,
- ),
+ offset_fixup=8
+ )
]
)
)
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 a46d7f9644..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
@@ -53,7 +53,7 @@ class TrafficStreams(TrafficStreamsScaleClass):
"src_start_ip": "2200::1",
"dst_start_ip": "2100::0",
"dst_end_ip": "2100::1:869F",
- },
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -69,14 +69,14 @@ class TrafficStreams(TrafficStreamsScaleClass):
for i in range(len(self.pkt_data)):
base, count = self._get_start_end_ipv6(
self.pkt_data[i]["dst_start_ip"],
- self.pkt_data[i]["dst_end_ip"],
+ self.pkt_data[i]["dst_end_ip"]
)
self.pkt_base.append(
- Ether()
- / IPv6(
+ Ether() /
+ IPv6(
src=self.pkt_data[i]["src_start_ip"],
- dst=self.pkt_data[i]["dst_start_ip"],
+ dst=self.pkt_data[i]["dst_start_ip"]
)
)
self.pkt_vm.append(
@@ -88,13 +88,13 @@ class TrafficStreams(TrafficStreamsScaleClass):
max_value=base + count,
size=8,
seed=i + 1,
- limit=(2**24 - 1),
+ limit=(2**24 - 1)
),
STLVmWrFlowVar(
fv_name="ipv6_dst",
pkt_offset="IPv6.dst",
- offset_fixup=8,
- ),
+ offset_fixup=8
+ )
]
)
)
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 a4777364ae..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
@@ -77,7 +77,7 @@ class TrafficStreams(TrafficStreamsScaleClass):
"src_start_ip": "2600::1",
"dst_start_ip": "2500::0",
"dst_end_ip": "2500::1:869F",
- },
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -93,14 +93,14 @@ class TrafficStreams(TrafficStreamsScaleClass):
for i in range(len(self.pkt_data)):
base, count = self._get_start_end_ipv6(
self.pkt_data[i]["dst_start_ip"],
- self.pkt_data[i]["dst_end_ip"],
+ self.pkt_data[i]["dst_end_ip"]
)
self.pkt_base.append(
- Ether()
- / IPv6(
+ Ether() /
+ IPv6(
src=self.pkt_data[i]["src_start_ip"],
- dst=self.pkt_data[i]["dst_start_ip"],
+ dst=self.pkt_data[i]["dst_start_ip"]
)
)
self.pkt_vm.append(
@@ -112,13 +112,13 @@ class TrafficStreams(TrafficStreamsScaleClass):
max_value=base + count,
size=8,
seed=i + 1,
- limit=(2**24 - 1),
+ limit=(2**24 - 1)
),
STLVmWrFlowVar(
fv_name="ipv6_dst",
pkt_offset="IPv6.dst",
- offset_fixup=8,
- ),
+ offset_fixup=8
+ )
]
)
)
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 f8daffd0be..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
@@ -53,7 +53,7 @@ class TrafficStreams(TrafficStreamsScaleClass):
"src_start_ip": "2200::1",
"dst_start_ip": "2100::0",
"dst_end_ip": "2100::F:423F",
- },
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -69,14 +69,14 @@ class TrafficStreams(TrafficStreamsScaleClass):
for i in range(len(self.pkt_data)):
base, count = self._get_start_end_ipv6(
self.pkt_data[i]["dst_start_ip"],
- self.pkt_data[i]["dst_end_ip"],
+ self.pkt_data[i]["dst_end_ip"]
)
self.pkt_base.append(
- Ether()
- / IPv6(
+ Ether() /
+ IPv6(
src=self.pkt_data[i]["src_start_ip"],
- dst=self.pkt_data[i]["dst_start_ip"],
+ dst=self.pkt_data[i]["dst_start_ip"]
)
)
self.pkt_vm.append(
@@ -88,13 +88,13 @@ class TrafficStreams(TrafficStreamsScaleClass):
max_value=base + count,
size=8,
seed=i + 1,
- limit=(2**24 - 1),
+ limit=(2**24 - 1)
),
STLVmWrFlowVar(
fv_name="ipv6_dst",
pkt_offset="IPv6.dst",
- offset_fixup=8,
- ),
+ offset_fixup=8
+ )
]
)
)
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 372e127794..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
@@ -77,7 +77,7 @@ class TrafficStreams(TrafficStreamsScaleClass):
"src_start_ip": "2600::1",
"dst_start_ip": "2500::0",
"dst_end_ip": "2500::F:423F",
- },
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -93,14 +93,14 @@ class TrafficStreams(TrafficStreamsScaleClass):
for i in range(len(self.pkt_data)):
base, count = self._get_start_end_ipv6(
self.pkt_data[i]["dst_start_ip"],
- self.pkt_data[i]["dst_end_ip"],
+ self.pkt_data[i]["dst_end_ip"]
)
self.pkt_base.append(
- Ether()
- / IPv6(
+ Ether() /
+ IPv6(
src=self.pkt_data[i]["src_start_ip"],
- dst=self.pkt_data[i]["dst_start_ip"],
+ dst=self.pkt_data[i]["dst_start_ip"]
)
)
self.pkt_vm.append(
@@ -112,13 +112,13 @@ class TrafficStreams(TrafficStreamsScaleClass):
max_value=base + count,
size=8,
seed=i + 1,
- limit=(2**24 - 1),
+ limit=(2**24 - 1)
),
STLVmWrFlowVar(
fv_name="ipv6_dst",
pkt_offset="IPv6.dst",
- offset_fixup=8,
- ),
+ offset_fixup=8
+ )
]
)
)
diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst10000-2p.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst10000-2p.py
index 5e7be6b03b..7a02aac9f8 100644
--- a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst10000-2p.py
+++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst10000-2p.py
@@ -46,14 +46,14 @@ class TrafficStreams(TrafficStreamsScaleClass):
{
"src_start_ip": "2100::1",
"dst_start_ip": "2200::0",
- "dst_end_ip": "2200::270F",
+ "dst_end_ip": "2200::270F"
},
# Direction E --> W:
{
"src_start_ip": "2200::1",
"dst_start_ip": "2100::0",
- "dst_end_ip": "2100::270F",
- },
+ "dst_end_ip": "2100::270F"
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -69,14 +69,14 @@ class TrafficStreams(TrafficStreamsScaleClass):
for i in range(len(self.pkt_data)):
base, count = self._get_start_end_ipv6(
self.pkt_data[i]["dst_start_ip"],
- self.pkt_data[i]["dst_end_ip"],
+ self.pkt_data[i]["dst_end_ip"]
)
self.pkt_base.append(
- Ether()
- / IPv6(
+ Ether() /
+ IPv6(
src=self.pkt_data[i]["src_start_ip"],
- dst=self.pkt_data[i]["dst_start_ip"],
+ dst=self.pkt_data[i]["dst_start_ip"]
)
)
self.pkt_vm.append(
@@ -87,13 +87,13 @@ class TrafficStreams(TrafficStreamsScaleClass):
min_value=base,
max_value=base + count,
size=8,
- op="inc",
+ op="inc"
),
STLVmWrFlowVar(
fv_name="ipv6_dst",
pkt_offset="IPv6.dst",
- offset_fixup=8,
- ),
+ offset_fixup=8
+ )
]
)
)
diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst10000-6p.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst10000-6p.py
index 209c025339..f72bc2365e 100644
--- a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst10000-6p.py
+++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst10000-6p.py
@@ -46,38 +46,38 @@ class TrafficStreams(TrafficStreamsScaleClass):
{
"src_start_ip": "2100::1",
"dst_start_ip": "2200::0",
- "dst_end_ip": "2200::270F",
+ "dst_end_ip": "2200::270F"
},
# Direction W --> E:
{
"src_start_ip": "2300::1",
"dst_start_ip": "2400::0",
- "dst_end_ip": "2400::270F",
+ "dst_end_ip": "2400::270F"
},
# Direction W --> E:
{
"src_start_ip": "2500::1",
"dst_start_ip": "2600::0",
- "dst_end_ip": "2600::270F",
+ "dst_end_ip": "2600::270F"
},
# Direction E --> W:
{
"src_start_ip": "2200::1",
"dst_start_ip": "2100::0",
- "dst_end_ip": "2100::270F",
+ "dst_end_ip": "2100::270F"
},
# Direction E --> W:
{
"src_start_ip": "2400::1",
"dst_start_ip": "2300::0",
- "dst_end_ip": "2300::270F",
+ "dst_end_ip": "2300::270F"
},
# Direction E --> W:
{
"src_start_ip": "2600::1",
"dst_start_ip": "2500::0",
- "dst_end_ip": "2500::270F",
- },
+ "dst_end_ip": "2500::270F"
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -93,14 +93,14 @@ class TrafficStreams(TrafficStreamsScaleClass):
for i in range(len(self.pkt_data)):
base, count = self._get_start_end_ipv6(
self.pkt_data[i]["dst_start_ip"],
- self.pkt_data[i]["dst_end_ip"],
+ self.pkt_data[i]["dst_end_ip"]
)
self.pkt_base.append(
- Ether()
- / IPv6(
+ Ether() /
+ IPv6(
src=self.pkt_data[i]["src_start_ip"],
- dst=self.pkt_data[i]["dst_start_ip"],
+ dst=self.pkt_data[i]["dst_start_ip"]
)
)
self.pkt_vm.append(
@@ -111,13 +111,13 @@ class TrafficStreams(TrafficStreamsScaleClass):
min_value=base,
max_value=base + count,
size=8,
- op="inc",
+ op="inc"
),
STLVmWrFlowVar(
fv_name="ipv6_dst",
pkt_offset="IPv6.dst",
- offset_fixup=8,
- ),
+ offset_fixup=8
+ )
]
)
)
diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst100000-2p.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst100000-2p.py
index 892b482b86..11279216a0 100644
--- a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst100000-2p.py
+++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst100000-2p.py
@@ -46,14 +46,14 @@ class TrafficStreams(TrafficStreamsScaleClass):
{
"src_start_ip": "2100::1",
"dst_start_ip": "2200::0",
- "dst_end_ip": "2200::1:869F",
+ "dst_end_ip": "2200::1:869F"
},
# Direction E --> W:
{
"src_start_ip": "2200::1",
"dst_start_ip": "2100::0",
- "dst_end_ip": "2100::1:869F",
- },
+ "dst_end_ip": "2100::1:869F"
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -69,14 +69,14 @@ class TrafficStreams(TrafficStreamsScaleClass):
for i in range(len(self.pkt_data)):
base, count = self._get_start_end_ipv6(
self.pkt_data[i]["dst_start_ip"],
- self.pkt_data[i]["dst_end_ip"],
+ self.pkt_data[i]["dst_end_ip"]
)
self.pkt_base.append(
- Ether()
- / IPv6(
+ Ether() /
+ IPv6(
src=self.pkt_data[i]["src_start_ip"],
- dst=self.pkt_data[i]["dst_start_ip"],
+ dst=self.pkt_data[i]["dst_start_ip"]
)
)
self.pkt_vm.append(
@@ -87,13 +87,13 @@ class TrafficStreams(TrafficStreamsScaleClass):
min_value=base,
max_value=base + count,
size=8,
- op="inc",
+ op="inc"
),
STLVmWrFlowVar(
fv_name="ipv6_dst",
pkt_offset="IPv6.dst",
- offset_fixup=8,
- ),
+ offset_fixup=8
+ )
]
)
)
diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst100000-6p.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst100000-6p.py
index 99e1c58327..f1e0e4c9c7 100644
--- a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst100000-6p.py
+++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst100000-6p.py
@@ -46,38 +46,38 @@ class TrafficStreams(TrafficStreamsScaleClass):
{
"src_start_ip": "2100::1",
"dst_start_ip": "2200::0",
- "dst_end_ip": "2200::1:869F",
+ "dst_end_ip": "2200::1:869F"
},
# Direction W --> E:
{
"src_start_ip": "2300::1",
"dst_start_ip": "2400::0",
- "dst_end_ip": "2400::1:869F",
+ "dst_end_ip": "2400::1:869F"
},
# Direction W --> E:
{
"src_start_ip": "2500::1",
"dst_start_ip": "2600::0",
- "dst_end_ip": "2600::1:869F",
+ "dst_end_ip": "2600::1:869F"
},
# Direction E --> W:
{
"src_start_ip": "2200::1",
"dst_start_ip": "2100::0",
- "dst_end_ip": "2100::1:869F",
+ "dst_end_ip": "2100::1:869F"
},
# Direction E --> W:
{
"src_start_ip": "2400::1",
"dst_start_ip": "2300::0",
- "dst_end_ip": "2300::1:869F",
+ "dst_end_ip": "2300::1:869F"
},
# Direction E --> W:
{
"src_start_ip": "2600::1",
"dst_start_ip": "2500::0",
- "dst_end_ip": "2500::1:869F",
- },
+ "dst_end_ip": "2500::1:869F"
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -93,14 +93,14 @@ class TrafficStreams(TrafficStreamsScaleClass):
for i in range(len(self.pkt_data)):
base, count = self._get_start_end_ipv6(
self.pkt_data[i]["dst_start_ip"],
- self.pkt_data[i]["dst_end_ip"],
+ self.pkt_data[i]["dst_end_ip"]
)
self.pkt_base.append(
- Ether()
- / IPv6(
+ Ether() /
+ IPv6(
src=self.pkt_data[i]["src_start_ip"],
- dst=self.pkt_data[i]["dst_start_ip"],
+ dst=self.pkt_data[i]["dst_start_ip"]
)
)
self.pkt_vm.append(
@@ -111,13 +111,13 @@ class TrafficStreams(TrafficStreamsScaleClass):
min_value=base,
max_value=base + count,
size=8,
- op="inc",
+ op="inc"
),
STLVmWrFlowVar(
fv_name="ipv6_dst",
pkt_offset="IPv6.dst",
- offset_fixup=8,
- ),
+ offset_fixup=8
+ )
]
)
)
diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst1000000-2p.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst1000000-2p.py
index 4d60a4c799..0057c8b4b9 100644
--- a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst1000000-2p.py
+++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst1000000-2p.py
@@ -46,14 +46,14 @@ 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 E --> W:
{
"src_start_ip": "2200::1",
"dst_start_ip": "2100::0",
- "dst_end_ip": "2100::F:423F",
- },
+ "dst_end_ip": "2100::F:423F"
+ }
]
self.pkt_base = []
self.pkt_vm = []
@@ -69,14 +69,14 @@ class TrafficStreams(TrafficStreamsScaleClass):
for i in range(len(self.pkt_data)):
base, count = self._get_start_end_ipv6(
self.pkt_data[i]["dst_start_ip"],
- self.pkt_data[i]["dst_end_ip"],
+ self.pkt_data[i]["dst_end_ip"]
)
self.pkt_base.append(
- Ether()
- / IPv6(
+ Ether() /
+ IPv6(
src=self.pkt_data[i]["src_start_ip"],
- dst=self.pkt_data[i]["dst_start_ip"],
+ dst=self.pkt_data[i]["dst_start_ip"]
)
)
self.pkt_vm.append(
@@ -87,13 +87,13 @@ class TrafficStreams(TrafficStreamsScaleClass):
min_value=base,
max_value=base + count,
size=8,
- op="inc",
+ op="inc"
),
STLVmWrFlowVar(
fv_name="ipv6_dst",
pkt_offset="IPv6.dst",
- offset_fixup=8,
- ),
+ offset_fixup=8
+ )
]
)
)
diff --git a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst1000000-6p.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst1000000-6p.py
index 926847a7f8..4a1307c510 100644
--- a/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst1000000-6p.py
+++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst1000000-6p.py
@@ -46,38 +46,38 @@ 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 = []
self.pkt_vm = []
@@ -93,14 +93,14 @@ class TrafficStreams(TrafficStreamsScaleClass):
for i in range(len(self.pkt_data)):
base, count = self._get_start_end_ipv6(
self.pkt_data[i]["dst_start_ip"],
- self.pkt_data[i]["dst_end_ip"],
+ self.pkt_data[i]["dst_end_ip"]
)
self.pkt_base.append(
- Ether()
- / IPv6(
+ Ether() /
+ IPv6(
src=self.pkt_data[i]["src_start_ip"],
- dst=self.pkt_data[i]["dst_start_ip"],
+ dst=self.pkt_data[i]["dst_start_ip"]
)
)
self.pkt_vm.append(
@@ -111,13 +111,13 @@ class TrafficStreams(TrafficStreamsScaleClass):
min_value=base,
max_value=base + count,
size=8,
- op="inc",
+ op="inc"
),
STLVmWrFlowVar(
fv_name="ipv6_dst",
pkt_offset="IPv6.dst",
- offset_fixup=8,
- ),
+ offset_fixup=8
+ )
]
)
)