Python3: Migration of files under traffic-profiles/trex

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

1 files changed, 68 insertions, 36 deletions

diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-10u15p.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-10u15p.py
index 346a9a50de..57c5b2dcbc 100755
--- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-10u15p.py
+++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-10u15p.py
@@ -1,4 +1,4 @@
-# Copyright (c) 201 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:
@@ -41,13 +41,13 @@ class TrafficStreams(TrafficStreamsBaseClass):
         super(TrafficStreamsBaseClass, self).__init__()
 
         # IPs used in packet headers.
-        self.p1_src_start_ip = '20.0.0.0'
-        self.p1_src_end_ip = '20.0.0.9'
-        self.p1_dst_start_ip = '12.0.0.2'
+        self.p1_src_start_ip = u"20.0.0.0"
+        self.p1_src_end_ip = u"20.0.0.9"
+        self.p1_dst_start_ip = u"12.0.0.2"
 
-        self.p2_src_start_ip = '12.0.0.2'
-        #self.p2_src_end_ip = '12.0.0.2'
-        self.p2_dst_start_ip = '200.0.0.0'
+        self.p2_src_start_ip = u"12.0.0.2"
+        #self.p2_src_end_ip = u"12.0.0.2"
+        self.p2_dst_start_ip = u"200.0.0.0"
 
         # UDP ports used in packet headers.
         self.p1_src_start_udp_port = 1024
@@ -68,39 +68,71 @@ 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_start_udp_port,
-                          dport=self.p1_dst_start_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_start_udp_port,
+                dport=self.p1_dst_start_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_start_udp_port,
-                          dport=self.p2_dst_start_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_start_udp_port,
+                dport=self.p2_dst_start_udp_port
+            )
+        )
 
         # Direction 0 --> 1
-        vm1 = STLScVmRaw([
-            STLVmTupleGen(ip_min=self.p1_src_start_ip,
-                          ip_max=self.p1_src_end_ip,
-                          port_min=self.p1_src_start_udp_port,
-                          port_max=self.p1_src_end_udp_port,
-                          name="tuple"),
-            STLVmWrFlowVar(fv_name="tuple.ip", pkt_offset="IP.src"),
-            STLVmFixIpv4(offset="IP"),
-            STLVmWrFlowVar(fv_name="tuple.port", pkt_offset="UDP.sport")
-        ])
+        vm1 = STLScVmRaw(
+            [
+                STLVmTupleGen(
+                    ip_min=self.p1_src_start_ip,
+                    ip_max=self.p1_src_end_ip,
+                    port_min=self.p1_src_start_udp_port,
+                    port_max=self.p1_src_end_udp_port,
+                    name=u"tuple"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"tuple.ip",
+                    pkt_offset=u"IP.src"
+                ),
+                STLVmFixIpv4(
+                    offset=u"IP"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"tuple.port",
+                    pkt_offset=u"UDP.sport"
+                )
+            ]
+        )
         # Direction 0 --> 1
-        vm2 = STLScVmRaw([
-            STLVmFlowVar(name="dport",
-                         min_value=self.p2_dst_start_udp_port,
-                         max_value=self.p2_dst_end_udp_port,
-                         size=2, op="inc"),
-            STLVmWrFlowVar(fv_name="dport", pkt_offset="UDP.dport")
-        ])
+        vm2 = STLScVmRaw(
+            [
+              STLVmFlowVar(
+                    name=u"dport",
+                    min_value=self.p2_dst_start_udp_port,
+                    max_value=self.p2_dst_end_udp_port,
+                    size=2,
+                    op=u"inc"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"dport",
+                    pkt_offset=u"UDP.dport"
+                )
+            ]
+        )
 
         return base_pkt_a, base_pkt_b, vm1, vm2