style(scale): Apply black to new traffic profiles 45/40845/1
authorVratko Polak <vrpolak@cisco.com>
Tue, 30 Apr 2024 12:55:15 +0000 (14:55 +0200)
committerVratko Polak <vrpolak@cisco.com>
Tue, 30 Apr 2024 12:55:15 +0000 (14:55 +0200)
+ Add trailing commas to prevent black from collapsing argument lists.

Change-Id: I8a2f2aca0df7a9271a073f87603f9abfa4870b11
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
24 files changed:
GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd10000-2p.py
GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd10000-6p.py
GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd100000-2p.py
GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd100000-6p.py
GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd1000000-2p.py
GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst-rnd1000000-6p.py
GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst10000-2p.py
GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst10000-6p.py
GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst100000-2p.py
GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst100000-6p.py
GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst1000000-2p.py
GPL/traffic_profiles/trex/trex-stl-ethip4-ip4dst1000000-6p.py
GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd10000-2p.py
GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd10000-6p.py
GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd100000-2p.py
GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd100000-6p.py
GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd1000000-2p.py
GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst-rnd1000000-6p.py
GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst10000-2p.py
GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst10000-6p.py
GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst100000-2p.py
GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst100000-6p.py
GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst1000000-2p.py
GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst1000000-6p.py

index 142694b..2ae8580 100644 (file)
@@ -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",
+                        ),
                     ]
                 )
             )
index 0254644..9a20db3 100644 (file)
@@ -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",
+                        ),
                     ]
                 )
             )
index 8f66f13..29a3731 100644 (file)
@@ -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",
+                        ),
                     ]
                 )
             )
index b158a1f..6bb3049 100644 (file)
@@ -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",
+                        ),
                     ]
                 )
             )
index f132e2e..0283312 100644 (file)
@@ -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",
+                        ),
                     ]
                 )
             )
index 639bf52..1f6df62 100644 (file)
@@ -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",
+                        ),
                     ]
                 )
             )
index 2dda26d..a5131bf 100644 (file)
@@ -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
 #
@@ -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",
+                        ),
                     ]
                 )
             )
index 94a47a8..922e345 100644 (file)
@@ -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
 #
@@ -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",
+                        ),
                     ]
                 )
             )
index a8d223b..045a127 100644 (file)
@@ -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
 #
@@ -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",
+                        ),
                     ]
                 )
             )
index 7604244..1bce493 100644 (file)
@@ -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
 #
@@ -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",
+                        ),
                     ]
                 )
             )
index f2e7938..6fc6b10 100644 (file)
@@ -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
 #
@@ -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",
+                        ),
                     ]
                 )
             )
index 6474b43..a08955f 100644 (file)
@@ -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
 #
@@ -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",
+                        ),
                     ]
                 )
             )
index eba560a..585629f 100644 (file)
@@ -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,
+                        ),
                     ]
                 )
             )
index 2d20231..3227cb3 100644 (file)
@@ -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,
+                        ),
                     ]
                 )
             )
index 1aa01fa..a46d7f9 100644 (file)
@@ -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,
+                        ),
                     ]
                 )
             )
index 854da9b..a477736 100644 (file)
@@ -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,
+                        ),
                     ]
                 )
             )
index d35d283..f8daffd 100644 (file)
@@ -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,
+                        ),
                     ]
                 )
             )
index 71bd9b6..372e127 100644 (file)
@@ -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,
+                        ),
                     ]
                 )
             )
index 7a02aac..5e7be6b 100644 (file)
@@ -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,
+                        ),
                     ]
                 )
             )
index f72bc23..209c025 100644 (file)
@@ -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,
+                        ),
                     ]
                 )
             )
index 1127921..892b482 100644 (file)
@@ -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,
+                        ),
                     ]
                 )
             )
index f1e0e4c..99e1c58 100644 (file)
@@ -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,
+                        ),
                     ]
                 )
             )
index 0057c8b..4d60a4c 100644 (file)
@@ -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,
+                        ),
                     ]
                 )
             )
index 4a1307c..926847a 100644 (file)
@@ -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,
+                        ),
                     ]
                 )
             )