test suite reviews and discussions
 help / color / mirror / Atom feed
* [dts] [PATCH] tests: Add check items for symetric case
@ 2019-01-14 11:03 Peng Yuan
  0 siblings, 0 replies; only message in thread
From: Peng Yuan @ 2019-01-14 11:03 UTC (permalink / raw)
  To: dts; +Cc: Peng Yuan

Add check items for symetric case of TestSuite_pmdrss_hash.py

Signed-off-by: Peng Yuan <yuan.peng@intel.com>

diff --git a/tests/TestSuite_pmdrss_hash.py b/tests/TestSuite_pmdrss_hash.py
index 07c47b4..ecafe3a 100644
--- a/tests/TestSuite_pmdrss_hash.py
+++ b/tests/TestSuite_pmdrss_hash.py
@@ -41,7 +41,7 @@ import random
 import re
 import utils
 
-testQueues = [16]
+queue = 16
 reta_entries = []
 reta_num = 128
 # Use scapy to send packets with different source and dest ip.
@@ -389,19 +389,23 @@ class TestPmdrssHash(TestCase):
 
         i = 0
         for tmp_reta_line in reta_lines:
-            status = "true"
+            status = "false"
             # compute the hash result of five tuple into the 7 LSBs value.
             hash_index = int(tmp_reta_line["RSS hash"], 16) % reta_num
-
-            if(i % 2 == 1):
-                if(pre_RSS_hash == tmp_reta_line["RSS hash"]):
-                    status = "true"
-                    result.insert((i - 1) / 2, 0)
-                else:
-                    status = "fail"
-                    result.insert((i - 1) / 2, 1)
-            pre_RSS_hash = tmp_reta_line["RSS hash"]
-
+            if(reta_entries[hash_index] == int(tmp_reta_line["queue"])):
+                status = "true"
+                result.insert(i, 0)
+                if(i % 2 == 1):
+                    if(pre_RSS_hash == tmp_reta_line["RSS hash"]):
+                        status = "true"
+                        result.insert(len(reta_lines) + (i - 1) / 2, 0)
+                    else:
+                        status = "fail"
+                        result.insert(len(reta_lines) + (i - 1) / 2, 1)
+                pre_RSS_hash = tmp_reta_line["RSS hash"]
+            else:
+                status = "fail"
+                result.insert(i, 1)
             self.result_table_add(
                 [i, tmp_reta_line["RSS hash"], hash_index, reta_entries[hash_index], tmp_reta_line["queue"], status])
             i = i + 1
@@ -459,32 +463,30 @@ class TestPmdrssHash(TestCase):
         self.dut.kill_all()
 
         # test with different rss queues
-        for queue in testQueues:
+        self.dut.send_expect(
+            "./%s/app/testpmd  -c fffff -n %d -- -i --coremask=0xffffe --rxq=%d --txq=%d" %
+            (self.target, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120)
+
+        for iptype, rsstype in iptypes.items():
+            self.dut.send_expect("set verbose 8", "testpmd> ")
+            self.dut.send_expect("set fwd rxonly", "testpmd> ")
             self.dut.send_expect(
-                "./%s/app/testpmd  -c fffff -n %d -- -i --coremask=0xffffe --rxq=%d --txq=%d" %
-                (self.target, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120)
+                "set nbcore %d" % (queue + 1), "testpmd> ")
 
-            for iptype, rsstype in iptypes.items():
-                self.dut.send_expect("set verbose 8", "testpmd> ")
-                self.dut.send_expect("set fwd rxonly", "testpmd> ")
+            self.dut.send_expect("port stop all", "testpmd> ")
+            self.dut.send_expect(
+                "set_hash_global_config  0 toeplitz %s enable" % iptype, "testpmd> ")
+            self.dut.send_expect("port start all", "testpmd> ")
+            out = self.dut.send_expect(
+                "port config all rss %s" % rsstype, "testpmd> ")
+            self.verify("error" not in out, "Configuration of RSS hash failed: Invalid argument")
+            # configure the reta with specific mappings.
+            for i in range(reta_num):
+                reta_entries.insert(i, random.randint(0, queue - 1))
                 self.dut.send_expect(
-                    "set nbcore %d" % (queue + 1), "testpmd> ")
+                    "port config 0 rss reta (%d,%d)" % (i, reta_entries[i]), "testpmd> ")
 
-                self.dut.send_expect("port stop all", "testpmd> ")
-                # self.dut.send_expect("port config all rss ip", "testpmd> ")
-                self.dut.send_expect(
-                    "set_hash_global_config  0 toeplitz %s enable" % iptype, "testpmd> ")
-                self.dut.send_expect("port start all", "testpmd> ")
-                out = self.dut.send_expect(
-                    "port config all rss %s" % rsstype, "testpmd> ")
-                self.verify("error" not in out, "Configuration of RSS hash failed: Invalid argument")
-                # configure the reta with specific mappings.
-                for i in range(reta_num):
-                    reta_entries.insert(i, random.randint(0, queue - 1))
-                    self.dut.send_expect(
-                        "port config 0 rss reta (%d,%d)" % (i, reta_entries[i]), "testpmd> ")
-
-                self.send_packet(itf, iptype)
+            self.send_packet(itf, iptype)
 
         self.dut.send_expect("quit", "# ", 30)
 
