Python3: Migration of files under traffic-profiles/trex

Change-Id: Iae16225d3d3daa4e1e9b177228fb89efe4aa5405
Signed-off-by: Balaji Venkatraman <balajiv@cisco.com>

1 files changed, 77 insertions, 35 deletions

diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst4-2cnf.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst4-2cnf.py
index 5e2acb5309..972aa169b1 100644
--- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst4-2cnf.py
+++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst4-2cnf.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -18,10 +18,10 @@ Stream profile:
  - Packet: ETH / IP /
  - Direction 0 --> 1:
    - Source IP address range:      10.0.0.1
-   - Destination IP address range: 20.0.0.0 - 20.0.1.143
+   - Destination IP address range: 20.0.0.0 - 20.0.0.3
  - Direction 1 --> 0:
    - Source IP address range:      20.0.0.1
-   - Destination IP address range: 10.0.0.0 - 10.0.1.143
+   - Destination IP address range: 10.0.0.0 - 10.0.0.3
 """
 
 from trex.stl.api import *
@@ -37,10 +37,8 @@ class TrafficStreams(TrafficStreamsBaseClass):
         super(TrafficStreamsBaseClass, self).__init__()
 
         self.p1_dst_start_mac = u"02:02:00:00:12:00"
-        self.p1_dst_end_mac = u"02:02:00:00:12:01"
 
         self.p2_dst_start_mac = u"02:02:00:00:02:00"
-        self.p2_dst_end_mac = u"02:02:00:00:02:01"
 
         # IPs used in packet headers.
         self.p1_src_start_ip = u"10.0.0.1"
@@ -61,40 +59,84 @@ class TrafficStreams(TrafficStreamsBaseClass):
         """
 
         # Direction 0 --> 1
-        base_pkt_a = (Ether(dst=self.p1_dst_start_mac) /
-                      IP(src=self.p1_src_start_ip,
-                         dst=self.p1_dst_start_ip,
-                         proto=61))
+        base_pkt_a = (
+            Ether(
+                dst=self.p1_dst_start_mac
+            ) /
+            IP(
+              src=self.p1_src_start_ip,
+              dst=self.p1_dst_start_ip,
+              proto=61
+            )
+        )
         # Direction 1 --> 0
-        base_pkt_b = (Ether(dst=self.p2_dst_start_mac) /
-                      IP(src=self.p2_src_start_ip,
-                         dst=self.p2_dst_start_ip,
-                         proto=61))
+        base_pkt_b = (
+            Ether(
+                dst=self.p2_dst_start_mac
+            ) /
+            IP(
+                src=self.p2_src_start_ip,
+                dst=self.p2_dst_start_ip,
+                proto=61
+            )
+        )
 
         # Direction 0 --> 1
-        vm1 = STLScVmRaw([STLVmFlowVar(name=u"mac_dst",
-                                       min_value=0,
-                                       max_value=1,
-                                       size=1, op=u"inc"),
-                          STLVmWrFlowVar(fv_name=u"mac_dst", pkt_offset=5),
-                          STLVmFlowVar(name=u"dst",
-                                       min_value=self.p1_dst_start_ip,
-                                       max_value=self.p1_dst_end_ip,
-                                       size=4, op=u"inc"),
-                          STLVmWrFlowVar(fv_name=u"dst", pkt_offset=u"IP.dst"),
-                          STLVmFixIpv4(offset="IP")])
+        vm1 = STLScVmRaw(
+            [
+                STLVmFlowVar(
+                    name=u"mac_dst",
+                    min_value=0,
+                    max_value=1,
+                    size=1,
+                    op=u"inc"
+                ),
+                STLVmFlowVar(
+                    name=u"dst",
+                    min_value=self.p1_dst_start_ip,
+                    max_value=self.p1_dst_end_ip,
+                    size=4,
+                    op=u"inc"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"dst",
+                    pkt_offset=u"IP.dst"
+                ),
+                STLVmFixIpv4(
+                    offset=u"IP"
+                )
+          ]
+        )
         # Direction 1 --> 0
-        vm2 = STLScVmRaw([STLVmFlowVar(name=u"mac_dst",
-                                       min_value=0,
-                                       max_value=1,
-                                       size=1, op=u"inc"),
-                          STLVmWrFlowVar(fv_name=u"mac_dst", pkt_offset=5),
-                          STLVmFlowVar(name=u"dst",
-                                       min_value=self.p2_dst_start_ip,
-                                       max_value=self.p2_dst_end_ip,
-                                       size=4, op=u"inc"),
-                          STLVmWrFlowVar(fv_name=u"dst", pkt_offset=u"IP.dst"),
-                          STLVmFixIpv4(offset=u"IP")])
+        vm2 = STLScVmRaw(
+            [
+                STLVmFlowVar(
+                    name=u"mac_dst",
+                    min_value=0,
+                    max_value=1,
+                    size=1,
+                    op=u"inc"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"mac_dst",
+                    pkt_offset=5
+                ),
+                STLVmFlowVar(
+                    name=u"dst",
+                    min_value=self.p2_dst_start_ip,
+                    max_value=self.p2_dst_end_ip,
+                    size=4,
+                    op=u"inc"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"dst",
+                    pkt_offset=u"IP.dst"
+                ),
+                STLVmFixIpv4(
+                    offset=u"IP"
+                )
+            ]
+        )
 
         return base_pkt_a, base_pkt_b, vm1, vm2