X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftraffic_profiles%2Ftrex%2Ftrex-sl-dot1qip4-vlan1ip4src254ip4dst254.py;h=6ce351968c85ede3aacaf6f5d7ededdcd9795d46;hp=bf5151905cf23429295cdf694c6091102437af2f;hb=f7519a18b92febfdb211a03a8ce60cbe216f9c72;hpb=e8e433bca76e6b7b065637d54cba9069278f6ab3

diff --git a/resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254.py b/resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254.py
index bf5151905c..6ce351968c 100755
--- a/resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254.py
+++ b/resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254.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:
@@ -43,17 +43,17 @@ class TrafficStreams(TrafficStreamsBaseClass):
         self.p2_vlan_start = 200
 
         # 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_src_start_ip = u"10.10.10.1"
+        self.p1_src_end_ip = u"10.10.10.254"
 
-        self.p1_dst_start_ip = '20.20.20.1'
-        self.p1_dst_end_ip = '20.20.20.254'
+        self.p1_dst_start_ip = u"20.20.20.1"
+        self.p1_dst_end_ip = u"20.20.20.254"
 
-        self.p2_src_start_ip = '20.20.20.1'
-        self.p2_src_end_ip = '20.20.20.254'
+        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 = '10.10.10.1'
-        self.p2_dst_end_ip = '10.10.10.254'
+        self.p2_dst_start_ip = u"10.10.10.1"
+        self.p2_dst_end_ip = u"10.10.10.254"
 
     def define_packets(self):
         """Defines the packets to be sent from the traffic generator.
@@ -65,42 +65,90 @@ class TrafficStreams(TrafficStreamsBaseClass):
         """
 
         # Direction 0 --> 1
-        base_pkt_a = (Ether() /
-                      Dot1Q(vlan=self.p1_vlan_start) /
-                      IP(src=self.p1_src_start_ip,
-                         dst=self.p1_dst_start_ip,
-                         proto=61))
+        base_pkt_a = (
+            Ether() /
+            Dot1Q(
+                vlan=self.p1_vlan_start
+            ) /
+            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.p2_vlan_start) /
-                      IP(src=self.p2_src_start_ip,
-                         dst=self.p2_dst_start_ip,
-                         proto=61))
+        base_pkt_b = (
+            Ether() /
+            Dot1Q(
+                vlan=self.p2_vlan_start
+            ) /
+            IP(
+                src=self.p2_src_start_ip,
+                dst=self.p2_dst_start_ip,
+                proto=61
+            )
+        )
 
         # Direction 0 --> 1
-        vm1 = STLScVmRaw([STLVmFlowVar(name="ip_src",
-                                       min_value=self.p1_src_start_ip,
-                                       max_value=self.p1_src_end_ip,
-                                       size=4, op="random"),
-                          STLVmWrFlowVar(fv_name="ip_src", pkt_offset="IP.src"),
-                          STLVmFlowVar(name="ip_dst",
-                                       min_value=self.p1_dst_start_ip,
-                                       max_value=self.p1_dst_end_ip,
-                                       size=4, op="random"),
-                          STLVmWrFlowVar(fv_name="ip_dst", pkt_offset="IP.dst"),
-                          STLVmFixIpv4(offset="IP")])
+        vm1 = STLScVmRaw(
+            [
+                STLVmFlowVar(
+                    name=u"ip_src",
+                    min_value=self.p1_src_start_ip,
+                    max_value=self.p1_src_end_ip,
+                    size=4,
+                    op=u"random"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"ip_src",
+                    pkt_offset=u"IP.src"
+                ),
+                STLVmFlowVar(
+                    name=u"ip_dst",
+                    min_value=self.p1_dst_start_ip,
+                    max_value=self.p1_dst_end_ip,
+                    size=4,
+                    op=u"random"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"ip_dst",
+                    pkt_offset=u"IP.dst"
+                ),
+                STLVmFixIpv4(
+                    offset=u"IP"
+                )
+            ]
+        )
         # Direction 1 --> 0
-        vm2 = STLScVmRaw([STLVmFlowVar(name="ip_src",
-                                       min_value=self.p2_src_start_ip,
-                                       max_value=self.p2_src_end_ip,
-                                       size=4, op="random"),
-                          STLVmWrFlowVar(fv_name="ip_src", pkt_offset="IP.src"),
-                          STLVmFlowVar(name="ip_dst",
-                                       min_value=self.p2_dst_start_ip,
-                                       max_value=self.p2_dst_end_ip,
-                                       size=4, op="random"),
-                          STLVmWrFlowVar(fv_name="ip_dst", pkt_offset="IP.dst"),
-                          STLVmFixIpv4(offset="IP")])
+        vm2 = STLScVmRaw(
+            [
+              STLVmFlowVar(
+                    name=u"ip_src",
+                    min_value=self.p2_src_start_ip,
+                    max_value=self.p2_src_end_ip,
+                    size=4,
+                    op=u"random"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"ip_src",
+                    pkt_offset=u"IP.src"
+                ),
+                STLVmFlowVar(
+                    name=u"ip_dst",
+                    min_value=self.p2_dst_start_ip,
+                    max_value=self.p2_dst_end_ip,
+                    size=4,
+                    op=u"random"
+                ),
+                STLVmWrFlowVar(
+                    fv_name=u"ip_dst",
+                    pkt_offset=u"IP.dst"
+                ),
+                STLVmFixIpv4(
+                    offset=u"IP"
+                )
+            ]
+        )
 
         return base_pkt_a, base_pkt_b, vm1, vm2