X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftraffic_profiles%2Ftrex%2Ftrex-sl-2n-dot1qip4asym-ip4src254.py;h=ae411e233b00c6b5330be36e4e43c60ecbbf1dee;hb=a00151f420029b9022ec9b442fceb8a9247bdc22;hp=74d409bdc8c7447a4aba1d8864467bbabd310921;hpb=3e8a10ce9f0481d610aafa41f3195b0900122eb4;p=csit.git

diff --git a/resources/traffic_profiles/trex/trex-sl-2n-dot1qip4asym-ip4src254.py b/resources/traffic_profiles/trex/trex-sl-2n-dot1qip4asym-ip4src254.py
old mode 100755
new mode 100644
index 74d409bdc8..ae411e233b
--- a/resources/traffic_profiles/trex/trex-sl-2n-dot1qip4asym-ip4src254.py
+++ b/resources/traffic_profiles/trex/trex-sl-2n-dot1qip4asym-ip4src254.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 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:
@@ -25,7 +25,7 @@ Stream profile:
    - Destination IP address range: 10.10.10.1
 """
 
-from trex_stl_lib.api import *
+from trex.stl.api import *
 from profile_trex_stateless_base_class import TrafficStreamsBaseClass
 
 
@@ -41,13 +41,13 @@ class TrafficStreams(TrafficStreamsBaseClass):
         self.vlan_id = 10
 
         # IPs used in packet headers.
-        self.p1_src_start_ip = '10.10.10.1'
-        self.p1_src_end_ip = '10.10.10.254'
-        self.p1_dst_start_ip = '20.20.20.1'
+        self.p1_src_start_ip = u"10.10.10.1"
+        self.p1_src_end_ip = u"10.10.10.254"
+        self.p1_dst_start_ip = u"20.20.20.1"
 
-        self.p2_src_start_ip = '20.20.20.1'
-        self.p2_src_end_ip = '20.20.20.254'
-        self.p2_dst_start_ip = '10.10.10.1'
+        self.p2_src_start_ip = u"20.20.20.1"
+        self.p2_src_end_ip = u"20.20.20.254"
+        self.p2_dst_start_ip = u"10.10.10.1"
 
     def define_packets(self):
         """Defines the packets to be sent from the traffic generator.
@@ -59,31 +59,65 @@ class TrafficStreams(TrafficStreamsBaseClass):
         """
 
         # Direction 0 --> 1
-        base_pkt_a = (Ether() /
-                      IP(src=self.p1_src_start_ip,
-                         dst=self.p1_dst_start_ip,
-                         proto=61))
+        base_pkt_a = (
+          Ether() /
+          IP(
+              src=self.p1_src_start_ip,
+              dst=self.p1_dst_start_ip,
+              proto=61
+          )
+        )
         # Direction 1 --> 0
-        base_pkt_b = (Ether() /
-                      Dot1Q(vlan=self.vlan_id) /
-                      IP(src=self.p2_src_start_ip,
-                         dst=self.p2_dst_start_ip,
-                         proto=61))
+        base_pkt_b = (
+          Ether() /
+          Dot1Q(
+              vlan=self.vlan_id
+          ) /
+          IP(
+              src=self.p2_src_start_ip,
+              dst=self.p2_dst_start_ip,
+              proto=61
+          )
+        )
 
         # 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"),
-                          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"
+                ),
+                STLVmFixIpv4(
+                    offset=u"IP"
+                )
+            ]
+        )
 
         return base_pkt_a, base_pkt_b, vm1, vm2