Python3: Migration of files under traffic-profiles/trex

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

1 files changed, 78 insertions, 34 deletions

diff --git a/resources/traffic_profiles/trex/trex-sl-2n-ethip4udp-lb.py b/resources/traffic_profiles/trex/trex-sl-2n-ethip4udp-lb.py
index bcd5328edd..df05cbff17 100755
--- a/resources/traffic_profiles/trex/trex-sl-2n-ethip4udp-lb.py
+++ b/resources/traffic_profiles/trex/trex-sl-2n-ethip4udp-lb.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Intel and/or its affiliates.
+# Copyright (c) 2020 Intel 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:
@@ -36,14 +36,14 @@ class TrafficStreams(TrafficStreamsBaseClass):
         super(TrafficStreamsBaseClass, self).__init__()
 
         # IPs used in packet headers.
-        self.p1_src_start_ip = '192.168.50.74'
-        self.p1_src_end_ip = '192.168.50.79'
-        self.p1_dst_start_ip = '90.1.2.1'
+        self.p1_src_start_ip = u"192.168.50.74"
+        self.p1_src_end_ip = u"192.168.50.79"
+        self.p1_dst_start_ip = u"90.1.2.1"
 
-        self.p2_src_start_ip = '192.168.60.74'
-        self.p2_src_end_ip = '192.168.60.79'
-        self.p2_dst_start_ip = '192.168.50.74'
-        self.p2_dst_end_ip = '192.168.50.79'
+        self.p2_src_start_ip = u"192.168.60.74"
+        self.p2_src_end_ip = u"192.168.60.79"
+        self.p2_dst_start_ip = u"192.168.50.74"
+        self.p2_dst_end_ip = u"192.168.50.79"
 
         # UDP ports used in packet headers.
         self.p1_src_udp_port = 63
@@ -62,36 +62,80 @@ class TrafficStreams(TrafficStreamsBaseClass):
         """
 
         # Direction 0 --> 1
-        base_pkt_a = Ether() / IP(src=self.p1_src_start_ip,
-                                  dst=self.p1_dst_start_ip,
-                                  proto=17) / UDP(sport=self.p1_src_udp_port,
-                                                  dport=self.p1_dst_udp_port)
+        base_pkt_a = (
+            Ether() /
+            IP(
+                src=self.p1_src_start_ip,
+                dst=self.p1_dst_start_ip,
+                proto=17) /
+            UDP(
+                sport=self.p1_src_udp_port,
+                dport=self.p1_dst_udp_port
+             )
+        )
         # Direction 1 --> 0
-        base_pkt_b = Ether() / IP(src=self.p2_src_start_ip,
-                                  dst=self.p2_dst_start_ip,
-                                  proto=17) / UDP(sport=self.p2_src_udp_port,
-                                                  dport=self.p2_dst_udp_port)
+        base_pkt_b = (
+            Ether() /
+            IP(
+                src=self.p2_src_start_ip,
+                dst=self.p2_dst_start_ip,
+                proto=17
+             ) /
+            UDP(
+                sport=self.p2_src_udp_port,
+                dport=self.p2_dst_udp_port
+             )
+        )
 
         # Direction 0 --> 1
-        vm1 = STLScVmRaw([STLVmFlowVar(name="src",
-                                       min_value=self.p1_src_start_ip,
-                                       max_value=self.p1_src_end_ip,
-                                       size=4, op="inc"),
-                          STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"),
-                          STLVmFixIpv4(offset="IP")])
+        vm1 = STLScVmRaw(
+            [
+                STLVmFlowVar(
+                    name=u"src",
+                    min_value=self.p1_src_start_ip,
+                    max_value=self.p1_src_end_ip,
+                    size=4,
+                    op=u"inc"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"src",
+                    pkt_offset=u"IP.src"
+                ),
+                STLVmFixIpv4(
+                    offset=u"IP"
+                )
+            ]
+        )
         # Direction 1 --> 0
-        vm2 = STLScVmRaw([STLVmFlowVar(name="src",
-                                       min_value=self.p2_src_start_ip,
-                                       max_value=self.p2_src_end_ip,
-                                       size=4, op="inc"),
-                          STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"),
-                          STLVmFlowVar(name="dst",
-                                       min_value=self.p2_dst_start_ip,
-                                       max_value=self.p2_dst_end_ip,
-                                       size=4, op="inc"),
-                          STLVmWrFlowVar(fv_name="dst", pkt_offset="IP.dst"),
-                          STLVmFixIpv4(offset="IP")])
-
+        vm2 = STLScVmRaw(
+            [
+                STLVmFlowVar(
+                    name=u"src",
+                    min_value=self.p2_src_start_ip,
+                    max_value=self.p2_src_end_ip,
+                    size=4,
+                    op=u"inc"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"src",
+                    pkt_offset=u"IP.src"
+                ),
+                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