Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/111940/?format=api
{ "id": 111940, "url": "https://patches.dpdk.org/api/patches/111940/?format=api", "web_url": "https://patches.dpdk.org/project/dts/patch/20220527032045.529149-1-weix.ling@intel.com/", "project": { "id": 3, "url": "https://patches.dpdk.org/api/projects/3/?format=api", "name": "DTS", "link_name": "dts", "list_id": "dts.dpdk.org", "list_email": "dts@dpdk.org", "web_url": "", "scm_url": "git://dpdk.org/tools/dts", "webscm_url": "http://git.dpdk.org/tools/dts/", "list_archive_url": "https://inbox.dpdk.org/dts", "list_archive_url_format": "https://inbox.dpdk.org/dts/{}", "commit_url_format": "" }, "msgid": "<20220527032045.529149-1-weix.ling@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dts/20220527032045.529149-1-weix.ling@intel.com", "date": "2022-05-27T03:20:45", "name": "[V1,2/2] tests/vm2vm_virtio_user: revert testcase 12 and optimize code", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "8217a6fbdc1e60da4a2a24cdde384a70611f7e73", "submitter": { "id": 1828, "url": "https://patches.dpdk.org/api/people/1828/?format=api", "name": "Ling, WeiX", "email": "weix.ling@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dts/patch/20220527032045.529149-1-weix.ling@intel.com/mbox/", "series": [ { "id": 23195, "url": "https://patches.dpdk.org/api/series/23195/?format=api", "web_url": "https://patches.dpdk.org/project/dts/list/?series=23195", "date": "2022-05-27T03:20:26", "name": "vm2vm_virtio_user: revert testcase 12 and optimize code", "version": 1, "mbox": "https://patches.dpdk.org/series/23195/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/111940/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/111940/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dts-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id A523CA055C;\n\tFri, 27 May 2022 05:21:40 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 9C21740E50;\n\tFri, 27 May 2022 05:21:40 +0200 (CEST)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n by mails.dpdk.org (Postfix) with ESMTP id 1436D40DF7\n for <dts@dpdk.org>; Fri, 27 May 2022 05:21:37 +0200 (CEST)", "from orsmga008.jf.intel.com ([10.7.209.65])\n by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 26 May 2022 20:21:36 -0700", "from unknown (HELO localhost.localdomain) ([10.239.251.222])\n by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 26 May 2022 20:21:35 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1653621698; x=1685157698;\n h=from:to:cc:subject:date:message-id:mime-version:\n content-transfer-encoding;\n bh=7ctYOzuNBa/Cfr5+LQ2pmIbilS1xhuFYQG/JhYkY76A=;\n b=EBLA8k9U96y6bRAA0PiscNO6Rh0uw3+bH16PF/reuCFrznfodoBkNJpD\n e6v8c453hayqkVdRQcv7Mcz6J6BZGQhl1pVSsKMB/AbLo2dgF4v9AKNP+\n 8ax0Ay+DR1B8UCROrYFn4F8RbqGi81eKPnar1OTt4nOzPBy5TKGD5EBtj\n 79vQMR6x26kyG2BM472lgKowEAimSoMd+YshS7oTM4KAxil6IeCvOl/AB\n 82Lt61H9NTgC8B0s34TfbROonQCmuUATwunhVXxZh0Ef+xuTVVXFk4G1n\n eS5iGY87lw6V9dZhM3rB+glyY+CG1ador2SDZ5c1Pu7IdQOR1+HxY8XDV A==;", "X-IronPort-AV": [ "E=McAfee;i=\"6400,9594,10359\"; a=\"274371814\"", "E=Sophos;i=\"5.91,254,1647327600\"; d=\"scan'208\";a=\"274371814\"", "E=Sophos;i=\"5.91,254,1647327600\"; d=\"scan'208\";a=\"603610808\"" ], "From": "Wei Ling <weix.ling@intel.com>", "To": "dts@dpdk.org", "Cc": "Wei Ling <weix.ling@intel.com>", "Subject": "[dts][PATCH V1 2/2] tests/vm2vm_virtio_user: revert testcase 12 and\n optimize code", "Date": "Thu, 26 May 2022 23:20:45 -0400", "Message-Id": "<20220527032045.529149-1-weix.ling@intel.com>", "X-Mailer": "git-send-email 2.25.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dts@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "test suite reviews and discussions <dts.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dts>,\n <mailto:dts-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dts/>", "List-Post": "<mailto:dts@dpdk.org>", "List-Help": "<mailto:dts-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dts>,\n <mailto:dts-request@dpdk.org?subject=subscribe>", "Errors-To": "dts-bounces@dpdk.org" }, "content": "Revert testcase 12 and optimize code, such as delete the useless code.\n\nSigned-off-by: Wei Ling <weix.ling@intel.com>\n---\n tests/TestSuite_vm2vm_virtio_user.py | 278 +++++++--------------------\n 1 file changed, 70 insertions(+), 208 deletions(-)", "diff": "diff --git a/tests/TestSuite_vm2vm_virtio_user.py b/tests/TestSuite_vm2vm_virtio_user.py\nindex 5b833644..4245f96d 100644\n--- a/tests/TestSuite_vm2vm_virtio_user.py\n+++ b/tests/TestSuite_vm2vm_virtio_user.py\n@@ -42,7 +42,6 @@ class TestVM2VMVirtioUser(TestCase):\n self.vhost_user_pmd = PmdOutput(self.dut, self.vhost_user)\n self.virtio_user0_pmd = PmdOutput(self.dut, self.virtio_user0)\n self.virtio_user1_pmd = PmdOutput(self.dut, self.virtio_user1)\n- self.dut.restore_interfaces()\n self.dump_port = \"device_id=net_virtio_user1\"\n \n def set_up(self):\n@@ -172,62 +171,6 @@ class TestVM2VMVirtioUser(TestCase):\n self.virtio_user0_pmd.execute_cmd(\"set txpkts 2000\")\n self.virtio_user0_pmd.execute_cmd(\"start tx_first 1\")\n \n- def send_251_64_and_32_8k_pkts(self):\n- \"\"\"\n- send 251 small packets and 32 8K packets from virtio_user0 testpmd\n- \"\"\"\n- self.virtio_user0_pmd.execute_cmd(\"set burst 1\")\n- self.virtio_user0_pmd.execute_cmd(\"start tx_first 27\")\n- self.virtio_user0_pmd.execute_cmd(\"stop\")\n- self.virtio_user0_pmd.execute_cmd(\"set burst 32\")\n- self.virtio_user0_pmd.execute_cmd(\"start tx_first 7\")\n- self.virtio_user0_pmd.execute_cmd(\"stop\")\n- self.virtio_user0_pmd.execute_cmd(\"set txpkts 2000,2000,2000,2000\")\n- self.virtio_user0_pmd.execute_cmd(\"start tx_first 1\")\n- self.virtio_user0_pmd.execute_cmd(\"stop\")\n-\n- def send_251_960byte_and_32_64byte_pkts(self):\n- \"\"\"\n- imix small pkts\n- send 960byte and 64byte length packets from virtio_user0 testpmd\n- \"\"\"\n- self.virtio_user0_pmd.execute_cmd(\"set burst 1\")\n- self.virtio_user0_pmd.execute_cmd(\"set txpkts 64,128,256,512\")\n- self.virtio_user0_pmd.execute_cmd(\"start tx_first 27\")\n- self.virtio_user0_pmd.execute_cmd(\"stop\")\n- self.virtio_user0_pmd.execute_cmd(\"set burst 32\")\n- self.virtio_user0_pmd.execute_cmd(\"start tx_first 7\")\n- self.virtio_user0_pmd.execute_cmd(\"stop\")\n- self.virtio_user0_pmd.execute_cmd(\"set txpkts 64\")\n- self.virtio_user0_pmd.execute_cmd(\"start tx_first 1\")\n- self.virtio_user0_pmd.execute_cmd(\"stop\")\n-\n- def send_27_4640byte_and_224_64byte_pkts(self):\n- \"\"\"\n- send 27 4640byte and 224 64byte length packets from virtio_user0 testpmd\n- \"\"\"\n- self.virtio_user0_pmd.execute_cmd(\"set burst 1\")\n- self.virtio_user0_pmd.execute_cmd(\"set txpkts 64,256,2000,64,256,2000\")\n- self.virtio_user0_pmd.execute_cmd(\"start tx_first 27\")\n- self.virtio_user0_pmd.execute_cmd(\"stop\")\n- self.virtio_user0_pmd.execute_cmd(\"set burst 32\")\n- self.virtio_user0_pmd.execute_cmd(\"set txpkts 64\")\n- self.virtio_user0_pmd.execute_cmd(\"start tx_first 7\")\n- self.virtio_user0_pmd.execute_cmd(\"stop\")\n-\n- def send_224_64byte_and_27_4640byte_pkts(self):\n- \"\"\"\n- send 224 64byte and 27 4640byte length packets from virtio_user0 testpmd\n- \"\"\"\n- self.virtio_user0_pmd.execute_cmd(\"set burst 32\")\n- self.virtio_user0_pmd.execute_cmd(\"set txpkts 64\")\n- self.virtio_user0_pmd.execute_cmd(\"start tx_first 7\")\n- self.virtio_user0_pmd.execute_cmd(\"stop\")\n- self.virtio_user0_pmd.execute_cmd(\"set burst 1\")\n- self.virtio_user0_pmd.execute_cmd(\"set txpkts 64,256,2000,64,256,2000\")\n- self.virtio_user0_pmd.execute_cmd(\"start tx_first 27\")\n- self.virtio_user0_pmd.execute_cmd(\"stop\")\n-\n def launch_pdump_to_capture_pkt(self, dump_port, file_prefix, filename):\n \"\"\"\n launch pdump app with dump_port and file_prefix\n@@ -236,7 +179,7 @@ class TestVM2VMVirtioUser(TestCase):\n if dump the virtio-testpmd, the virtio-testpmd should started before launch pdump\n \"\"\"\n eal_params = self.dut.create_eal_parameters(\n- cores=\"Default\", prefix=file_prefix, fixed_prefix=True\n+ cores=\"Default\", prefix=file_prefix, fixed_prefix=True, ports=[]\n )\n command_line = (\n self.app_pdump\n@@ -299,40 +242,24 @@ class TestVM2VMVirtioUser(TestCase):\n self.virtio_user0_pmd.execute_cmd(\"set txpkts 2000,2000,2000,2000\")\n self.virtio_user0_pmd.execute_cmd(\"start tx_first 1\")\n \n- def check_packet_payload_valid(\n- self, filename, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- ):\n+ def check_packet_payload_valid(self, filename, check_dict):\n \"\"\"\n check the payload is valid\n \"\"\"\n- # stop pdump\n- total_pkts_num = small_pkts_num + large_8k_pkts_num + large_2k_pkts_num\n- time.sleep(20)\n self.pdump_user.send_expect(\"^c\", \"# \", 60)\n- # quit testpmd\n- self.quit_all_testpmd()\n- time.sleep(2)\n- self.dut.session.copy_file_from(src=\"%s\" % filename, dst=\"%s\" % filename)\n+ self.dut.session.copy_file_from(\n+ src=filename, dst=filename\n+ )\n pkt = Packet()\n pkts = pkt.read_pcapfile(filename)\n- self.verify(\n- pkts is not None and len(pkts) == total_pkts_num,\n- \"The virtio/vhost do not capture all the packets\"\n- \"expect pkt num is: %d, actual pkt num is: %d\"\n- % (total_pkts_num, len(pkts)),\n- )\n- for i in range(len(pkts)):\n- if i < small_pkts_num:\n- pkt_len = 64\n- elif i >= small_pkts_num and i < small_pkts_num + large_8k_pkts_num:\n- pkt_len = 8000\n- else:\n- pkt_len = 2000\n+ for key, value in check_dict.items():\n+ count = 0\n+ for i in range(len(pkts)):\n+ if len(pkts[i]) == key:\n+ count += 1\n self.verify(\n- len(pkts[i]) == pkt_len,\n- \"the received pkts len is wrong,\"\n- \"the received pkt len is: %d, expect pkt len is: %d\"\n- % (len(pkts[i]), pkt_len),\n+ value == count,\n+ \"pdump file: have not include enough packets, length %d, count: %d\" % (key, count),\n )\n \n def check_vhost_and_virtio_pkts_content(self):\n@@ -402,30 +329,23 @@ class TestVM2VMVirtioUser(TestCase):\n Test Case 1: packed virtqueue vm2vm mergeable path test\n about packed virtqueue path, the 8k length pkt will occupies 1 ring since indirect feature enabled\n \"\"\"\n- small_pkts_num = 251\n- large_8k_pkts_num = 5\n- large_2k_pkts_num = 32\n path_mode = \"packed_vq=1,mrg_rxbuf=1,in_order=0\"\n ringsize = 256\n extern_params = \"\"\n # get dump pcap file of virtio\n # the virtio0 will send 283 pkts, but the virtio only will received 256 pkts\n- # then resend 32 large pkts, all will received\n+ # then resend 32(5 8k and 32 2k) large pkts, all will received\n self.logger.info(\"check pcap file info about virtio\")\n self.get_dump_file_of_virtio_user(path_mode, extern_params, ringsize)\n self.send_32_2k_pkts_from_virtio0()\n- self.check_packet_payload_valid(\n- self.dump_virtio_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ check_dict = {64: 251, 2000: 32, 8000: 5}\n+ self.check_packet_payload_valid(self.dump_virtio_pcap, check_dict)\n # get dump pcap file of vhost\n self.logger.info(\"check pcap file info about vhost\")\n+ self.quit_all_testpmd()\n self.get_dump_file_of_vhost_user(path_mode, extern_params, ringsize)\n self.send_32_2k_pkts_from_virtio0()\n- self.check_packet_payload_valid(\n- self.dump_vhost_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ self.check_packet_payload_valid(self.dump_vhost_pcap, check_dict)\n self.logger.info(\"diff the pcap file of vhost and virtio\")\n self.check_vhost_and_virtio_pkts_content()\n \n@@ -434,9 +354,6 @@ class TestVM2VMVirtioUser(TestCase):\n Test Case 2: packed virtqueue vm2vm inorder mergeable path test\n about packed inorder mergeable path, the 8k length pkt will occupies 1 ring since indirect feature enabled\n \"\"\"\n- small_pkts_num = 251\n- large_8k_pkts_num = 5\n- large_2k_pkts_num = 0\n path_mode = \"packed_vq=1,mrg_rxbuf=1,in_order=1\"\n ringsize = 256\n extern_params = \"\"\n@@ -444,17 +361,13 @@ class TestVM2VMVirtioUser(TestCase):\n # the virtio0 will send 283 pkts, but the virtio only will received 256 pkts\n self.logger.info(\"check pcap file info about virtio\")\n self.get_dump_file_of_virtio_user(path_mode, extern_params, ringsize)\n- self.check_packet_payload_valid(\n- self.dump_virtio_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ check_dict = {64: 251, 2000: 0, 8000: 5}\n+ self.check_packet_payload_valid(self.dump_virtio_pcap, check_dict)\n # get dump pcap file of vhost\n self.logger.info(\"check pcap file info about vhost\")\n+ self.quit_all_testpmd()\n self.get_dump_file_of_vhost_user(path_mode, extern_params, ringsize)\n- self.check_packet_payload_valid(\n- self.dump_vhost_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ self.check_packet_payload_valid(self.dump_vhost_pcap, check_dict)\n self.logger.info(\"diff the pcap file of vhost and virtio\")\n self.check_vhost_and_virtio_pkts_content()\n \n@@ -463,9 +376,6 @@ class TestVM2VMVirtioUser(TestCase):\n Test Case 3: packed virtqueue vm2vm non-mergeable path test\n about non-mergeable path, it can not received large pkts\n \"\"\"\n- small_pkts_num = 251\n- large_8k_pkts_num = 0\n- large_2k_pkts_num = 0\n path_mode = \"packed_vq=1,mrg_rxbuf=0,in_order=0\"\n ringsize = 256\n extern_params = \"\"\n@@ -474,17 +384,13 @@ class TestVM2VMVirtioUser(TestCase):\n # the no-mergeable path can not received large pkts\n self.logger.info(\"check pcap file info about virtio\")\n self.get_dump_file_of_virtio_user(path_mode, extern_params, ringsize)\n- self.check_packet_payload_valid(\n- self.dump_virtio_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ check_dict = {64: 251, 2000: 0, 8000: 0}\n+ self.check_packet_payload_valid(self.dump_virtio_pcap, check_dict)\n # get dump pcap file of vhost\n self.logger.info(\"check pcap file info about vhost\")\n+ self.quit_all_testpmd()\n self.get_dump_file_of_vhost_user(path_mode, extern_params, ringsize)\n- self.check_packet_payload_valid(\n- self.dump_vhost_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ self.check_packet_payload_valid(self.dump_vhost_pcap, check_dict)\n self.logger.info(\"diff the pcap file of vhost and virtio\")\n self.check_vhost_and_virtio_pkts_content()\n \n@@ -493,9 +399,6 @@ class TestVM2VMVirtioUser(TestCase):\n Test Case 4: packed virtqueue vm2vm inorder non-mergeable path test\n about non-mergeable path, it can not received large pkts\n \"\"\"\n- small_pkts_num = 251\n- large_8k_pkts_num = 0\n- large_2k_pkts_num = 0\n path_mode = \"packed_vq=1,mrg_rxbuf=0,in_order=1,vectorized=1\"\n extern_params = \"--rx-offloads=0x10\"\n ringsize = 256\n@@ -504,17 +407,13 @@ class TestVM2VMVirtioUser(TestCase):\n # the no-mergeable path can not received large pkts\n self.logger.info(\"check pcap file info about virtio\")\n self.get_dump_file_of_virtio_user(path_mode, extern_params, ringsize)\n- self.check_packet_payload_valid(\n- self.dump_virtio_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ check_dict = {64: 251, 2000: 0, 8000: 0}\n+ self.check_packet_payload_valid(self.dump_virtio_pcap, check_dict)\n # get dump pcap file of vhost\n self.logger.info(\"check pcap file info about vhost\")\n+ self.quit_all_testpmd()\n self.get_dump_file_of_vhost_user(path_mode, extern_params, ringsize)\n- self.check_packet_payload_valid(\n- self.dump_vhost_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ self.check_packet_payload_valid(self.dump_vhost_pcap, check_dict)\n self.logger.info(\"diff the pcap file of vhost and virtio\")\n self.check_vhost_and_virtio_pkts_content()\n \n@@ -523,9 +422,6 @@ class TestVM2VMVirtioUser(TestCase):\n Test Case 10: packed virtqueue vm2vm inorder non-mergeable path test\n about non-mergeable path, it can not received large pkts\n \"\"\"\n- small_pkts_num = 251\n- large_8k_pkts_num = 0\n- large_2k_pkts_num = 0\n path_mode = \"packed_vq=1,mrg_rxbuf=0,in_order=1,vectorized=1\"\n extern_params = \"\"\n ringsize = 256\n@@ -534,17 +430,13 @@ class TestVM2VMVirtioUser(TestCase):\n # the no-mergeable path can not received large pkts\n self.logger.info(\"check pcap file info about virtio\")\n self.get_dump_file_of_virtio_user(path_mode, extern_params, ringsize)\n- self.check_packet_payload_valid(\n- self.dump_virtio_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ check_dict = {64: 251, 2000: 0, 8000: 0}\n+ self.check_packet_payload_valid(self.dump_virtio_pcap, check_dict)\n # get dump pcap file of vhost\n self.logger.info(\"check pcap file info about vhost\")\n+ self.quit_all_testpmd()\n self.get_dump_file_of_vhost_user(path_mode, extern_params, ringsize)\n- self.check_packet_payload_valid(\n- self.dump_vhost_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ self.check_packet_payload_valid(self.dump_vhost_pcap, check_dict)\n self.logger.info(\"diff the pcap file of vhost and virtio\")\n self.check_vhost_and_virtio_pkts_content()\n \n@@ -555,9 +447,6 @@ class TestVM2VMVirtioUser(TestCase):\n Test Case 11: packed virtqueue vm2vm inorder non-mergeable path test\n about non-mergeable path, it can not received large pkts\n \"\"\"\n- small_pkts_num = 251\n- large_8k_pkts_num = 0\n- large_2k_pkts_num = 0\n path_mode = \"packed_vq=1,mrg_rxbuf=0,in_order=1,vectorized=1\"\n extern_params = \"\"\n ringsize = 255\n@@ -566,17 +455,13 @@ class TestVM2VMVirtioUser(TestCase):\n # the no-mergeable path can not received large pkts\n self.logger.info(\"check pcap file info about virtio\")\n self.get_dump_file_of_virtio_user(path_mode, extern_params, ringsize)\n- self.check_packet_payload_valid(\n- self.dump_virtio_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ check_dict = {64: 251, 2000: 0, 8000: 0}\n+ self.check_packet_payload_valid(self.dump_virtio_pcap, check_dict)\n # get dump pcap file of vhost\n self.logger.info(\"check pcap file info about vhost\")\n+ self.quit_all_testpmd()\n self.get_dump_file_of_vhost_user(path_mode, extern_params, ringsize)\n- self.check_packet_payload_valid(\n- self.dump_vhost_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ self.check_packet_payload_valid(self.dump_vhost_pcap, check_dict)\n self.logger.info(\"diff the pcap file of vhost and virtio\")\n self.check_vhost_and_virtio_pkts_content()\n \n@@ -586,9 +471,6 @@ class TestVM2VMVirtioUser(TestCase):\n about split virtqueue path, the 8k length pkt will occupies 1 ring,\n so, as the rxt=256, if received pkts include 8k chain pkt, also will received up to 256 pkts\n \"\"\"\n- small_pkts_num = 251\n- large_8k_pkts_num = 5\n- large_2k_pkts_num = 32\n path_mode = \"packed_vq=0,mrg_rxbuf=1,in_order=0\"\n ringsize = 256\n extern_params = \"\"\n@@ -596,20 +478,16 @@ class TestVM2VMVirtioUser(TestCase):\n # the virtio0 will send 283 pkts, but the virtio only will received 256 pkts\n # then virtio send 32 large pkts, the virtio will all received\n self.logger.info(\"check pcap file info about virtio\")\n+ check_dict = {64: 251, 2000: 32, 8000: 5}\n self.get_dump_file_of_virtio_user(path_mode, extern_params, ringsize)\n self.send_32_2k_pkts_from_virtio0()\n- self.check_packet_payload_valid(\n- self.dump_virtio_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ self.check_packet_payload_valid(self.dump_virtio_pcap, check_dict)\n # get dump pcap file of vhost\n self.logger.info(\"check pcap file info about vhost\")\n+ self.quit_all_testpmd()\n self.get_dump_file_of_vhost_user(path_mode, extern_params, ringsize)\n self.send_32_2k_pkts_from_virtio0()\n- self.check_packet_payload_valid(\n- self.dump_vhost_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ self.check_packet_payload_valid(self.dump_vhost_pcap, check_dict)\n self.logger.info(\"diff the pcap file of vhost and virtio\")\n self.check_vhost_and_virtio_pkts_content()\n \n@@ -620,27 +498,20 @@ class TestVM2VMVirtioUser(TestCase):\n 2000,2000,2000,2000 will need 4 consequent ring, still need one ring put header\n so, as the rxt=256, if received pkts include 8k chain pkt, it will received up to 252 pkts\n \"\"\"\n- small_pkts_num = 251\n- large_8k_pkts_num = 1\n- large_2k_pkts_num = 0\n path_mode = \"packed_vq=0,mrg_rxbuf=1,in_order=1\"\n ringsize = 256\n extern_params = \"\"\n # get dump pcap file of virtio\n # the virtio0 will send 283 pkts, but the virtio only will received 252 pkts\n self.logger.info(\"check pcap file info about virtio\")\n+ check_dict = {64: 251, 2000: 0, 8000: 1}\n self.get_dump_file_of_virtio_user(path_mode, extern_params, ringsize)\n- self.check_packet_payload_valid(\n- self.dump_virtio_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ self.check_packet_payload_valid(self.dump_virtio_pcap, check_dict)\n # get dump pcap file of vhost\n self.logger.info(\"check pcap file info about vhost\")\n+ self.quit_all_testpmd()\n self.get_dump_file_of_vhost_user(path_mode, extern_params, ringsize)\n- self.check_packet_payload_valid(\n- self.dump_vhost_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ self.check_packet_payload_valid(self.dump_vhost_pcap, check_dict)\n self.logger.info(\"diff the pcap file of vhost and virtio\")\n self.check_vhost_and_virtio_pkts_content()\n \n@@ -649,27 +520,20 @@ class TestVM2VMVirtioUser(TestCase):\n Test Case 7: split virtqueue vm2vm non-mergeable path test\n about non-mergeable path, it can not received large pkts\n \"\"\"\n- small_pkts_num = 251\n- large_8k_pkts_num = 0\n- large_2k_pkts_num = 0\n path_mode = \"packed_vq=0,mrg_rxbuf=0,in_order=0,vectorized=1\"\n ringsize = 256\n extern_params = \"--enable-hw-vlan-strip\"\n # get dump pcap file of virtio\n # the virtio0 will send 283 pkts, but the virtio only will received 251 pkts\n self.logger.info(\"check pcap file info about virtio\")\n+ check_dict = {64: 251, 2000: 0, 8000: 0}\n self.get_dump_file_of_virtio_user(path_mode, extern_params, ringsize)\n- self.check_packet_payload_valid(\n- self.dump_virtio_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ self.check_packet_payload_valid(self.dump_virtio_pcap, check_dict)\n # get dump pcap file of vhost\n self.logger.info(\"check pcap file info about vhost\")\n+ self.quit_all_testpmd()\n self.get_dump_file_of_vhost_user(path_mode, extern_params, ringsize)\n- self.check_packet_payload_valid(\n- self.dump_vhost_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ self.check_packet_payload_valid(self.dump_vhost_pcap, check_dict)\n self.logger.info(\"diff the pcap file of vhost and virtio\")\n self.check_vhost_and_virtio_pkts_content()\n \n@@ -678,27 +542,20 @@ class TestVM2VMVirtioUser(TestCase):\n Test Case 8: split virtqueue vm2vm inorder non-mergeable path test\n about non-mergeable path, it can not received large pkts\n \"\"\"\n- small_pkts_num = 251\n- large_8k_pkts_num = 0\n- large_2k_pkts_num = 0\n path_mode = \"packed_vq=0,mrg_rxbuf=0,in_order=1\"\n ringsize = 256\n extern_params = \"--rx-offloads=0x10\"\n # get dump pcap file of virtio\n # the virtio0 will send 283 pkts, but the virtio only will received 251 pkts\n self.logger.info(\"check pcap file info about virtio\")\n+ check_dict = {64: 251, 2000: 0, 8000: 0}\n self.get_dump_file_of_virtio_user(path_mode, extern_params, ringsize)\n- self.check_packet_payload_valid(\n- self.dump_virtio_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ self.check_packet_payload_valid(self.dump_virtio_pcap, check_dict)\n # get dump pcap file of vhost\n self.logger.info(\"check pcap file info about vhost\")\n+ self.quit_all_testpmd()\n self.get_dump_file_of_vhost_user(path_mode, extern_params, ringsize)\n- self.check_packet_payload_valid(\n- self.dump_vhost_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ self.check_packet_payload_valid(self.dump_vhost_pcap, check_dict)\n self.logger.info(\"diff the pcap file of vhost and virtio\")\n self.check_vhost_and_virtio_pkts_content()\n \n@@ -707,30 +564,36 @@ class TestVM2VMVirtioUser(TestCase):\n Test Case 9: split virtqueue vm2vm vector_rx path test\n about vector_rx path, it can not received large pkts\n \"\"\"\n- small_pkts_num = 251\n- large_8k_pkts_num = 0\n- large_2k_pkts_num = 0\n path_mode = \"packed_vq=0,mrg_rxbuf=0,in_order=0,vectorized=1\"\n ringsize = 256\n extern_params = \"\"\n # get dump pcap file of virtio\n # the virtio0 will send 283 pkts, but the virtio only will received 251 pkts\n self.logger.info(\"check pcap file info about virtio\")\n+ check_dict = {64: 251, 2000: 0, 8000: 0}\n self.get_dump_file_of_virtio_user(path_mode, extern_params, ringsize)\n- self.check_packet_payload_valid(\n- self.dump_virtio_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ self.check_packet_payload_valid(self.dump_virtio_pcap, check_dict)\n # get dump pcap file of vhost\n self.logger.info(\"check pcap file info about vhost\")\n+ self.quit_all_testpmd()\n self.get_dump_file_of_vhost_user(path_mode, extern_params, ringsize)\n- self.check_packet_payload_valid(\n- self.dump_vhost_pcap, small_pkts_num, large_8k_pkts_num, large_2k_pkts_num\n- )\n-\n+ self.check_packet_payload_valid(self.dump_vhost_pcap, check_dict)\n self.logger.info(\"diff the pcap file of vhost and virtio\")\n self.check_vhost_and_virtio_pkts_content()\n \n+ def test_vm2vm_virtio_user_packed_virtqueue_vectorized_path_test_indirect_desc(self):\n+ \"\"\"\n+ Test Case 12: packed virtqueue vm2vm vectorized-tx path multi-queues test indirect descriptor\n+ \"\"\"\n+ path_mode = \"packed_vq=1,mrg_rxbuf=1,in_order=1,vectorized=1\"\n+ ringsize = 256\n+ extern_params = \"\"\n+ # get dump pcap file of virtio\n+ self.logger.info(\"check pcap file info about virtio\")\n+ check_dict = {64: 251, 2000: 0, 8000: 5}\n+ self.get_dump_file_of_virtio_user(path_mode, extern_params, ringsize)\n+ self.check_packet_payload_valid(self.dump_virtio_pcap, check_dict)\n+\n def close_all_session(self):\n if getattr(self, \"vhost_user\", None):\n self.dut.close_session(self.vhost_user)\n@@ -753,5 +616,4 @@ class TestVM2VMVirtioUser(TestCase):\n \"\"\"\n Run after each test suite.\n \"\"\"\n- self.bind_nic_driver(self.dut_ports, self.drivername)\n self.close_all_session()\n", "prefixes": [ "V1", "2/2" ] }