X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftraffic_profiles%2Ftrex%2Ftrex-sl-3n-ethip4-macsrc100kip4src100k.py;h=52eb841ab02277b81e6ceb87ff53858d176bea02;hp=6f9780073348ba9a7422c482f5bc3a78b15f2297;hb=f7519a18b92febfdb211a03a8ce60cbe216f9c72;hpb=ab94abd6fea7e4015c3fdc3130beb35b59582d58

diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc100kip4src100k.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc100kip4src100k.py
index 6f97800733..52eb841ab0 100755
--- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc100kip4src100k.py
+++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc100kip4src100k.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 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:
@@ -26,7 +26,7 @@ Stream profile:
    - Destination IP address range: 10.0.0.1
 """
 
-from trex_stl_lib.api import *
+from trex.stl.api import *
 from profile_trex_stateless_base_class import TrafficStreamsBaseClass
 
 
@@ -41,18 +41,18 @@ class TrafficStreams(TrafficStreamsBaseClass):
         self.clients = 100000
 
         # MACs used in packet headers.
-        self.p1_src_start_mac = 'ca:fe:00:00:00:00'  # mask: 00:00:FF:FF:FF:FF
+        self.p1_src_start_mac = u"ca:fe:00:00:00:00"  # mask: 00:00:FF:FF:FF:FF
 
-        self.p2_src_start_mac = 'fa:ce:00:00:00:00'  # mask: 00:00:FF:FF:FF:FF
+        self.p2_src_start_mac = u"fa:ce:00:00:00:00"  # mask: 00:00:FF:FF:FF:FF
 
         # IPs used in packet headers.
-        self.p1_src_start_ip = '10.0.0.2'
-        self.p1_src_end_ip = '10.1.134.161'
-        self.p1_dst_start_ip = '20.0.0.1'
+        self.p1_src_start_ip = u"10.0.0.2"
+        self.p1_src_end_ip = u"10.1.134.161"
+        self.p1_dst_start_ip = u"20.0.0.1"
 
-        self.p2_src_start_ip = '20.0.0.2'
-        self.p2_src_end_ip = '20.1.134.161'
-        self.p2_dst_start_ip = '10.0.0.1'
+        self.p2_src_start_ip = u"20.0.0.2"
+        self.p2_src_end_ip = u"20.1.134.161"
+        self.p2_dst_start_ip = u"10.0.0.1"
 
     def define_packets(self):
         """Defines the packets to be sent from the traffic generator.
@@ -64,40 +64,88 @@ class TrafficStreams(TrafficStreamsBaseClass):
         """
 
         # Direction 0 --> 1
-        base_pkt_a = (Ether(src=self.p1_src_start_mac) /
-                      IP(src=self.p1_src_start_ip,
-                         dst=self.p1_dst_start_ip,
-                         proto=61))
+        base_pkt_a = (
+            Ether(
+                src=self.p1_src_start_mac
+            ) /
+            IP(
+                src=self.p1_src_start_ip,
+                dst=self.p1_dst_start_ip,
+                proto=61
+            )
+        )
         # Direction 1 --> 0
-        base_pkt_b = (Ether(src=self.p2_src_start_mac) /
-                      IP(src=self.p2_src_start_ip,
-                         dst=self.p2_dst_start_ip,
-                         proto=61))
+        base_pkt_b = (
+            Ether(
+                src=self.p2_src_start_mac
+            ) /
+            IP(
+                src=self.p2_src_start_ip,
+                dst=self.p2_dst_start_ip,
+                proto=61
+            )
+        )
 
         # Direction 0 --> 1
-        vm1 = STLScVmRaw([STLVmFlowVar(name="mac_src",
-                                       min_value=0,
-                                       max_value=self.clients-1,
-                                       size=4, op="inc"),
-                          STLVmWrFlowVar(fv_name="mac_src", pkt_offset=8),
-                          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"mac_src",
+                    min_value=0,
+                    max_value=self.clients-1,
+                    size=4,
+                    op=u"inc"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"mac_src",
+                    pkt_offset=8
+                ),
+                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="mac_src",
-                                       min_value=0,
-                                       max_value=self.clients-1,
-                                       size=4, op="inc"),
-                          STLVmWrFlowVar(fv_name="mac_src", pkt_offset=8),
-                          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"mac_src",
+                    min_value=0,
+                    max_value=self.clients-1,
+                    size=4,
+                    op=u"inc"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"mac_src",
+                    pkt_offset=8
+                ),
+                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