Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 45036,
    "url": "https://patches.dpdk.org/api/patches/45036/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/1537449810-23573-1-git-send-email-jananeex.m.parthasarathy@intel.com/",
    "project": {
        "id": 1,
        "url": "https://patches.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<1537449810-23573-1-git-send-email-jananeex.m.parthasarathy@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1537449810-23573-1-git-send-email-jananeex.m.parthasarathy@intel.com",
    "date": "2018-09-20T13:23:30",
    "name": "test: restructure and cleanup ring PMD test",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "bc32d91e1a49727b067fac6f4896b7081a7f1b6c",
    "submitter": {
        "id": 1024,
        "url": "https://patches.dpdk.org/api/people/1024/?format=api",
        "name": "Jananee Parthasarathy",
        "email": "jananeex.m.parthasarathy@intel.com"
    },
    "delegate": {
        "id": 1,
        "url": "https://patches.dpdk.org/api/users/1/?format=api",
        "username": "tmonjalo",
        "first_name": "Thomas",
        "last_name": "Monjalon",
        "email": "thomas@monjalon.net"
    },
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/1537449810-23573-1-git-send-email-jananeex.m.parthasarathy@intel.com/mbox/",
    "series": [
        {
            "id": 1421,
            "url": "https://patches.dpdk.org/api/series/1421/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=1421",
            "date": "2018-09-20T13:23:30",
            "name": "test: restructure and cleanup ring PMD test",
            "version": 1,
            "mbox": "https://patches.dpdk.org/series/1421/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/45036/comments/",
    "check": "success",
    "checks": "https://patches.dpdk.org/api/patches/45036/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@dpdk.org",
        "Delivered-To": "patchwork@dpdk.org",
        "Received": [
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 34C845B38;\n\tThu, 20 Sep 2018 15:24:02 +0200 (CEST)",
            "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby dpdk.org (Postfix) with ESMTP id A56145B38\n\tfor <dev@dpdk.org>; Thu, 20 Sep 2018 15:23:59 +0200 (CEST)",
            "from orsmga005.jf.intel.com ([10.7.209.41])\n\tby fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t20 Sep 2018 06:23:58 -0700",
            "from irvmail001.ir.intel.com ([163.33.26.43])\n\tby orsmga005.jf.intel.com with ESMTP; 20 Sep 2018 06:23:57 -0700",
            "from wgcvswdev001.ir.intel.com (wgcvswdev001.ir.intel.com\n\t[10.102.246.100])\n\tby irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id\n\tw8KDNufc025396; Thu, 20 Sep 2018 14:23:56 +0100",
            "from wgcvswdev001.ir.intel.com (localhost [127.0.0.1])\n\tby wgcvswdev001.ir.intel.com with ESMTP id w8KDNion023636;\n\tThu, 20 Sep 2018 14:23:44 +0100",
            "(from jmparthx@localhost)\n\tby wgcvswdev001.ir.intel.com with ? id w8KDNiDE023632;\n\tThu, 20 Sep 2018 14:23:44 +0100"
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.53,398,1531810800\"; d=\"scan'208\";a=\"258872755\"",
        "From": "Jananee Parthasarathy <jananeex.m.parthasarathy@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "reshma.pattan@intel.com,\n\tChaitanya Babu Talluri <tallurix.chaitanya.babu@intel.com>",
        "Date": "Thu, 20 Sep 2018 14:23:30 +0100",
        "Message-Id": "<1537449810-23573-1-git-send-email-jananeex.m.parthasarathy@intel.com>",
        "X-Mailer": "git-send-email 1.7.12.2",
        "Subject": "[dpdk-dev] [PATCH] test: restructure and cleanup  ring PMD test",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "From: Chaitanya Babu Talluri <tallurix.chaitanya.babu@intel.com>\n\nDivided main test to smaller logical tests.\nRegistered with UT framework.\nAdded cleanup of the resources else ring creation fails\nduring consecutive test runs.\nFreed the allocated mempool, rings and uninitalized the drivers.\n\nSigned-off-by: Chaitanya Babu Talluri <tallurix.chaitanya.babu@intel.com>\n---\n test/test/test_pmd_ring.c | 312 ++++++++++++++++++++++++++++------------------\n 1 file changed, 188 insertions(+), 124 deletions(-)",
    "diff": "diff --git a/test/test/test_pmd_ring.c b/test/test/test_pmd_ring.c\nindex 19d7d20a0..f7d46d834 100644\n--- a/test/test/test_pmd_ring.c\n+++ b/test/test/test_pmd_ring.c\n@@ -2,20 +2,22 @@\n  * Copyright(c) 2010-2015 Intel Corporation\n  */\n #include \"test.h\"\n+#include <string.h>\n \n #include <stdio.h>\n \n #include <rte_eth_ring.h>\n #include <rte_ethdev.h>\n-\n-static struct rte_mempool *mp;\n-static int tx_porta, rx_portb, rxtx_portc, rxtx_portd, rxtx_porte;\n+#include <rte_bus_vdev.h>\n \n #define SOCKET0 0\n #define RING_SIZE 256\n #define NUM_RINGS 2\n #define NB_MBUF 512\n \n+static struct rte_mempool *mp;\n+struct rte_ring *rxtx[NUM_RINGS];\n+static int tx_porta, rx_portb, rxtx_portc, rxtx_portd, rxtx_porte;\n \n static int\n test_ethdev_configure_port(int port)\n@@ -71,21 +73,21 @@ test_send_basic_packets(void)\n \n \tif (rte_eth_tx_burst(tx_porta, 0, pbufs, RING_SIZE/2) < RING_SIZE/2) {\n \t\tprintf(\"Failed to transmit packet burst port %d\\n\", tx_porta);\n-\t\treturn -1;\n+\t\treturn TEST_FAILED;\n \t}\n \n \tif (rte_eth_rx_burst(rx_portb, 0, pbufs, RING_SIZE) != RING_SIZE/2) {\n \t\tprintf(\"Failed to receive packet burst on port %d\\n\", rx_portb);\n-\t\treturn -1;\n+\t\treturn TEST_FAILED;\n \t}\n \n \tfor (i = 0; i < RING_SIZE/2; i++)\n \t\tif (pbufs[i] != &bufs[i]) {\n \t\t\tprintf(\"Error: received data does not match that transmitted\\n\");\n-\t\t\treturn -1;\n+\t\t\treturn TEST_FAILED;\n \t\t}\n \n-\treturn 0;\n+\treturn TEST_SUCCESS;\n }\n \n static int\n@@ -212,7 +214,7 @@ test_stats_reset(int port)\n }\n \n static int\n-test_pmd_ring_pair_create_attach(int portd, int porte)\n+test_pmd_ring_pair_create_attach(void)\n {\n \tstruct rte_eth_stats stats, stats2;\n \tstruct rte_mbuf buf, *pbuf = &buf;\n@@ -220,185 +222,217 @@ test_pmd_ring_pair_create_attach(int portd, int porte)\n \n \tmemset(&null_conf, 0, sizeof(struct rte_eth_conf));\n \n-\tif ((rte_eth_dev_configure(portd, 1, 1, &null_conf) < 0)\n-\t\t|| (rte_eth_dev_configure(porte, 1, 1, &null_conf) < 0)) {\n+\tif ((rte_eth_dev_configure(rxtx_portd, 1, 1, &null_conf) < 0)\n+\t\t|| (rte_eth_dev_configure(rxtx_porte, 1, 1, &null_conf) < 0)) {\n \t\tprintf(\"Configure failed for port\\n\");\n-\t\treturn -1;\n+\t\treturn TEST_FAILED;\n \t}\n \n-\tif ((rte_eth_tx_queue_setup(portd, 0, RING_SIZE, SOCKET0, NULL) < 0)\n-\t\t|| (rte_eth_tx_queue_setup(porte, 0, RING_SIZE, SOCKET0, NULL) < 0)) {\n+\tif ((rte_eth_tx_queue_setup(rxtx_portd, 0, RING_SIZE,\n+\t\t\t\t\tSOCKET0, NULL) < 0)\n+\t\t|| (rte_eth_tx_queue_setup(rxtx_porte, 0, RING_SIZE,\n+\t\t\t\tSOCKET0, NULL) < 0)) {\n \t\tprintf(\"TX queue setup failed\\n\");\n-\t\treturn -1;\n+\t\treturn TEST_FAILED;\n \t}\n \n-\tif ((rte_eth_rx_queue_setup(portd, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)\n-\t\t|| (rte_eth_rx_queue_setup(porte, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)) {\n+\tif ((rte_eth_rx_queue_setup(rxtx_portd, 0, RING_SIZE,\n+\t\t\t\t\tSOCKET0, NULL, mp) < 0)\n+\t\t|| (rte_eth_rx_queue_setup(rxtx_porte, 0, RING_SIZE,\n+\t\t\t\tSOCKET0, NULL, mp) < 0)) {\n \t\tprintf(\"RX queue setup failed\\n\");\n-\t\treturn -1;\n+\t\treturn TEST_FAILED;\n \t}\n \n-\tif ((rte_eth_dev_start(portd) < 0)\n-\t\t|| (rte_eth_dev_start(porte) < 0)) {\n+\tif ((rte_eth_dev_start(rxtx_portd) < 0)\n+\t\t|| (rte_eth_dev_start(rxtx_porte) < 0)) {\n \t\tprintf(\"Error starting port\\n\");\n-\t\treturn -1;\n+\t\treturn TEST_FAILED;\n \t}\n \n-\trte_eth_stats_reset(portd);\n+\trte_eth_stats_reset(rxtx_portd);\n \t/* check stats of port, should all be zero */\n-\trte_eth_stats_get(portd, &stats);\n+\trte_eth_stats_get(rxtx_portd, &stats);\n \tif (stats.ipackets != 0 || stats.opackets != 0 ||\n \t\t\tstats.ibytes != 0 || stats.obytes != 0 ||\n \t\t\tstats.ierrors != 0 || stats.oerrors != 0) {\n-\t\tprintf(\"Error: port %d stats are not zero\\n\", portd);\n-\t\treturn -1;\n+\t\tprintf(\"Error: port %d stats are not zero\\n\", rxtx_portd);\n+\t\treturn TEST_FAILED;\n \t}\n \n-\trte_eth_stats_reset(porte);\n+\trte_eth_stats_reset(rxtx_porte);\n \t/* check stats of port, should all be zero */\n-\trte_eth_stats_get(porte, &stats2);\n+\trte_eth_stats_get(rxtx_porte, &stats2);\n \tif (stats2.ipackets != 0 || stats2.opackets != 0 ||\n \t\t\tstats2.ibytes != 0 || stats2.obytes != 0 ||\n \t\t\tstats2.ierrors != 0 || stats2.oerrors != 0) {\n-\t\tprintf(\"Error: port %d stats are not zero\\n\", porte);\n-\t\treturn -1;\n+\t\tprintf(\"Error: port %d stats are not zero\\n\", rxtx_porte);\n+\t\treturn TEST_FAILED;\n \t}\n \n \t/*\n-\t * send and receive 1 packet (portd -> porte)\n+\t * send and receive 1 packet (rxtx_portd -> rxtx_porte)\n \t * and check for stats update\n \t */\n-\tprintf(\"Testing send and receive 1 packet (portd -> porte)\\n\");\n-\tif (rte_eth_tx_burst(portd, 0, &pbuf, 1) != 1) {\n-\t\tprintf(\"Error sending packet to port %d\\n\", portd);\n-\t\treturn -1;\n+\tprintf(\"Testing send and receive 1 packet (rxtx_portd -> rxtx_porte)\\n\");\n+\tif (rte_eth_tx_burst(rxtx_portd, 0, &pbuf, 1) != 1) {\n+\t\tprintf(\"Error sending packet to port %d\\n\", rxtx_portd);\n+\t\treturn TEST_FAILED;\n \t}\n \n-\tif (rte_eth_rx_burst(porte, 0, &pbuf, 1) != 1) {\n-\t\tprintf(\"Error receiving packet from port %d\\n\", porte);\n-\t\treturn -1;\n+\tif (rte_eth_rx_burst(rxtx_porte, 0, &pbuf, 1) != 1) {\n+\t\tprintf(\"Error receiving packet from port %d\\n\", rxtx_porte);\n+\t\treturn TEST_FAILED;\n \t}\n \n-\trte_eth_stats_get(portd, &stats);\n-\trte_eth_stats_get(porte, &stats2);\n+\trte_eth_stats_get(rxtx_portd, &stats);\n+\trte_eth_stats_get(rxtx_porte, &stats2);\n \tif (stats.ipackets != 0 || stats.opackets != 1 ||\n \t\t\tstats.ibytes != 0 || stats.obytes != 0 ||\n \t\t\tstats.ierrors != 0 || stats.oerrors != 0) {\n-\t\tprintf(\"Error: port %d stats are not as expected\\n\", portd);\n-\t\treturn -1;\n+\t\tprintf(\"Error: port %d stats are not as expected\\n\",\n+\t\t\t\trxtx_portd);\n+\t\treturn TEST_FAILED;\n \t}\n \n \tif (stats2.ipackets != 1 || stats2.opackets != 0 ||\n \t\t\tstats2.ibytes != 0 || stats2.obytes != 0 ||\n \t\t\tstats2.ierrors != 0 || stats2.oerrors != 0) {\n-\t\tprintf(\"Error: port %d stats are not as expected\\n\", porte);\n-\t\treturn -1;\n+\t\tprintf(\"Error: port %d stats are not as expected\\n\",\n+\t\t\t\trxtx_porte);\n+\t\treturn TEST_FAILED;\n \t}\n \n \t/*\n-\t * send and receive 1 packet (porte -> portd)\n+\t * send and receive 1 packet (rxtx_porte -> rxtx_portd)\n \t * and check for stats update\n \t */\n-\tprintf(\"Testing send and receive 1 packet (porte -> portd)\\n\");\n-\tif (rte_eth_tx_burst(porte, 0, &pbuf, 1) != 1) {\n-\t\tprintf(\"Error sending packet to port %d\\n\", porte);\n-\t\treturn -1;\n+\tprintf(\"Testing send and receive 1 packet \"\n+\t\t\t\"(rxtx_porte -> rxtx_portd)\\n\");\n+\tif (rte_eth_tx_burst(rxtx_porte, 0, &pbuf, 1) != 1) {\n+\t\tprintf(\"Error sending packet to port %d\\n\", rxtx_porte);\n+\t\treturn TEST_FAILED;\n \t}\n \n-\tif (rte_eth_rx_burst(portd, 0, &pbuf, 1) != 1) {\n-\t\tprintf(\"Error receiving packet from port %d\\n\", portd);\n-\t\treturn -1;\n+\tif (rte_eth_rx_burst(rxtx_portd, 0, &pbuf, 1) != 1) {\n+\t\tprintf(\"Error receiving packet from port %d\\n\", rxtx_portd);\n+\t\treturn TEST_FAILED;\n \t}\n \n-\trte_eth_stats_get(portd, &stats);\n-\trte_eth_stats_get(porte, &stats2);\n+\trte_eth_stats_get(rxtx_portd, &stats);\n+\trte_eth_stats_get(rxtx_porte, &stats2);\n \tif (stats.ipackets != 1 || stats.opackets != 1 ||\n \t\t\tstats.ibytes != 0 || stats.obytes != 0 ||\n \t\t\tstats.ierrors != 0 || stats.oerrors != 0) {\n-\t\tprintf(\"Error: port %d stats are not as expected\\n\", portd);\n-\t\treturn -1;\n+\t\tprintf(\"Error: port %d stats are not as expected\\n\",\n+\t\t\t\trxtx_portd);\n+\t\treturn TEST_FAILED;\n \t}\n \n \tif (stats2.ipackets != 1 || stats2.opackets != 1 ||\n \t\t\tstats2.ibytes != 0 || stats2.obytes != 0 ||\n \t\t\tstats2.ierrors != 0 || stats2.oerrors != 0) {\n-\t\tprintf(\"Error: port %d stats are not as expected\\n\", porte);\n-\t\treturn -1;\n+\t\tprintf(\"Error: port %d stats are not as expected\\n\",\n+\t\t\t\trxtx_porte);\n+\t\treturn TEST_FAILED;\n \t}\n \n \t/*\n-\t * send and receive 1 packet (portd -> portd)\n+\t * send and receive 1 packet (rxtx_portd -> rxtx_portd)\n \t * and check for stats update\n \t */\n-\tprintf(\"Testing send and receive 1 packet (portd -> portd)\\n\");\n-\tif (rte_eth_tx_burst(portd, 0, &pbuf, 1) != 1) {\n-\t\tprintf(\"Error sending packet to port %d\\n\", portd);\n-\t\treturn -1;\n+\tprintf(\"Testing send and receive 1 packet \"\n+\t\t\t\"(rxtx_portd -> rxtx_portd)\\n\");\n+\tif (rte_eth_tx_burst(rxtx_portd, 0, &pbuf, 1) != 1) {\n+\t\tprintf(\"Error sending packet to port %d\\n\", rxtx_portd);\n+\t\treturn TEST_FAILED;\n \t}\n \n-\tif (rte_eth_rx_burst(portd, 0, &pbuf, 1) != 1) {\n-\t\tprintf(\"Error receiving packet from port %d\\n\", porte);\n-\t\treturn -1;\n+\tif (rte_eth_rx_burst(rxtx_portd, 0, &pbuf, 1) != 1) {\n+\t\tprintf(\"Error receiving packet from port %d\\n\", rxtx_porte);\n+\t\treturn TEST_FAILED;\n \t}\n \n-\trte_eth_stats_get(portd, &stats);\n-\trte_eth_stats_get(porte, &stats2);\n+\trte_eth_stats_get(rxtx_portd, &stats);\n+\trte_eth_stats_get(rxtx_porte, &stats2);\n \tif (stats.ipackets != 2 || stats.opackets != 2 ||\n \t\t\tstats.ibytes != 0 || stats.obytes != 0 ||\n \t\t\tstats.ierrors != 0 || stats.oerrors != 0) {\n-\t\tprintf(\"Error: port %d stats are not as expected\\n\", portd);\n-\t\treturn -1;\n+\t\tprintf(\"Error: port %d stats are not as expected\\n\",\n+\t\t\t\trxtx_portd);\n+\t\treturn TEST_FAILED;\n \t}\n \n \tif (stats2.ipackets != 1 || stats2.opackets != 1 ||\n \t\t\tstats2.ibytes != 0 || stats2.obytes != 0 ||\n \t\t\tstats2.ierrors != 0 || stats2.oerrors != 0) {\n-\t\tprintf(\"Error: port %d stats are not as expected\\n\", porte);\n-\t\treturn -1;\n+\t\tprintf(\"Error: port %d stats are not as expected\\n\",\n+\t\t\t\trxtx_porte);\n+\t\treturn TEST_FAILED;\n \t}\n \n \t/*\n-\t * send and receive 1 packet (porte -> porte)\n+\t * send and receive 1 packet (rxtx_porte -> rxtx_porte)\n \t * and check for stats update\n \t */\n-\tprintf(\"Testing send and receive 1 packet (porte -> porte)\\n\");\n-\tif (rte_eth_tx_burst(porte, 0, &pbuf, 1) != 1) {\n-\t\tprintf(\"Error sending packet to port %d\\n\", porte);\n-\t\treturn -1;\n+\tprintf(\"Testing send and receive 1 packet \"\n+\t\t\t\"(rxtx_porte -> rxtx_porte)\\n\");\n+\tif (rte_eth_tx_burst(rxtx_porte, 0, &pbuf, 1) != 1) {\n+\t\tprintf(\"Error sending packet to port %d\\n\", rxtx_porte);\n+\t\treturn TEST_FAILED;\n \t}\n \n-\tif (rte_eth_rx_burst(porte, 0, &pbuf, 1) != 1) {\n-\t\tprintf(\"Error receiving packet from port %d\\n\", porte);\n-\t\treturn -1;\n+\tif (rte_eth_rx_burst(rxtx_porte, 0, &pbuf, 1) != 1) {\n+\t\tprintf(\"Error receiving packet from port %d\\n\", rxtx_porte);\n+\t\treturn TEST_FAILED;\n \t}\n \n-\trte_eth_stats_get(portd, &stats);\n-\trte_eth_stats_get(porte, &stats2);\n+\trte_eth_stats_get(rxtx_portd, &stats);\n+\trte_eth_stats_get(rxtx_porte, &stats2);\n \tif (stats.ipackets != 2 || stats.opackets != 2 ||\n \t\t\tstats.ibytes != 0 || stats.obytes != 0 ||\n \t\t\tstats.ierrors != 0 || stats.oerrors != 0) {\n-\t\tprintf(\"Error: port %d stats are not as expected\\n\", portd);\n-\t\treturn -1;\n+\t\tprintf(\"Error: port %d stats are not as expected\\n\",\n+\t\t\t\trxtx_portd);\n+\t\treturn TEST_FAILED;\n \t}\n \n \tif (stats2.ipackets != 2 || stats2.opackets != 2 ||\n \t\t\tstats2.ibytes != 0 || stats2.obytes != 0 ||\n \t\t\tstats2.ierrors != 0 || stats2.oerrors != 0) {\n-\t\tprintf(\"Error: port %d stats are not as expected\\n\", porte);\n-\t\treturn -1;\n+\t\tprintf(\"Error: port %d stats are not as expected\\n\",\n+\t\t\t\trxtx_porte);\n+\t\treturn TEST_FAILED;\n \t}\n \n-\trte_eth_dev_stop(portd);\n-\trte_eth_dev_stop(porte);\n+\trte_eth_dev_stop(rxtx_portd);\n+\trte_eth_dev_stop(rxtx_porte);\n \n-\treturn 0;\n+\treturn TEST_SUCCESS;\n+}\n+\n+static void\n+test_cleanup_resources(void)\n+{\n+\tint itr;\n+\tfor (itr = 0; itr < NUM_RINGS; itr++)\n+\t\trte_ring_free(rxtx[itr]);\n+\n+\trte_eth_dev_stop(tx_porta);\n+\trte_eth_dev_stop(rx_portb);\n+\trte_eth_dev_stop(rxtx_portc);\n+\n+\trte_mempool_free(mp);\n+\trte_vdev_uninit(\"net_ring_net_ringa\");\n+\trte_vdev_uninit(\"net_ring_net_ringb\");\n+\trte_vdev_uninit(\"net_ring_net_ringc\");\n+\trte_vdev_uninit(\"net_ring_net_ringd\");\n+\trte_vdev_uninit(\"net_ring_net_ringe\");\n }\n \n static int\n-test_pmd_ring(void)\n+test_pmd_ringcreate_setup(void)\n {\n-\tstruct rte_ring *rxtx[NUM_RINGS];\n-\tint port, cmdl_port0 = -1;\n \tuint8_t nb_ports;\n \n \tnb_ports = rte_eth_dev_count_avail();\n@@ -448,32 +482,13 @@ test_pmd_ring(void)\n \t\tprintf(\" port exceed max eth ports\\n\");\n \t\treturn -1;\n \t}\n+\treturn 0;\n+}\n \n-\tif (test_ethdev_configure_port(tx_porta) < 0)\n-\t\treturn -1;\n-\n-\tif (test_ethdev_configure_port(rx_portb) < 0)\n-\t\treturn -1;\n-\n-\tif (test_ethdev_configure_port(rxtx_portc) < 0)\n-\t\treturn -1;\n-\n-\tif (test_send_basic_packets() < 0)\n-\t\treturn -1;\n-\n-\tif (test_get_stats(rxtx_portc) < 0)\n-\t\treturn -1;\n-\n-\tif (test_stats_reset(rxtx_portc) < 0)\n-\t\treturn -1;\n-\n-\trte_eth_dev_stop(tx_porta);\n-\trte_eth_dev_stop(rx_portb);\n-\trte_eth_dev_stop(rxtx_portc);\n-\n-\tif (test_pmd_ring_pair_create_attach(rxtx_portd, rxtx_porte) < 0)\n-\t\treturn -1;\n-\n+static int\n+test_command_line_ring_port(void)\n+{\n+\tint port, cmdl_port0 = -1;\n \t/* find a port created with the --vdev=net_ring0 command line option */\n \tRTE_ETH_FOREACH_DEV(port) {\n \t\tstruct rte_eth_dev_info dev_info;\n@@ -486,17 +501,66 @@ test_pmd_ring(void)\n \t\t}\n \t}\n \tif (cmdl_port0 != -1) {\n-\t\tif (test_ethdev_configure_port(cmdl_port0) < 0)\n-\t\t\treturn -1;\n-\t\tif (test_send_basic_packets_port(cmdl_port0) < 0)\n-\t\t\treturn -1;\n-\t\tif (test_stats_reset(cmdl_port0) < 0)\n-\t\t\treturn -1;\n-\t\tif (test_get_stats(cmdl_port0) < 0)\n-\t\t\treturn -1;\n+\t\tTEST_ASSERT((test_ethdev_configure_port(cmdl_port0) < 0),\n+\t\t\t\t\"test ethdev configure port cmdl_port0 is failed\");\n+\t\tTEST_ASSERT((test_send_basic_packets_port(cmdl_port0) < 0),\n+\t\t\t\t\"test send basic packets port cmdl_port0 is failed\");\n+\t\tTEST_ASSERT((test_stats_reset(cmdl_port0) < 0),\n+\t\t\t\t\"test stats reset cmdl_port0 is failed\");\n+\t\tTEST_ASSERT((test_get_stats(cmdl_port0) < 0),\n+\t\t\t\t\"test get stats cmdl_port0 is failed\");\n \t\trte_eth_dev_stop(cmdl_port0);\n \t}\n-\treturn 0;\n+\treturn TEST_SUCCESS;\n+}\n+\n+static int\n+test_ethdev_configure_ports(void)\n+{\n+\tTEST_ASSERT((test_ethdev_configure_port(tx_porta) == 0),\n+\t\t\t\"test ethdev configure ports tx_porta is failed\");\n+\tTEST_ASSERT((test_ethdev_configure_port(rx_portb) == 0),\n+\t\t\t\"test ethdev configure ports rx_portb is failed\");\n+\tTEST_ASSERT((test_ethdev_configure_port(rxtx_portc) == 0),\n+\t\t\t\"test ethdev configure ports rxtx_portc is failed\");\n+\n+\treturn TEST_SUCCESS;\n+}\n+\n+static int\n+test_get_stats_for_port(void)\n+{\n+\tTEST_ASSERT(test_get_stats(rxtx_portc) == 0, \"test get stats failed\");\n+\treturn TEST_SUCCESS;\n+}\n+\n+static int\n+test_stats_reset_for_port(void)\n+{\n+\tTEST_ASSERT(test_stats_reset(rxtx_portc) == 0, \"test stats reset failed\");\n+\treturn TEST_SUCCESS;\n+}\n+\n+static struct\n+unit_test_suite test_pmd_ring_suite  = {\n+\t.setup = test_pmd_ringcreate_setup,\n+\t.teardown = test_cleanup_resources,\n+\t.suite_name = \"Test Pmd Ring Unit Test Suite\",\n+\t.unit_test_cases = {\n+\t\tTEST_CASE(test_ethdev_configure_ports),\n+\t\tTEST_CASE(test_send_basic_packets),\n+\t\tTEST_CASE(test_get_stats_for_port),\n+\t\tTEST_CASE(test_stats_reset_for_port),\n+\t\tTEST_CASE(test_pmd_ring_pair_create_attach),\n+\t\tTEST_CASE(test_command_line_ring_port),\n+\t\tTEST_CASES_END()\n+\t}\n+};\n+\n+static int\n+test_pmd_ring(void)\n+{\n+\treturn unit_test_suite_runner(&test_pmd_ring_suite);\n }\n \n REGISTER_TEST_COMMAND(ring_pmd_autotest, test_pmd_ring);\n",
    "prefixes": []
}