* [dts] [PATCH V2 1/2] tests/fortville_rss_granularity_config: move test_dual_vlan to TestSuite_generic_flow_api
2021-09-17 11:55 [dts] [PATCH V2 0/2] *** move test_dual_vlan from Yan Xia
2021-09-17 5:18 ` Peng, Yuan
@ 2021-09-17 11:55 ` Yan Xia
2021-09-17 11:55 ` [dts] [PATCH V2 2/2] tests/generic_flow_api: move test_dual_vlan from fortville_rss_granularity_config to generic_flow_api Yan Xia
2021-09-18 9:01 ` [dts] [PATCH V2 0/2] *** move test_dual_vlan from Chen, LingliX
3 siblings, 0 replies; 7+ messages in thread
From: Yan Xia @ 2021-09-17 11:55 UTC (permalink / raw)
To: dts; +Cc: Yan Xia
move test_dual_vlan from rss_granularity_config to generic_flow_api
Signed-off-by: Yan Xia <yanx.xia@intel.com>
---
| 58 -------------------
1 file changed, 58 deletions(-)
--git a/tests/TestSuite_fortville_rss_granularity_config.py b/tests/TestSuite_fortville_rss_granularity_config.py
index 3ebd5139..a4de80e2 100644
--- a/tests/TestSuite_fortville_rss_granularity_config.py
+++ b/tests/TestSuite_fortville_rss_granularity_config.py
@@ -484,64 +484,6 @@ class TestFortvilleRssGranularityConfig(TestCase):
flag = 0
self.verify(flag, "The two hash values are different, rss_granularity_config failed!")
- def test_dual_vlan(self):
- """
- Test with flow type dual vlan(QinQ).
- """
- flag = 1
-
- # test with different rss queues
- for queue in testQueues:
- self.pmdout.start_testpmd(
- "Default", " --portmask=0x1 --rxq=%d --txq=%d" % (queue, queue))
-
- 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("vlan set extend on 0", "testpmd> ")
- self.dut.send_expect(
- "set_hash_global_config 0 toeplitz l2_payload enable", "testpmd> ")
- self.dut.send_expect("port start all", "testpmd> ")
- res = self.pmdout.wait_link_status_up("all")
- self.verify(res is True, "link is donw")
-
- self.dut.send_expect(
- "port config all rss ether", "testpmd> ")
- self.send_packet(self.itf, "l2_payload")
-
- # set hash input set to "none" by testpmd on dut
- self.dut.send_expect("set_hash_input_set 0 l2_payload none select", "testpmd> ")
- self.send_packet(self.itf, "l2_payload")
-
- # set hash input set by testpmd on dut, enable ovlan
- self.dut.send_expect("set_hash_input_set 0 l2_payload ovlan add", "testpmd> ")
- self.send_packet(self.itf, "l2_payload")
-
- # set hash input set by testpmd on dut, enable ovlan & ivlan
- self.dut.send_expect("set_hash_input_set 0 l2_payload ivlan add", "testpmd> ")
- self.send_packet(self.itf, "l2_payload")
-
- self.dut.send_expect("quit", "# ", 30)
-
- self.result_table_print()
- result_rows = self.result_table_getrows()
- self.verify(len(result_rows) > 1, "There is no data in the table, testcase failed!")
-
- # check the results
- if ((result_rows[1][1] != result_rows[2][1])or(result_rows[1][3] != result_rows[2][3])):
- flag = 0
- self.verify(flag, "The two hash values are different, rss_granularity_config failed!")
- elif ((result_rows[1][1] == result_rows[3][1])or(result_rows[1][3] == result_rows[3][3])):
- flag = 0
- self.verify(flag, "The two hash values are the same, rss_granularity_config failed!")
- elif ((result_rows[1][1] == result_rows[4][1])or(result_rows[1][3] == result_rows[4][3])):
- flag = 0
- self.verify(flag, "The two hash values are the same, rss_granularity_config failed!")
- elif ((result_rows[3][1] == result_rows[4][1])or(result_rows[3][3] == result_rows[4][3])):
- flag = 0
- self.verify(flag, "The two hash values are the same, rss_granularity_config failed!")
-
def test_GRE_keys(self):
"""
Test with 32-bit GRE keys and 24-bit GRE keys.
--
2.32.0
^ permalink raw reply [flat|nested] 7+ messages in thread* [dts] [PATCH V2 2/2] tests/generic_flow_api: move test_dual_vlan from fortville_rss_granularity_config to generic_flow_api
2021-09-17 11:55 [dts] [PATCH V2 0/2] *** move test_dual_vlan from Yan Xia
2021-09-17 5:18 ` Peng, Yuan
2021-09-17 11:55 ` [dts] [PATCH V2 1/2] tests/fortville_rss_granularity_config: move test_dual_vlan to TestSuite_generic_flow_api Yan Xia
@ 2021-09-17 11:55 ` Yan Xia
2021-09-26 8:15 ` Peng, Yuan
2021-09-18 9:01 ` [dts] [PATCH V2 0/2] *** move test_dual_vlan from Chen, LingliX
3 siblings, 1 reply; 7+ messages in thread
From: Yan Xia @ 2021-09-17 11:55 UTC (permalink / raw)
To: dts; +Cc: Yan Xia
move test_dual_vlan from rss_granularity_config to generic_flow_api
Signed-off-by: Yan Xia <yanx.xia@intel.com>
---
tests/TestSuite_generic_flow_api.py | 121 ++++++++++++++++++++++++++++
1 file changed, 121 insertions(+)
diff --git a/tests/TestSuite_generic_flow_api.py b/tests/TestSuite_generic_flow_api.py
index f64a5be5..3ea76b64 100644
--- a/tests/TestSuite_generic_flow_api.py
+++ b/tests/TestSuite_generic_flow_api.py
@@ -59,6 +59,8 @@ from scapy.utils import rdpcap
MAX_VLAN = 4095
MAX_QUEUE = 15
+testQueues = [16]
+reta_lines = []
MAX_VFQUEUE = 3
MAX_PORT = 65535
MAX_TTL = 255
@@ -642,6 +644,80 @@ class TestGeneric_flow_api(TestCase):
self.pkt_obj.append_pkt(pktstr)
self.pkt_obj.send_pkt(self.tester, tx_port=self.tester_itf, count=count)
+ def send_packet(self, itf, tran_type, enable=None):
+ """
+ Sends packets for l2_payload.
+ """
+ global reta_lines
+ global name
+ global value
+ self.tester.scapy_foreground()
+ self.dut.send_expect("start", "testpmd>")
+ mac = self.dut.get_mac_address(0)
+
+ # send packet with different source and dest ip
+ if tran_type == "l2_payload":
+ if enable == "ovlan":
+ packet = r'sendp([Ether(dst="%s", src=get_if_hwaddr("%s"))/Dot1Q(id=0x8100,vlan=4)/Dot1Q(id=0x8100,vlan=2,type=0xaaaa)/Raw(load="x"*60)], iface="%s")' % (
+ mac, itf, itf)
+ elif enable == "ivlan":
+ packet = r'sendp([Ether(dst="%s", src=get_if_hwaddr("%s"))/Dot1Q(id=0x8100,vlan=1)/Dot1Q(id=0x8100,vlan=3,type=0xaaaa)/Raw(load="x"*60)], iface="%s")' % (
+ mac, itf, itf)
+ else:
+ packet = r'sendp([Ether(dst="%s", src=get_if_hwaddr("%s"))/Dot1Q(id=0x8100,vlan=1)/Dot1Q(id=0x8100,vlan=2,type=0xaaaa)/Raw(load="x"*60)], iface="%s")' % (
+ mac, itf, itf)
+ self.tester.scapy_append(packet)
+ self.tester.scapy_execute()
+ time.sleep(.5)
+ else:
+ print("\ntran_type error!\n")
+
+ out = self.dut.get_session_output(timeout=1)
+ self.dut.send_expect("stop", "testpmd>")
+ lines = out.split("\r\n")
+ reta_line = {}
+ # collect the hash result and the queue id
+ for line in lines:
+ line = line.strip()
+ if len(line) != 0 and line.strip().startswith("port "):
+ reta_line = {}
+ rexp = r"port (\d)/queue (\d{1,2}): received (\d) packets"
+ m = re.match(rexp, line.strip())
+ if m:
+ reta_line["port"] = m.group(1)
+ reta_line["queue"] = m.group(2)
+
+ elif len(line) != 0 and line.startswith(("src=",)):
+ for item in line.split("-"):
+ item = item.strip()
+
+ if(item.startswith("RSS hash")):
+ name, value = item.split("=", 1)
+
+ reta_line[name.strip()] = value.strip()
+ reta_lines.append(reta_line)
+
+ self.append_result_table()
+
+ def append_result_table(self):
+ """
+ Append the hash value and queue id into table.
+ """
+
+ global reta_lines
+
+ # append the the hash value and queue id into table
+ self.result_table_create(
+ ['packet index', 'hash value', 'hash index', 'queue id'])
+ i = 0
+
+ for tmp_reta_line in reta_lines:
+
+ # compute the hash result of five tuple into the 7 LSBs value.
+ hash_index = int(tmp_reta_line["RSS hash"], 16)
+ self.result_table_add(
+ [i, tmp_reta_line["RSS hash"], hash_index, tmp_reta_line["queue"]])
+ i = i + 1
def test_syn_filter(self):
"""
Only supported by ixgbe and igb.
@@ -2399,6 +2475,51 @@ class TestGeneric_flow_api(TestCase):
self.sendpkt(pktstr='Ether(dst="%s")/IP()/UDP(dport=32)/Raw("x" * 20)' % self.pf_mac)
self.verify_result("pf", expect_rxpkts="1", expect_queue="2", verify_mac=self.pf_mac)
+ def test_dual_vlan(self):
+ """
+ Test with flow type dual vlan(QinQ).
+ """
+ self.verify(self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g",
+ "carlsville"], "NIC Unsupported: " + str(self.nic))
+ for queue in testQueues:
+ self.pmdout.start_testpmd(
+ "Default", " --portmask=0x1 --rxq=%d --txq=%d" % (queue, queue))
+
+ 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("vlan set extend on 0", "testpmd> ")
+ self.dut.send_expect(
+ "flow create 0 ingress pattern eth / end actions rss types l2-payload end queues end func toeplitz / end", "testpmd> ")
+ self.dut.send_expect("port start all", "testpmd> ")
+ res = self.pmdout.wait_link_status_up("all")
+ self.verify(res is True, "link is down")
+
+ self.send_packet(self.tester_itf, "l2_payload")
+
+ # set flow rss type s-vlan c-vlan set by testpmd on dut
+ self.dut.send_expect("flow create 0 ingress pattern eth / end actions rss types s-vlan c-vlan end key_len 0 queues end / end", "testpmd> ")
+ self.send_packet(self.tester_itf, "l2_payload")
+
+ self.send_packet(self.tester_itf, "l2_payload", enable="ovlan")
+
+ self.send_packet(self.tester_itf, "l2_payload", enable="ivlan")
+
+ self.dut.send_expect("quit", "# ", 30)
+
+ self.result_table_print()
+ result_rows = self.result_table_getrows()
+ self.verify(len(result_rows) > 1, "There is no data in the table, testcase failed!")
+
+ # check the results
+ self.verify(result_rows[1][1] != result_rows[2][1], "The hash values should be different when setting rss to 'l2-payload' and 's-vlan c-vlan and sending the same packets.")
+ self.verify(result_rows[1][1] != result_rows[3][1], "The hash values should be different when setting rss to 'l2-payload' and 's-vlan c-vlan' and sending packets with different ovlan.")
+ self.verify(result_rows[1][1] != result_rows[4][1], "The hash values should be different when setting rss to 'l2-payload' and 's-vlan c-vlan' and sending packets with different ivlan.")
+ self.verify(result_rows[2][1] != result_rows[3][1], "The hash values should be different when setting rss to 's-vlan c-vlan' and sending packet with different ovlan.")
+ self.verify(result_rows[2][1] != result_rows[4][1], "The hash values should be different when setting rss to 's-vlan c-vlan' and sending packet with different ivlan.")
+ self.verify(result_rows[3][1] != result_rows[4][1], "The hash values should be different when setting rss to 's-vlan c-vlan' and sending packet with different ovlan and ivlan")
+
def tear_down(self):
"""
Run after each test case.
--
2.32.0
^ permalink raw reply [flat|nested] 7+ messages in thread