@@ -510,36 +512,35 @@ class TestPmdrssHash(TestCase):
         self.dut.kill_all()
 
         # test with different rss queues
-        for queue in testQueues:
-            self.dut.send_expect(
-                "./%s/app/testpmd  -c fffff -n %d -- -i --coremask=0xffffe --rxq=%d --txq=%d" %
-                (self.target, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120)
+        self.dut.send_expect(
+            "./%s/app/testpmd  -c fffff -n %d -- -i --coremask=0xffffe --rxq=%d --txq=%d" %
+            (self.target, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120)
 
-            for iptype, rsstype in iptypes.items():
-                self.dut.send_expect("set verbose 8", "testpmd> ")
-                self.dut.send_expect("set fwd rxonly", "testpmd> ")
-                self.dut.send_expect(
-                    "set nbcore %d" % (queue + 1), "testpmd> ")
+        for iptype, rsstype in iptypes.items():
+            self.dut.send_expect("set verbose 8", "testpmd> ")
+            self.dut.send_expect("set fwd rxonly", "testpmd> ")
+            self.dut.send_expect(
+                "set nbcore %d" % (queue + 1), "testpmd> ")
 
-                self.dut.send_expect("port stop all", "testpmd> ")
-                self.dut.send_expect(
-                    "set_hash_global_config 0 toeplitz %s enable" % iptype, "testpmd> ")
+            self.dut.send_expect("port stop all", "testpmd> ")
+            self.dut.send_expect(
+                "set_hash_global_config 0 toeplitz %s enable" % iptype, "testpmd> ")
+            self.dut.send_expect(
+                "set_sym_hash_ena_per_port 0 enable", "testpmd> ")
+            self.dut.send_expect("port start all", "testpmd> ")
+            out = self.dut.send_expect(
+                "port config all rss %s" % rsstype, "testpmd> ")
+            self.verify("error" not in out, "Configuration of RSS hash failed: Invalid argument")
+
+            # configure the reta with specific mappings.
+            for i in range(reta_num):
+                reta_entries.insert(i, random.randint(0, queue - 1))
                 self.dut.send_expect(
-                    "set_sym_hash_ena_per_port 0 enable", "testpmd> ")
-                self.dut.send_expect("port start all", "testpmd> ")
-                out = self.dut.send_expect(
-                    "port config all rss %s" % rsstype, "testpmd> ")
-                self.verify("error" not in out, "Configuration of RSS hash failed: Invalid argument")
-
-                # configure the reta with specific mappings.
-                for i in range(reta_num):
-                    reta_entries.insert(i, random.randint(0, queue - 1))
-                    self.dut.send_expect(
-                        "port config 0 rss reta (%d,%d)" % (i, reta_entries[i]), "testpmd> ")
+                    "port config 0 rss reta (%d,%d)" % (i, reta_entries[i]), "testpmd> ")
 
-                self.send_packet_symmetric(itf, iptype)
+            self.send_packet_symmetric(itf, iptype)
 
-            self.dut.send_expect("quit", "# ", 30)
+        self.dut.send_expect("quit", "# ", 30)
 
     def test_simple(self):
         dutPorts = self.dut.get_ports(self.nic)
@@ -566,36 +567,34 @@ class TestPmdrssHash(TestCase):
         self.dut.kill_all()
 
         # test with different rss queues
-        for queue in testQueues:
+        self.dut.send_expect(
+            "./%s/app/testpmd  -c fffff -n %d -- -i --coremask=0xffffe --rxq=%d --txq=%d" %
+            (self.target, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120)
+
+        for iptype, rsstype in iptypes.items():
+            self.logger.info("***********************%s rss test********************************" % iptype)
+            self.dut.send_expect("set verbose 8", "testpmd> ")
+            self.dut.send_expect("set fwd rxonly", "testpmd> ")
             self.dut.send_expect(
-                "./%s/app/testpmd  -c fffff -n %d -- -i --coremask=0xffffe --rxq=%d --txq=%d" %
-                (self.target, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120)
+                "set nbcore %d" % (queue + 1), "testpmd> ")
 
-            for iptype, rsstype in iptypes.items():
-                self.logger.info("***********************%s rss test********************************" % iptype)
-                self.dut.send_expect("set verbose 8", "testpmd> ")
-                self.dut.send_expect("set fwd rxonly", "testpmd> ")
+            self.dut.send_expect("port stop all", "testpmd> ")
+            # some nic not support change hash algorithm
+            if self.kdriver not in ["fm10k"]:
+                self.dut.send_expect(
+                    "set_hash_global_config 0 simple_xor %s enable" % iptype, "testpmd> ")
+            self.dut.send_expect("port start all", "testpmd> ")
+            out = self.dut.send_expect(
+                "port config all rss %s" % rsstype, "testpmd> ")
+            self.verify("error" not in out, "Configuration of RSS hash failed: Invalid argument")
+            # configure the reta with specific mappings.
+            for i in range(reta_num):
+                reta_entries.insert(i, random.randint(0, queue - 1))
                 self.dut.send_expect(
-                    "set nbcore %d" % (queue + 1), "testpmd> ")
-
-                self.dut.send_expect("port stop all", "testpmd> ")
-                # some nic not support change hash algorithm
-                if self.kdriver not in ["fm10k"]:
-                    self.dut.send_expect(
-                        "set_hash_global_config 0 simple_xor %s enable" % iptype, "testpmd> ")
-                self.dut.send_expect("port start all", "testpmd> ")
-                out = self.dut.send_expect(
-                    "port config all rss %s" % rsstype, "testpmd> ")
-                self.verify("error" not in out, "Configuration of RSS hash failed: Invalid argument")
-                # configure the reta with specific mappings.
-                for i in range(reta_num):
-                    reta_entries.insert(i, random.randint(0, queue - 1))
-                    self.dut.send_expect(
-                        "port config 0 rss reta (%d,%d)" % (i, reta_entries[i]), "testpmd> ")
-
-                self.send_packet(itf, iptype)
-
-            self.dut.send_expect("quit", "# ", 30)
+                    "port config 0 rss reta (%d,%d)" % (i, reta_entries[i]), "testpmd> ")
+            self.send_packet(itf, iptype)
+
+        self.dut.send_expect("quit", "# ", 30)
 
     def test_simple_symmetric(self):
 
@@ -619,37 +618,34 @@ class TestPmdrssHash(TestCase):
         self.dut.kill_all()
 
         # test with different rss queues
-        for queue in testQueues:
-            self.dut.send_expect(
-                "./%s/app/testpmd  -c fffff -n %d -- -i --coremask=0xffffe --rxq=%d --txq=%d" %
-                (self.target, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120)
+        self.dut.send_expect(
+            "./%s/app/testpmd  -c fffff -n %d -- -i --coremask=0xffffe --rxq=%d --txq=%d" %
+            (self.target, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120)
 
-            for iptype, rsstype in iptypes.items():
-                self.dut.send_expect("set verbose 8", "testpmd> ")
-                self.dut.send_expect("set fwd rxonly", "testpmd> ")
-                self.dut.send_expect(
-                    "set nbcore %d" % (queue + 1), "testpmd> ")
+        for iptype, rsstype in iptypes.items():
+            self.dut.send_expect("set verbose 8", "testpmd> ")
+            self.dut.send_expect("set fwd rxonly", "testpmd> ")
+            self.dut.send_expect(
+                "set nbcore %d" % (queue + 1), "testpmd> ")
 
-                self.dut.send_expect("port stop all", "testpmd> ")
-                # self.dut.send_expect("port config all rss ip", "testpmd> ")
-                self.dut.send_expect(
-                    "set_hash_global_config 0 simple_xor %s enable" % iptype, "testpmd> ")
+            self.dut.send_expect("port stop all", "testpmd> ")
+            self.dut.send_expect(
+                "set_hash_global_config 0 simple_xor %s enable" % iptype, "testpmd> ")
+            self.dut.send_expect(
+                "set_sym_hash_ena_per_port 0 enable", "testpmd> ")
+            self.dut.send_expect("port start all", "testpmd> ")
+
+            out = self.dut.send_expect(
+                "port config all rss %s" % rsstype, "testpmd> ")
+            self.verify("error" not in out, "Configuration of RSS hash failed: Invalid argument")
+            # configure the reta with specific mappings.
+            for i in range(reta_num):
+                reta_entries.insert(i, random.randint(0, queue - 1))
                 self.dut.send_expect(
-                    "set_sym_hash_ena_per_port 0 enable", "testpmd> ")
-                self.dut.send_expect("port start all", "testpmd> ")
-
-                out = self.dut.send_expect(
-                    "port config all rss %s" % rsstype, "testpmd> ")
-                self.verify("error" not in out, "Configuration of RSS hash failed: Invalid argument")
-                # configure the reta with specific mappings.
-                for i in range(reta_num):
-                    reta_entries.insert(i, random.randint(0, queue - 1))
-                    self.dut.send_expect(
-                        "port config 0 rss reta (%d,%d)" % (i, reta_entries[i]), "testpmd> ")
+                    "port config 0 rss reta (%d,%d)" % (i, reta_entries[i]), "testpmd> ")
+            self.send_packet_symmetric(itf, iptype)
 
-                self.send_packet_symmetric(itf, iptype)
-
-            self.dut.send_expect("quit", "# ", 30)
+        self.dut.send_expect("quit", "# ", 30)
 
     def test_dynamic_rss_bond_config(self):
         
-- 
2.5.0

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2019-01-14 11:00 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-14 11:03 [dts] [PATCH] tests: Add check items for symetric case Peng Yuan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).