[dts] [PATCH 2/2] fm10k_perf: optimize command and add some sample command for nic configuration.

[dts] [PATCH 2/2] fm10k_perf: optimize command and add some sample command for nic configuration.

[Ding Heng]

Signed-off-by: Ding Heng <hengx.ding@intel.com>

diff --git a/nics/fm10k.cfg b/nics/fm10k.cfg
index 447badf..ad5e5e5 100644
--- a/nics/fm10k.cfg
+++ b/nics/fm10k.cfg
@@ -7,3 +7,9 @@ cmd =
     reg dbg set 0 CM_SHARED_WM 0x5f00 0 0,
     add mac 02:00:00:00:00:00 1 locked port 1,
     add mac 02:00:00:00:00:01 1 locked port 5,
+    set port config 20,22 tx_cut_through off,
+#    create vlan 51,
+#    add vlan port 51 1,5,20,22,
+#    set vlan tagging 51 1,5 tag,
+#    set port config 1 eth_mode 100GBase-SR4,
+#    set port config 5 eth_mode 100GBase-SR4,
diff --git a/tests/TestSuite_fm10k_perf.py b/tests/TestSuite_fm10k_perf.py
index e33f4bd..ffb259c 100644
--- a/tests/TestSuite_fm10k_perf.py
+++ b/tests/TestSuite_fm10k_perf.py
@@ -41,7 +41,7 @@ from test_case import TestCase
 from exception import VerifyFailure
 from settings import HEADER_SIZE
 from etgen import IxiaPacketGenerator
-from utils import GREEN
+from utils import *
 
 class TestFM10kL3fwd(TestCase, IxiaPacketGenerator):
 
@@ -325,7 +325,7 @@ class TestFM10kL3fwd(TestCase, IxiaPacketGenerator):
                                                    self.dut.get_memory_channels(), dts.create_mask(valports[:2]))
 
                     if frame_size > 1518:
-                        cmdline = cmdline + " --enable-jumbo --max-pkt-len %d" % frame_size
+                        cmdline = cmdline + " --max-pkt-len %d" % frame_size
                     dts.report(cmdline + "\n", frame=True, annex=True)
 
                     out = self.dut.send_expect(cmdline, "L3FWD:", 120)
@@ -359,7 +359,8 @@ class TestFM10kL3fwd(TestCase, IxiaPacketGenerator):
                     print latencys
 
                     for latency in latencys:
-                        data_row = [frame_size, mode, cores, str(pps), str(pct), str(latency['max']), str(latency['min']), str(latency['average'])]
+                        if latency['max'] > 0:
+                            data_row = [frame_size, mode, cores, str(pps), str(pct), str(latency['max']), str(latency['min']), str(latency['average'])]
                     dts.results_table_add_row(data_row)
                     self.l3fwd_test_results['data'].append(data_row)
 
@@ -431,7 +432,7 @@ class TestFM10kL3fwd(TestCase, IxiaPacketGenerator):
                                                        self.dut.get_memory_channels(), dts.create_mask(valports[:2]))
 
                         if frame_size > 1518:
-                            cmdline = cmdline + " --enable-jumbo --max-pkt-len %d" % frame_size
+                            cmdline = cmdline + "  --max-pkt-len %d" % frame_size
                         dts.report(cmdline + "\n", frame=True, annex=True)
 
                         out = self.dut.send_expect(cmdline, "L3FWD:", 120)
@@ -459,7 +460,7 @@ class TestFM10kL3fwd(TestCase, IxiaPacketGenerator):
                         rx_pkts = human_read_number(rx_pkts)
                         loss_pkts = human_read_number(loss_pkts)
 
-                        data_row = [frame_size, mode, cores, str(tx_pkts)+"M", str(rx_pkts)+"M", loss_pkts, zero_loss_rate]
+                        data_row = [frame_size, mode, cores, str(tx_pkts), str(rx_pkts), loss_pkts, zero_loss_rate]
                         dts.results_table_add_row(data_row)
                         self.l3fwd_test_results['data'].append(data_row)
                     else:
-- 
1.9.3