Python3: Migration of files under traffic-profiles/trex

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

1 files changed, 61 insertions, 29 deletions

diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst100000.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst100000.py
index b32943062a..87e76726b2 100755
--- a/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst100000.py
+++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst100000.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:
@@ -37,13 +37,13 @@ class TrafficStreams(TrafficStreamsBaseClass):
         super(TrafficStreamsBaseClass, self).__init__()
 
         # IPs used in packet headers.
-        self.p1_src_start_ip = '2001:1::1'
-        self.p1_dst_start_ip = '2001:2::0'
-        self.p1_dst_end_ip = '2001:2::1:869F'
+        self.p1_src_start_ip = u"2001:1::1"
+        self.p1_dst_start_ip = u"2001:2::0"
+        self.p1_dst_end_ip = u"2001:2::1:869F"
 
-        self.p2_src_start_ip = '2001:2::1'
-        self.p2_dst_start_ip = '2001:1::0'
-        self.p2_dst_end_ip = '2001:1::1:869F'
+        self.p2_src_start_ip = u"2001:2::1"
+        self.p2_dst_start_ip = u"2001:1::0"
+        self.p2_dst_end_ip = u"2001:1::1:869F"
 
     def define_packets(self):
         """Defines the packets to be sent from the traffic generator.
@@ -54,34 +54,66 @@ class TrafficStreams(TrafficStreamsBaseClass):
         :rtype: tuple
         """
 
-        base_p1, count_p1 = self._get_start_end_ipv6(self.p1_dst_start_ip,
-                                                     self.p1_dst_end_ip)
-        base_p2, count_p2 = self._get_start_end_ipv6(self.p2_dst_start_ip,
-                                                     self.p2_dst_end_ip)
+        base_p1, count_p1 = self._get_start_end_ipv6(
+            self.p1_dst_start_ip,
+            self.p1_dst_end_ip
+        )
+        base_p2, count_p2 = self._get_start_end_ipv6(
+            self.p2_dst_start_ip,
+            self.p2_dst_end_ip
+        )
 
         # Direction 0 --> 1
-        base_pkt_a = Ether() / IPv6(src=self.p1_src_start_ip,
-                                    dst=self.p1_dst_start_ip)
+        base_pkt_a = (
+            Ether() /
+            IPv6(
+                src=self.p1_src_start_ip,
+                dst=self.p1_dst_start_ip
+            )
+        )
         # Direction 1 --> 0
-        base_pkt_b = Ether() / IPv6(src=self.p2_src_start_ip,
-                                    dst=self.p2_dst_start_ip)
+        base_pkt_b = (
+            Ether() /
+            IPv6(
+                src=self.p2_src_start_ip,
+                dst=self.p2_dst_start_ip
+            )
+        )
 
         # Direction 0 --> 1
-        vm1 = STLScVmRaw([STLVmFlowVar(name="ipv6_dst",
-                                       min_value=base_p1,
-                                       max_value=base_p1 + count_p1,
-                                       size=8, op="inc"),
-                          STLVmWrFlowVar(fv_name="ipv6_dst",
-                                         pkt_offset="IPv6.dst",
-                                         offset_fixup=8)])
+        vm1 = STLScVmRaw(
+            [
+                STLVmFlowVar(
+                    name=u"ipv6_dst",
+                    min_value=base_p1,
+                    max_value=base_p1 + count_p1,
+                    size=8,
+                    op=u"inc"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"ipv6_dst",
+                    pkt_offset=u"IPv6.dst",
+                    offset_fixup=8
+                )
+            ]
+        )
         # Direction 1 --> 0
-        vm2 = STLScVmRaw([STLVmFlowVar(name="ipv6_dst",
-                                       min_value=base_p2,
-                                       max_value=base_p2 + count_p2,
-                                       size=8, op="inc"),
-                          STLVmWrFlowVar(fv_name="ipv6_dst",
-                                         pkt_offset="IPv6.dst",
-                                         offset_fixup=8)])
+        vm2 = STLScVmRaw(
+            [
+                STLVmFlowVar(
+                    name=u"ipv6_dst",
+                    min_value=base_p2,
+                    max_value=base_p2 + count_p2,
+                    size=8,
+                    op=u"inc"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"ipv6_dst",
+                    pkt_offset=u"IPv6.dst",
+                    offset_fixup=8
+                )
+            ]
+        )
 
         return base_pkt_a, base_pkt_b, vm1, vm2