X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftraffic_profiles%2Ftrex%2Ftrex-sl-3n-ethip4-ip4dst1000-1cnf.py;fp=resources%2Ftraffic_profiles%2Ftrex%2Ftrex-sl-3n-ethip4-ip4dst1000-1cnf.py;h=ab03d9506ab3e5ea1470f57b82af024b0ac4f287;hp=47a3f371be8a31330fc8e77a70d808f6698cda53;hb=3d5a75be5a88931690898e0fe52e4f48bc67c5ed;hpb=f99c79a4035787aff0db70498d022095caa44043

diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1000-1cnf.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1000-1cnf.py
index 47a3f371be..ab03d9506a 100644
--- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1000-1cnf.py
+++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1000-1cnf.py
@@ -18,10 +18,10 @@ Stream profile:
  - Packet: ETH / IP /
  - Direction 0 --> 1:
    - Source IP address range:      10.0.0.1
-   - Destination IP address range: 20.0.0.0 - 20.0.3.231
+   - Destination IP address range: 20.0.0.0 - 20.0.1.143
  - Direction 1 --> 0:
    - Source IP address range:      20.0.0.1
-   - Destination IP address range: 10.0.0.0 - 10.0.3.231
+   - Destination IP address range: 10.0.0.0 - 10.0.1.143
 """
 
 from trex.stl.api import *
@@ -36,17 +36,20 @@ class TrafficStreams(TrafficStreamsBaseClass):
 
         super(TrafficStreamsBaseClass, self).__init__()
 
-        self.p2_dst_start_mac = '02:02:00:00:00:00'
-        self.p2_dst_end_mac = '02:02:00:00:00:00'
+        self.p1_dst_start_mac = u"02:02:00:00:12:00"
+        self.p1_dst_end_mac = u"02:02:00:00:12:00"
+
+        self.p2_dst_start_mac = u"02:02:00:00:02:00"
+        self.p2_dst_end_mac = u"02:02:00:00:02:00"
 
         # IPs used in packet headers.
-        self.p1_src_start_ip = '10.0.0.1'
-        self.p1_dst_start_ip = '20.0.0.0'
-        self.p1_dst_end_ip = '20.0.3.231'
+        self.p1_src_start_ip = u"10.0.0.1"
+        self.p1_dst_start_ip = u"20.0.0.0"
+        self.p1_dst_end_ip = u"20.0.3.231"
 
-        self.p2_src_start_ip = '20.0.0.1'
-        self.p2_dst_start_ip = '10.0.0.0'
-        self.p2_dst_end_ip = '10.0.3.231'
+        self.p2_src_start_ip = u"20.0.0.1"
+        self.p2_dst_start_ip = u"10.0.0.0"
+        self.p2_dst_end_ip = u"10.0.3.231"
 
     def define_packets(self):
         """Defines the packets to be sent from the traffic generator.
@@ -58,7 +61,7 @@ class TrafficStreams(TrafficStreamsBaseClass):
         """
 
         # Direction 0 --> 1
-        base_pkt_a = (Ether() /
+        base_pkt_a = (Ether(dst=self.p1_dst_start_mac) /
                       IP(src=self.p1_src_start_ip,
                          dst=self.p1_dst_start_ip,
                          proto=61))
@@ -69,24 +72,29 @@ class TrafficStreams(TrafficStreamsBaseClass):
                          proto=61))
 
         # Direction 0 --> 1
-        vm1 = STLScVmRaw([STLVmFlowVar(name="dst",
+        vm1 = STLScVmRaw([STLVmFlowVar(name=u"mac_dst",
+                                       min_value=0,
+                                       max_value=0,
+                                       size=1, op=u"inc"),
+                          STLVmWrFlowVar(fv_name=u"mac_dst", pkt_offset=5),
+                          STLVmFlowVar(name=u"dst",
                                        min_value=self.p1_dst_start_ip,
                                        max_value=self.p1_dst_end_ip,
-                                       size=4, op="inc"),
-                          STLVmWrFlowVar(fv_name="dst", pkt_offset="IP.dst"),
-                          STLVmFixIpv4(offset="IP")])
+                                       size=4, op=u"inc"),
+                          STLVmWrFlowVar(fv_name=u"dst", pkt_offset=u"IP.dst"),
+                          STLVmFixIpv4(offset=u"IP")])
         # Direction 1 --> 0
-        vm2 = STLScVmRaw([STLVmFlowVar(name="mac_dst",
+        vm2 = STLScVmRaw([STLVmFlowVar(name=u"mac_dst",
                                        min_value=0,
                                        max_value=0,
-                                       size=1, op="inc"),
-                          STLVmWrFlowVar(fv_name="mac_dst", pkt_offset=5),
-                          STLVmFlowVar(name="dst",
+                                       size=1, op=u"inc"),
+                          STLVmWrFlowVar(fv_name=u"mac_dst", pkt_offset=5),
+                          STLVmFlowVar(name=u"dst",
                                        min_value=self.p2_dst_start_ip,
                                        max_value=self.p2_dst_end_ip,
-                                       size=4, op="inc"),
-                          STLVmWrFlowVar(fv_name="dst", pkt_offset="IP.dst"),
-                          STLVmFixIpv4(offset="IP")])
+                                       size=4, op=u"inc"),
+                          STLVmWrFlowVar(fv_name=u"dst", pkt_offset=u"IP.dst"),
+                          STLVmFixIpv4(offset=u"IP")])
 
         return base_pkt_a, base_pkt_b, vm1, vm2