config the l3fwd and change the traffic.

Change-Id: Id410f5a1fbef8e21206aff668a9a76549e2f7c4a
Signed-off-by: Fangyin Hu <fangyinx.hu@intel.com>

diff --git a/dpdk-tests/dpdk_scripts/install_dpdk.sh b/dpdk-tests/dpdk_scripts/install_dpdk.sh
index 393465c..126e8ca 100755 (executable)
--- a/dpdk-tests/dpdk_scripts/install_dpdk.sh
+++ b/dpdk-tests/dpdk_scripts/install_dpdk.sh
@@ -27,6 +27,8 @@ cd ${PWDDIR}
 export RTE_SDK=${ROOTDIR}/${DPDK_DIR}/
 export RTE_TARGET=x86_64-native-linuxapp-gcc
 cd ${RTE_SDK}/examples/l3fwd
 export RTE_SDK=${ROOTDIR}/${DPDK_DIR}/
 export RTE_TARGET=x86_64-native-linuxapp-gcc
 cd ${RTE_SDK}/examples/l3fwd

+sudo sed -i 's/^#define RTE_TEST_RX_DESC_DEFAULT 128/#define RTE_TEST_RX_DESC_DEFAULT 2048/g' ./main.c
+sudo sed -i 's/^#define RTE_TEST_TX_DESC_DEFAULT 512/#define RTE_TEST_TX_DESC_DEFAULT 2048/g' ./main.c

 make -j || \
     { echo "Failed to compile l3fwd"; exit 1; }
 cd ${PWDDIR}
 make -j || \
     { echo "Failed to compile l3fwd"; exit 1; }
 cd ${PWDDIR}

diff --git a/dpdk-tests/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot b/dpdk-tests/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot
index 31afdc1..e6ea0e2 100644 (file)
--- a/dpdk-tests/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot
+++ b/dpdk-tests/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot
@@ -48,7 +48,7 @@
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
 # Traffic profile:
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
 # Traffic profile:

-| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst253
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst253_l3fwd

 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4base-l3fwd-ndrdisc
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4base-l3fwd-ndrdisc

diff --git a/resources/tools/t-rex/stream_profiles/trex-sl-3n-ethip4-ip4dst253_l3fwd.py b/resources/tools/t-rex/stream_profiles/trex-sl-3n-ethip4-ip4dst253_l3fwd.py
new file mode 100755 (executable)
index 0000000..55a7994
--- /dev/null
+++ b/resources/tools/t-rex/stream_profiles/trex-sl-3n-ethip4-ip4dst253_l3fwd.py
@@ -0,0 +1,96 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Stream profile for T-rex traffic generator.
+
+Stream profile:
+ - Two streams sent in directions 0 --> 1 and 1 --> 0 at the same time.
+ - Packet: ETH / IP /
+ - Direction 0 --> 1:
+   - Source IP address range:      20.20.20.2
+   - Destination IP address range: 1.1.1.2 - 1.1.1.254
+ - Direction 1 --> 0:
+   - Source IP address range:      10.10.10.2
+   - Destination IP address range: 2.1.1.2 - 2.1.1.254
+"""
+
+from trex_stl_lib.api import *
+from profile_trex_stateless_base_class import TrafficStreamsBaseClass
+
+
+class TrafficStreams(TrafficStreamsBaseClass):
+    """Stream profile."""
+
+    def __init__(self):
+        """Initialization and setting of streams' parameters."""
+
+        super(TrafficStreamsBaseClass, self).__init__()
+
+        # IPs used in packet headers.
+        self.p1_src_start_ip = '20.20.20.2'
+        self.p1_dst_start_ip = '1.1.1.2'
+        self.p1_dst_end_ip = '1.1.1.254'
+
+        self.p2_src_start_ip = '10.10.10.2'
+        self.p2_dst_start_ip = '2.1.1.2'
+        self.p2_dst_end_ip = '2.1.1.254'
+
+    def define_packets(self):
+        """Defines the packets to be sent from the traffic generator.
+
+        Packet definition: | ETH | IP |
+
+        :returns: Packets to be sent from the traffic generator.
+        :rtype: tuple
+        """
+
+        # Direction 0 --> 1
+        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() /
+                      IP(src=self.p2_src_start_ip,
+                         dst=self.p2_dst_start_ip,
+                         proto=61))
+
+        # Direction 0 --> 1
+        vm1 = STLScVmRaw([STLVmFlowVar(name="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")],
+                         split_by_field="dst")
+        # Direction 1 --> 0
+        vm2 = STLScVmRaw([STLVmFlowVar(name="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")],
+                         split_by_field="dst")
+
+        return base_pkt_a, base_pkt_b, vm1, vm2
+
+
+def register():
+    """Register this traffic profile to T-rex.
+
+    Do not change this function.
+
+    :return: Traffic streams.
+    :rtype: Object
+    """
+    return TrafficStreams()