Python3: Migration of files under traffic-profiles/trex

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

1 files changed, 107 insertions, 55 deletions

diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-100u1000p-conc.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-100u1000p-conc.py
index acc1b31980..b93cd645ae 100755
--- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-100u1000p-conc.py
+++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-100u1000p-conc.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:
@@ -41,15 +41,15 @@ class TrafficStreams(TrafficStreamsBaseClass):
         super(TrafficStreamsBaseClass, self).__init__()
 
         # IPs used in packet headers.
-        self.p1_src_start_ip = '10.10.10.2'
-        self.p1_src_end_ip = '10.10.10.101'
-        self.p1_dst_start_ip = '20.20.20.2'
-        self.p1_dst_end_ip = '20.20.20.101'
+        self.p1_src_start_ip = u"10.10.10.2"
+        self.p1_src_end_ip = u"10.10.10.101"
+        self.p1_dst_start_ip = u"20.20.20.2"
+        self.p1_dst_end_ip = u"20.20.20.101"
 
-        self.p2_src_start_ip = '20.20.20.2'
-        self.p2_src_end_ip = '20.20.20.101'
-        self.p2_dst_start_ip = '10.10.10.2'
-        self.p2_dst_end_ip = '10.10.10.101'
+        self.p2_src_start_ip = u"20.20.20.2"
+        self.p2_src_end_ip = u"20.20.20.101"
+        self.p2_dst_start_ip = u"10.10.10.2"
+        self.p2_dst_end_ip = u"10.10.10.101"
 
         # UDP ports used in packet headers.
         self.p1_src_start_udp_port = 1001
@@ -72,56 +72,108 @@ 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="tuple1_src"),
-            STLVmTupleGen(ip_min=self.p1_dst_start_ip,
-                          ip_max=self.p1_dst_end_ip,
-                          port_min=self.p1_dst_start_udp_port,
-                          port_max=self.p1_dst_end_udp_port,
-                          name="tuple1_dst"),
-            STLVmWrFlowVar(fv_name="tuple1_src.ip", pkt_offset="IP.src"),
-            STLVmWrFlowVar(fv_name="tuple1_dst.ip", pkt_offset="IP.dst"),
-            STLVmFixIpv4(offset="IP"),
-            STLVmWrFlowVar(fv_name="tuple1_src.port", pkt_offset="UDP.sport"),
-            STLVmWrFlowVar(fv_name="tuple1_dst.port", pkt_offset="UDP.dport")
-        ])
+        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"tuple1_src"
+                ),
+                STLVmTupleGen(
+                    ip_min=self.p1_dst_start_ip,
+                    ip_max=self.p1_dst_end_ip,
+                    port_min=self.p1_dst_start_udp_port,
+                    port_max=self.p1_dst_end_udp_port,
+                    name=u"tuple1_dst"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"tuple1_src.ip",
+                    pkt_offset=u"IP.src"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"tuple1_dst.ip",
+                    pkt_offset=u"IP.dst"
+                ),
+                STLVmFixIpv4(
+                    offset=u"IP"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"tuple1_src.port",
+                    pkt_offset=u"UDP.sport"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"tuple1_dst.port",
+                    pkt_offset=u"UDP.dport"
+                )
+            ]
+        )
         # Direction 0 --> 1
-        vm2 = STLScVmRaw([
-            STLVmTupleGen(ip_min=self.p2_src_start_ip,
-                          ip_max=self.p2_src_end_ip,
-                          port_min=self.p2_src_start_udp_port,
-                          port_max=self.p2_src_end_udp_port,
-                          name="tuple2_src"),
-            STLVmTupleGen(ip_min=self.p2_dst_start_ip,
-                          ip_max=self.p2_dst_end_ip,
-                          port_min=self.p2_dst_start_udp_port,
-                          port_max=self.p2_dst_end_udp_port,
-                          name="tuple2_dst"),
-            STLVmWrFlowVar(fv_name="tuple2_src.ip", pkt_offset="IP.src"),
-            STLVmWrFlowVar(fv_name="tuple2_dst.ip", pkt_offset="IP.dst"),
-            STLVmFixIpv4(offset="IP"),
-            STLVmWrFlowVar(fv_name="tuple2_src.port", pkt_offset="UDP.sport"),
-            STLVmWrFlowVar(fv_name="tuple2_dst.port", pkt_offset="UDP.dport")
-        ])
+        vm2 = STLScVmRaw(
+            [
+                STLVmTupleGen(
+                    ip_min=self.p2_src_start_ip,
+                    ip_max=self.p2_src_end_ip,
+                    port_min=self.p2_src_start_udp_port,
+                    port_max=self.p2_src_end_udp_port,
+                    name=u"tuple2_src"
+                ),
+                STLVmTupleGen(
+                    ip_min=self.p2_dst_start_ip,
+                    ip_max=self.p2_dst_end_ip,
+                    port_min=self.p2_dst_start_udp_port,
+                    port_max=self.p2_dst_end_udp_port,
+                    name=u"tuple2_dst"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"tuple2_src.ip",
+                    pkt_offset=u"IP.src"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"tuple2_dst.ip",
+                    pkt_offset=u"IP.dst"
+                ),
+                STLVmFixIpv4(
+                    offset=u"IP"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"tuple2_src.port",
+                    pkt_offset=u"UDP.sport"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"tuple2_dst.port",
+                    pkt_offset=u"UDP.dport"
+                )
+            ]
+        )
 
         return base_pkt_a, base_pkt_b, vm1, vm2