mbuf: add a copy routine

[dpdk.git] / app / test / test_link_bonding.c

diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c
index c1c22fb..a9b9d0c 100644 (file)
--- a/app/test/test_link_bonding.c
+++ b/app/test/test_link_bonding.c
@@ -80,13 +80,13 @@ struct link_bonding_unittest_params {
        struct rte_ether_hdr *pkt_eth_hdr;
        struct rte_ipv4_hdr *pkt_ipv4_hdr;
        struct rte_ipv6_hdr *pkt_ipv6_hdr;
-       struct udp_hdr *pkt_udp_hdr;
+       struct rte_udp_hdr *pkt_udp_hdr;
 
 };
 
 static struct rte_ipv4_hdr pkt_ipv4_hdr;
 static struct rte_ipv6_hdr pkt_ipv6_hdr;
-static struct udp_hdr pkt_udp_hdr;
+static struct rte_udp_hdr pkt_udp_hdr;
 
 static struct link_bonding_unittest_params default_params  = {
        .bonded_port_id = -1,
@@ -399,9 +399,11 @@ test_remove_slave_from_bonded_device(void)
        mac_addr->addr_bytes[RTE_ETHER_ADDR_LEN-1] =
                        test_params->bonded_slave_count-1;
 
-       rte_eth_macaddr_get(
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(
                        test_params->slave_port_ids[test_params->bonded_slave_count-1],
-                       &read_mac_addr);
+                       &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[test_params->bonded_slave_count-1]);
        TEST_ASSERT_SUCCESS(memcmp(mac_addr, &read_mac_addr, sizeof(read_mac_addr)),
                        "bonded port mac address not set to that of primary port\n");
 
@@ -554,6 +556,7 @@ test_start_bonded_device(void)
 
        int current_slave_count, current_bonding_mode, primary_port;
        uint16_t slaves[RTE_MAX_ETHPORTS];
+       int retval;
 
        /* Add slave to bonded device*/
        TEST_ASSERT_SUCCESS(test_add_slave_to_bonded_device(),
@@ -590,7 +593,10 @@ test_start_bonded_device(void)
                        "Primary port (%d) is not expected value (%d).",
                        primary_port, test_params->slave_port_ids[0]);
 
-       rte_eth_link_get(test_params->bonded_port_id, &link_status);
+       retval = rte_eth_link_get(test_params->bonded_port_id, &link_status);
+       TEST_ASSERT(retval >= 0,
+                       "Bonded port (%d) link get failed: %s\n",
+                       test_params->bonded_port_id, rte_strerror(-retval));
        TEST_ASSERT_EQUAL(link_status.link_status, 1,
                        "Bonded port (%d) status (%d) is not expected value (%d).\n",
                        test_params->bonded_port_id, link_status.link_status, 1);
@@ -605,10 +611,14 @@ test_stop_bonded_device(void)
        uint16_t slaves[RTE_MAX_ETHPORTS];
 
        struct rte_eth_link link_status;
+       int retval;
 
        rte_eth_dev_stop(test_params->bonded_port_id);
 
-       rte_eth_link_get(test_params->bonded_port_id, &link_status);
+       retval = rte_eth_link_get(test_params->bonded_port_id, &link_status);
+       TEST_ASSERT(retval >= 0,
+                       "Bonded port (%d) link get failed: %s\n",
+                       test_params->bonded_port_id, rte_strerror(-retval));
        TEST_ASSERT_EQUAL(link_status.link_status, 0,
                        "Bonded port (%d) status (%d) is not expected value (%d).",
                        test_params->bonded_port_id, link_status.link_status, 0);
@@ -755,13 +765,17 @@ test_set_primary_slave(void)
                expected_mac_addr->addr_bytes[RTE_ETHER_ADDR_LEN-1] = i;
 
                /* Check primary slave MAC */
-               rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr);
+               TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr),
+                               "Failed to get mac address (port %d)",
+                               test_params->slave_port_ids[i]);
                TEST_ASSERT_SUCCESS(memcmp(expected_mac_addr, &read_mac_addr,
                                sizeof(read_mac_addr)),
                                "bonded port mac address not set to that of primary port\n");
 
                /* Check bonded MAC */
-               rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr);
+               TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr),
+                               "Failed to get mac address (port %d)",
+                               test_params->bonded_port_id);
                TEST_ASSERT_SUCCESS(memcmp(&read_mac_addr, &read_mac_addr,
                                sizeof(read_mac_addr)),
                                "bonded port mac address not set to that of primary port\n");
@@ -769,8 +783,10 @@ test_set_primary_slave(void)
                /* Check other slaves MACs */
                for (j = 0; j < 4; j++) {
                        if (j != i) {
-                               rte_eth_macaddr_get(test_params->slave_port_ids[j],
-                                               &read_mac_addr);
+                               TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[j],
+                                               &read_mac_addr),
+                                               "Failed to get mac address (port %d)",
+                                               test_params->slave_port_ids[j]);
                                TEST_ASSERT_SUCCESS(memcmp(expected_mac_addr, &read_mac_addr,
                                                sizeof(read_mac_addr)),
                                                "slave port mac address not set to that of primary "
@@ -835,13 +851,17 @@ test_set_explicit_bonded_mac(void)
        }
 
        /* Check bonded MAC */
-       rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->bonded_port_id);
        TEST_ASSERT_SUCCESS(memcmp(mac_addr, &read_mac_addr, sizeof(read_mac_addr)),
                        "bonded port mac address not set to that of primary port");
 
        /* Check other slaves MACs */
        for (i = 0; i < 4; i++) {
-               rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr);
+               TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr),
+                               "Failed to get mac address (port %d)",
+                               test_params->slave_port_ids[i]);
                TEST_ASSERT_SUCCESS(memcmp(mac_addr, &read_mac_addr,
                                sizeof(read_mac_addr)),
                                "slave port mac address not set to that of primary port");
@@ -965,24 +985,32 @@ test_set_bonded_port_initialization_mac_assignment(void)
                                slave_port_ids[i], 1);
        }
 
-       rte_eth_macaddr_get(bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       bonded_port_id);
        TEST_ASSERT_SUCCESS(memcmp(&bonded_mac_addr, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "bonded port mac address not as expected");
 
-       rte_eth_macaddr_get(slave_port_ids[0], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(slave_port_ids[0], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       slave_port_ids[0]);
        TEST_ASSERT_SUCCESS(memcmp(&bonded_mac_addr, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port 0 mac address not as expected");
 
        slave_mac_addr.addr_bytes[RTE_ETHER_ADDR_LEN-1] = 1 + 100;
-       rte_eth_macaddr_get(slave_port_ids[1], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(slave_port_ids[1], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       slave_port_ids[1]);
        TEST_ASSERT_SUCCESS(memcmp(&slave_mac_addr, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port 1 mac address not as expected");
 
        slave_mac_addr.addr_bytes[RTE_ETHER_ADDR_LEN-1] = 2 + 100;
-       rte_eth_macaddr_get(slave_port_ids[2], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(slave_port_ids[2], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       slave_port_ids[2]);
        TEST_ASSERT_SUCCESS(memcmp(&slave_mac_addr, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port 2 mac address not as expected");
@@ -1001,24 +1029,32 @@ test_set_bonded_port_initialization_mac_assignment(void)
                                "Failed to start bonded pmd eth device %d.",
                                bonded_port_id);
 
-       rte_eth_macaddr_get(bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       bonded_port_id);
        TEST_ASSERT_SUCCESS(memcmp(&bonded_mac_addr, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "bonded port mac address not as expected");
 
        slave_mac_addr.addr_bytes[RTE_ETHER_ADDR_LEN-1] = 0 + 100;
-       rte_eth_macaddr_get(slave_port_ids[0], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(slave_port_ids[0], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       slave_port_ids[0]);
        TEST_ASSERT_SUCCESS(memcmp(&slave_mac_addr, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port 0 mac address not as expected");
 
        slave_mac_addr.addr_bytes[RTE_ETHER_ADDR_LEN-1] = 1 + 100;
-       rte_eth_macaddr_get(slave_port_ids[1], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(slave_port_ids[1], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       slave_port_ids[1]);
        TEST_ASSERT_SUCCESS(memcmp(&slave_mac_addr, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port 1 mac address not as expected");
 
-       rte_eth_macaddr_get(slave_port_ids[2], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(slave_port_ids[2], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       slave_port_ids[2]);
        TEST_ASSERT_SUCCESS(memcmp(&bonded_mac_addr, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port 2 mac address not as expected");
@@ -1044,19 +1080,25 @@ test_set_bonded_port_initialization_mac_assignment(void)
                        slave_count, 0);
 
        slave_mac_addr.addr_bytes[RTE_ETHER_ADDR_LEN-1] = 0 + 100;
-       rte_eth_macaddr_get(slave_port_ids[0], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(slave_port_ids[0], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       slave_port_ids[0]);
        TEST_ASSERT_SUCCESS(memcmp(&slave_mac_addr, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port 0 mac address not as expected");
 
        slave_mac_addr.addr_bytes[RTE_ETHER_ADDR_LEN-1] = 1 + 100;
-       rte_eth_macaddr_get(slave_port_ids[1], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(slave_port_ids[1], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       slave_port_ids[1]);
        TEST_ASSERT_SUCCESS(memcmp(&slave_mac_addr, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port 1 mac address not as expected");
 
        slave_mac_addr.addr_bytes[RTE_ETHER_ADDR_LEN-1] = 2 + 100;
-       rte_eth_macaddr_get(slave_port_ids[2], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(slave_port_ids[2], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       slave_port_ids[2]);
        TEST_ASSERT_SUCCESS(memcmp(&slave_mac_addr, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port 2 mac address not as expected");
@@ -1272,9 +1314,9 @@ generate_test_burst(struct rte_mbuf **pkts_burst, uint16_t burst_size,
        void *ip_hdr;
 
        if (ipv4)
-               ether_type = RTE_ETHER_TYPE_IPv4;
+               ether_type = RTE_ETHER_TYPE_IPV4;
        else
-               ether_type = RTE_ETHER_TYPE_IPv6;
+               ether_type = RTE_ETHER_TYPE_IPV6;
 
        if (toggle_dst_mac)
                initialize_eth_header(test_params->pkt_eth_hdr,
@@ -1680,8 +1722,12 @@ test_roundrobin_verify_mac_assignment(void)
 
        int i;
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[0], &expected_mac_addr_0);
-       rte_eth_macaddr_get(test_params->slave_port_ids[2], &expected_mac_addr_2);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[0], &expected_mac_addr_0),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[0]);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[2], &expected_mac_addr_2),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[2]);
 
        /* Initialize bonded device with 4 slaves in round robin mode */
        TEST_ASSERT_SUCCESS(initialize_bonded_device_with_slaves(
@@ -1690,7 +1736,9 @@ test_roundrobin_verify_mac_assignment(void)
 
        /* Verify that all MACs are the same as first slave added to bonded dev */
        for (i = 0; i < test_params->bonded_slave_count; i++) {
-               rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr);
+               TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr),
+                               "Failed to get mac address (port %d)",
+                               test_params->slave_port_ids[i]);
                TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                                sizeof(read_mac_addr)),
                                "slave port (%d) mac address not set to that of primary port",
@@ -1704,7 +1752,9 @@ test_roundrobin_verify_mac_assignment(void)
                        test_params->bonded_port_id, test_params->slave_port_ids[i]);
 
        for (i = 0; i < test_params->bonded_slave_count; i++) {
-               rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr);
+               TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr),
+                               "Failed to get mac address (port %d)",
+                               test_params->slave_port_ids[i]);
                TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                                sizeof(read_mac_addr)),
                                "slave port (%d) mac address has changed to that of primary"
@@ -1719,14 +1769,18 @@ test_roundrobin_verify_mac_assignment(void)
        TEST_ASSERT_SUCCESS(rte_eth_dev_start(test_params->bonded_port_id),
                        "Failed to start bonded device");
 
-       rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->bonded_port_id);
        TEST_ASSERT_SUCCESS(
                        memcmp(&expected_mac_addr_2, &read_mac_addr, sizeof(read_mac_addr)),
                        "bonded port (%d) mac address not set to that of new primary port",
                        test_params->slave_port_ids[i]);
 
        for (i = 0; i < test_params->bonded_slave_count; i++) {
-               rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr);
+               TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr),
+                               "Failed to get mac address (port %d)",
+                               test_params->slave_port_ids[i]);
                TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_2, &read_mac_addr,
                                sizeof(read_mac_addr)),
                                "slave port (%d) mac address not set to that of new primary"
@@ -1739,14 +1793,18 @@ test_roundrobin_verify_mac_assignment(void)
                        (struct rte_ether_addr *)bonded_mac),
                        "Failed to set MAC");
 
-       rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->bonded_port_id);
        TEST_ASSERT_SUCCESS(memcmp(bonded_mac, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "bonded port (%d) mac address not set to that of new primary port",
                                test_params->slave_port_ids[i]);
 
        for (i = 0; i < test_params->bonded_slave_count; i++) {
-               rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr);
+               TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr),
+                               "Failed to get mac address (port %d)",
+                               test_params->slave_port_ids[i]);
                TEST_ASSERT_SUCCESS(memcmp(bonded_mac, &read_mac_addr,
                                sizeof(read_mac_addr)), "slave port (%d) mac address not set to"
                                " that of new primary port\n", test_params->slave_port_ids[i]);
@@ -1760,13 +1818,17 @@ static int
 test_roundrobin_verify_promiscuous_enable_disable(void)
 {
        int i, promiscuous_en;
+       int ret;
 
        /* Initialize bonded device with 4 slaves in round robin mode */
        TEST_ASSERT_SUCCESS(initialize_bonded_device_with_slaves(
                        BONDING_MODE_ROUND_ROBIN, 0, 4, 1),
                        "Failed to initialize bonded device with slaves");
 
-       rte_eth_promiscuous_enable(test_params->bonded_port_id);
+       ret = rte_eth_promiscuous_enable(test_params->bonded_port_id);
+       TEST_ASSERT_SUCCESS(ret,
+               "Failed to enable promiscuous mode for port %d: %s",
+               test_params->bonded_port_id, rte_strerror(-ret));
 
        promiscuous_en = rte_eth_promiscuous_get(test_params->bonded_port_id);
        TEST_ASSERT_EQUAL(promiscuous_en, 1,
@@ -1781,7 +1843,10 @@ test_roundrobin_verify_promiscuous_enable_disable(void)
                                test_params->slave_port_ids[i]);
        }
 
-       rte_eth_promiscuous_disable(test_params->bonded_port_id);
+       ret = rte_eth_promiscuous_disable(test_params->bonded_port_id);
+       TEST_ASSERT_SUCCESS(ret,
+               "Failed to disable promiscuous mode for port %d: %s",
+               test_params->bonded_port_id, rte_strerror(-ret));
 
        promiscuous_en = rte_eth_promiscuous_get(test_params->bonded_port_id);
        TEST_ASSERT_EQUAL(promiscuous_en, 0,
@@ -2047,7 +2112,7 @@ test_activebackup_tx_burst(void)
        initialize_eth_header(test_params->pkt_eth_hdr,
                        (struct rte_ether_addr *)src_mac,
                        (struct rte_ether_addr *)dst_mac_0,
-                       RTE_ETHER_TYPE_IPv4,  0, 0);
+                       RTE_ETHER_TYPE_IPV4,  0, 0);
        pktlen = initialize_udp_header(test_params->pkt_udp_hdr, src_port,
                        dst_port_0, 16);
        pktlen = initialize_ipv4_header(test_params->pkt_ipv4_hdr, src_addr,
@@ -2200,6 +2265,7 @@ static int
 test_activebackup_verify_promiscuous_enable_disable(void)
 {
        int i, primary_port, promiscuous_en;
+       int ret;
 
        /* Initialize bonded device with 4 slaves in round robin mode */
        TEST_ASSERT_SUCCESS(initialize_bonded_device_with_slaves(
@@ -2211,7 +2277,10 @@ test_activebackup_verify_promiscuous_enable_disable(void)
                        "failed to get primary slave for bonded port (%d)",
                        test_params->bonded_port_id);
 
-       rte_eth_promiscuous_enable(test_params->bonded_port_id);
+       ret = rte_eth_promiscuous_enable(test_params->bonded_port_id);
+       TEST_ASSERT_SUCCESS(ret,
+               "Failed to enable promiscuous mode for port %d: %s",
+               test_params->bonded_port_id, rte_strerror(-ret));
 
        TEST_ASSERT_EQUAL(rte_eth_promiscuous_get(test_params->bonded_port_id), 1,
                        "Port (%d) promiscuous mode not enabled",
@@ -2232,7 +2301,10 @@ test_activebackup_verify_promiscuous_enable_disable(void)
 
        }
 
-       rte_eth_promiscuous_disable(test_params->bonded_port_id);
+       ret = rte_eth_promiscuous_disable(test_params->bonded_port_id);
+       TEST_ASSERT_SUCCESS(ret,
+               "Failed to disable promiscuous mode for port %d: %s",
+               test_params->bonded_port_id, rte_strerror(-ret));
 
        TEST_ASSERT_EQUAL(rte_eth_promiscuous_get(test_params->bonded_port_id), 0,
                        "Port (%d) promiscuous mode not disabled\n",
@@ -2256,8 +2328,12 @@ test_activebackup_verify_mac_assignment(void)
        struct rte_ether_addr read_mac_addr;
        struct rte_ether_addr expected_mac_addr_0, expected_mac_addr_1;
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[0], &expected_mac_addr_0);
-       rte_eth_macaddr_get(test_params->slave_port_ids[1], &expected_mac_addr_1);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[0], &expected_mac_addr_0),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[0]);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[1], &expected_mac_addr_1),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[1]);
 
        /* Initialize bonded device with 2 slaves in active backup mode */
        TEST_ASSERT_SUCCESS(initialize_bonded_device_with_slaves(
@@ -2266,19 +2342,25 @@ test_activebackup_verify_mac_assignment(void)
 
        /* Verify that bonded MACs is that of first slave and that the other slave
         * MAC hasn't been changed */
-       rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->bonded_port_id);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "bonded port (%d) mac address not set to that of primary port",
                        test_params->bonded_port_id);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[0]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not set to that of primary port",
                        test_params->slave_port_ids[0]);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[1]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_1, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not as expected",
@@ -2290,19 +2372,25 @@ test_activebackup_verify_mac_assignment(void)
                        "Failed to set bonded port (%d) primary port to (%d)",
                        test_params->bonded_port_id, test_params->slave_port_ids[1]);
 
-       rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->bonded_port_id);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "bonded port (%d) mac address not set to that of primary port",
                        test_params->bonded_port_id);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[0]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not set to that of primary port",
                        test_params->slave_port_ids[0]);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[1]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_1, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not as expected",
@@ -2316,19 +2404,25 @@ test_activebackup_verify_mac_assignment(void)
        TEST_ASSERT_SUCCESS(rte_eth_dev_start(test_params->bonded_port_id),
                        "Failed to start device");
 
-       rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->bonded_port_id);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_1, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "bonded port (%d) mac address not set to that of primary port",
                        test_params->bonded_port_id);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[0]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not as expected",
                        test_params->slave_port_ids[0]);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[1]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_1, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not set to that of primary port",
@@ -2340,19 +2434,25 @@ test_activebackup_verify_mac_assignment(void)
                        (struct rte_ether_addr *)bonded_mac),
                        "failed to set MAC address");
 
-       rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->bonded_port_id);
        TEST_ASSERT_SUCCESS(memcmp(&bonded_mac, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "bonded port (%d) mac address not set to that of bonded port",
                        test_params->bonded_port_id);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[0]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not as expected",
                        test_params->slave_port_ids[0]);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[1]);
        TEST_ASSERT_SUCCESS(memcmp(&bonded_mac, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not set to that of bonded port",
@@ -2584,7 +2684,7 @@ test_balance_l2_tx_burst(void)
        initialize_eth_header(test_params->pkt_eth_hdr,
                        (struct rte_ether_addr *)src_mac,
                        (struct rte_ether_addr *)dst_mac_0,
-                       RTE_ETHER_TYPE_IPv4, 0, 0);
+                       RTE_ETHER_TYPE_IPV4, 0, 0);
        pktlen = initialize_udp_header(test_params->pkt_udp_hdr, src_port,
                        dst_port_0, 16);
        pktlen = initialize_ipv4_header(test_params->pkt_ipv4_hdr, src_addr,
@@ -2600,7 +2700,7 @@ test_balance_l2_tx_burst(void)
        initialize_eth_header(test_params->pkt_eth_hdr,
                        (struct rte_ether_addr *)src_mac,
                        (struct rte_ether_addr *)dst_mac_1,
-                       RTE_ETHER_TYPE_IPv4, 0, 0);
+                       RTE_ETHER_TYPE_IPV4, 0, 0);
 
        /* Generate a burst 2 of packets to transmit */
        TEST_ASSERT_EQUAL(generate_packet_burst(test_params->mbuf_pool, &pkts_burst[1][0],
@@ -3110,13 +3210,17 @@ static int
 test_balance_verify_promiscuous_enable_disable(void)
 {
        int i;
+       int ret;
 
        /* Initialize bonded device with 4 slaves in round robin mode */
        TEST_ASSERT_SUCCESS(initialize_bonded_device_with_slaves(
                        BONDING_MODE_BALANCE, 0, 4, 1),
                        "Failed to initialise bonded device");
 
-       rte_eth_promiscuous_enable(test_params->bonded_port_id);
+       ret = rte_eth_promiscuous_enable(test_params->bonded_port_id);
+       TEST_ASSERT_SUCCESS(ret,
+               "Failed to enable promiscuous mode for port %d: %s",
+               test_params->bonded_port_id, rte_strerror(-ret));
 
        TEST_ASSERT_EQUAL(rte_eth_promiscuous_get(test_params->bonded_port_id), 1,
                        "Port (%d) promiscuous mode not enabled",
@@ -3129,7 +3233,10 @@ test_balance_verify_promiscuous_enable_disable(void)
                                test_params->slave_port_ids[i]);
        }
 
-       rte_eth_promiscuous_disable(test_params->bonded_port_id);
+       ret = rte_eth_promiscuous_disable(test_params->bonded_port_id);
+       TEST_ASSERT_SUCCESS(ret,
+               "Failed to disable promiscuous mode for port %d: %s",
+               test_params->bonded_port_id, rte_strerror(-ret));
 
        TEST_ASSERT_EQUAL(rte_eth_promiscuous_get(test_params->bonded_port_id), 0,
                        "Port (%d) promiscuous mode not disabled",
@@ -3152,8 +3259,12 @@ test_balance_verify_mac_assignment(void)
        struct rte_ether_addr read_mac_addr;
        struct rte_ether_addr expected_mac_addr_0, expected_mac_addr_1;
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[0], &expected_mac_addr_0);
-       rte_eth_macaddr_get(test_params->slave_port_ids[1], &expected_mac_addr_1);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[0], &expected_mac_addr_0),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[0]);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[1], &expected_mac_addr_1),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[1]);
 
        /* Initialize bonded device with 2 slaves in active backup mode */
        TEST_ASSERT_SUCCESS(initialize_bonded_device_with_slaves(
@@ -3162,19 +3273,25 @@ test_balance_verify_mac_assignment(void)
 
        /* Verify that bonded MACs is that of first slave and that the other slave
         * MAC hasn't been changed */
-       rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->bonded_port_id);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "bonded port (%d) mac address not set to that of primary port",
                        test_params->bonded_port_id);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[0]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not set to that of primary port",
                        test_params->slave_port_ids[0]);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[1]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not set to that of primary port",
@@ -3186,19 +3303,25 @@ test_balance_verify_mac_assignment(void)
                        "Failed to set bonded port (%d) primary port to (%d)\n",
                        test_params->bonded_port_id, test_params->slave_port_ids[1]);
 
-       rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->bonded_port_id);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "bonded port (%d) mac address not set to that of primary port",
                        test_params->bonded_port_id);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[0]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not set to that of primary port",
                        test_params->slave_port_ids[0]);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[1]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not set to that of primary port",
@@ -3212,19 +3335,25 @@ test_balance_verify_mac_assignment(void)
        TEST_ASSERT_SUCCESS(rte_eth_dev_start(test_params->bonded_port_id),
                        "Failed to start bonded device");
 
-       rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->bonded_port_id);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_1, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "bonded port (%d) mac address not set to that of primary port",
                        test_params->bonded_port_id);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[0]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_1, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not set to that of primary port",
                        test_params->slave_port_ids[0]);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[1]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_1, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not set to that of primary port",
@@ -3236,19 +3365,25 @@ test_balance_verify_mac_assignment(void)
                        (struct rte_ether_addr *)bonded_mac),
                        "failed to set MAC");
 
-       rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->bonded_port_id);
        TEST_ASSERT_SUCCESS(memcmp(&bonded_mac, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "bonded port (%d) mac address not set to that of bonded port",
                        test_params->bonded_port_id);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[0]);
        TEST_ASSERT_SUCCESS(memcmp(&bonded_mac, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not as expected\n",
                                test_params->slave_port_ids[0]);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[1]);
        TEST_ASSERT_SUCCESS(memcmp(&bonded_mac, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not set to that of bonded port",
@@ -3426,7 +3561,7 @@ test_broadcast_tx_burst(void)
        initialize_eth_header(test_params->pkt_eth_hdr,
                        (struct rte_ether_addr *)src_mac,
                        (struct rte_ether_addr *)dst_mac_0,
-                       RTE_ETHER_TYPE_IPv4, 0, 0);
+                       RTE_ETHER_TYPE_IPV4, 0, 0);
 
        pktlen = initialize_udp_header(test_params->pkt_udp_hdr, src_port,
                        dst_port_0, 16);
@@ -3696,13 +3831,17 @@ static int
 test_broadcast_verify_promiscuous_enable_disable(void)
 {
        int i;
+       int ret;
 
        /* Initialize bonded device with 4 slaves in round robin mode */
        TEST_ASSERT_SUCCESS(initialize_bonded_device_with_slaves(
                        BONDING_MODE_BROADCAST, 0, 4, 1),
                        "Failed to initialise bonded device");
 
-       rte_eth_promiscuous_enable(test_params->bonded_port_id);
+       ret = rte_eth_promiscuous_enable(test_params->bonded_port_id);
+       TEST_ASSERT_SUCCESS(ret,
+               "Failed to enable promiscuous mode for port %d: %s",
+               test_params->bonded_port_id, rte_strerror(-ret));
 
 
        TEST_ASSERT_EQUAL(rte_eth_promiscuous_get(test_params->bonded_port_id), 1,
@@ -3716,7 +3855,10 @@ test_broadcast_verify_promiscuous_enable_disable(void)
                                test_params->slave_port_ids[i]);
        }
 
-       rte_eth_promiscuous_disable(test_params->bonded_port_id);
+       ret = rte_eth_promiscuous_disable(test_params->bonded_port_id);
+       TEST_ASSERT_SUCCESS(ret,
+               "Failed to disable promiscuous mode for port %d: %s",
+               test_params->bonded_port_id, rte_strerror(-ret));
 
        TEST_ASSERT_EQUAL(rte_eth_promiscuous_get(test_params->bonded_port_id), 0,
                        "Port (%d) promiscuous mode not disabled",
@@ -3741,8 +3883,12 @@ test_broadcast_verify_mac_assignment(void)
 
        int i;
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[0], &expected_mac_addr_0);
-       rte_eth_macaddr_get(test_params->slave_port_ids[2], &expected_mac_addr_1);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[0], &expected_mac_addr_0),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[0]);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[2], &expected_mac_addr_1),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[2]);
 
        /* Initialize bonded device with 4 slaves in round robin mode */
        TEST_ASSERT_SUCCESS(initialize_bonded_device_with_slaves(
@@ -3752,7 +3898,9 @@ test_broadcast_verify_mac_assignment(void)
        /* Verify that all MACs are the same as first slave added to bonded
         * device */
        for (i = 0; i < test_params->bonded_slave_count; i++) {
-               rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr);
+               TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr),
+                               "Failed to get mac address (port %d)",
+                               test_params->slave_port_ids[i]);
                TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                                sizeof(read_mac_addr)),
                                "slave port (%d) mac address not set to that of primary port",
@@ -3766,7 +3914,9 @@ test_broadcast_verify_mac_assignment(void)
                        test_params->bonded_port_id, test_params->slave_port_ids[i]);
 
        for (i = 0; i < test_params->bonded_slave_count; i++) {
-               rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr);
+               TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr),
+                               "Failed to get mac address (port %d)",
+                               test_params->slave_port_ids[i]);
                TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                                sizeof(read_mac_addr)),
                                "slave port (%d) mac address has changed to that of primary "
@@ -3782,14 +3932,18 @@ test_broadcast_verify_mac_assignment(void)
        TEST_ASSERT_SUCCESS(rte_eth_dev_start(test_params->bonded_port_id),
                        "Failed to start bonded device");
 
-       rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->bonded_port_id);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_1, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "bonded port (%d) mac address not set to that of new primary  port",
                        test_params->slave_port_ids[i]);
 
        for (i = 0; i < test_params->bonded_slave_count; i++) {
-               rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr);
+               TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr),
+                               "Failed to get mac address (port %d)",
+                               test_params->slave_port_ids[i]);
                TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_1, &read_mac_addr,
                                sizeof(read_mac_addr)),
                                "slave port (%d) mac address not set to that of new primary "
@@ -3802,7 +3956,9 @@ test_broadcast_verify_mac_assignment(void)
                        (struct rte_ether_addr *)bonded_mac),
                        "Failed to set MAC address");
 
-       rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->bonded_port_id);
        TEST_ASSERT_SUCCESS(memcmp(bonded_mac, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "bonded port (%d) mac address not set to that of new primary port",
@@ -3810,7 +3966,9 @@ test_broadcast_verify_mac_assignment(void)
 
 
        for (i = 0; i < test_params->bonded_slave_count; i++) {
-               rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr);
+               TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr),
+                               "Failed to get mac address (port %d)",
+                               test_params->slave_port_ids[i]);
                TEST_ASSERT_SUCCESS(memcmp(bonded_mac, &read_mac_addr,
                                sizeof(read_mac_addr)),
                                "slave port (%d) mac address not set to that of new primary "
@@ -4012,12 +4170,12 @@ test_tlb_tx_burst(void)
                        initialize_eth_header(test_params->pkt_eth_hdr,
                                        (struct rte_ether_addr *)src_mac,
                                        (struct rte_ether_addr *)dst_mac_0,
-                                       RTE_ETHER_TYPE_IPv4, 0, 0);
+                                       RTE_ETHER_TYPE_IPV4, 0, 0);
                } else {
                        initialize_eth_header(test_params->pkt_eth_hdr,
                                        (struct rte_ether_addr *)test_params->default_slave_mac,
                                        (struct rte_ether_addr *)dst_mac_0,
-                                       RTE_ETHER_TYPE_IPv4, 0, 0);
+                                       RTE_ETHER_TYPE_IPV4, 0, 0);
                }
                pktlen = initialize_udp_header(test_params->pkt_udp_hdr, src_port,
                                dst_port_0, 16);
@@ -4174,6 +4332,7 @@ static int
 test_tlb_verify_promiscuous_enable_disable(void)
 {
        int i, primary_port, promiscuous_en;
+       int ret;
 
        /* Initialize bonded device with 4 slaves in transmit load balancing mode */
        TEST_ASSERT_SUCCESS( initialize_bonded_device_with_slaves(
@@ -4185,7 +4344,10 @@ test_tlb_verify_promiscuous_enable_disable(void)
                        "failed to get primary slave for bonded port (%d)",
                        test_params->bonded_port_id);
 
-       rte_eth_promiscuous_enable(test_params->bonded_port_id);
+       ret = rte_eth_promiscuous_enable(test_params->bonded_port_id);
+       TEST_ASSERT_SUCCESS(ret,
+               "Failed to enable promiscuous mode for port %d: %s",
+               test_params->bonded_port_id, rte_strerror(-ret));
 
        promiscuous_en = rte_eth_promiscuous_get(test_params->bonded_port_id);
        TEST_ASSERT_EQUAL(promiscuous_en, (int)1,
@@ -4206,7 +4368,10 @@ test_tlb_verify_promiscuous_enable_disable(void)
 
        }
 
-       rte_eth_promiscuous_disable(test_params->bonded_port_id);
+       ret = rte_eth_promiscuous_disable(test_params->bonded_port_id);
+       TEST_ASSERT_SUCCESS(ret,
+               "Failed to disable promiscuous mode for port %d: %s\n",
+               test_params->bonded_port_id, rte_strerror(-ret));
 
        promiscuous_en = rte_eth_promiscuous_get(test_params->bonded_port_id);
        TEST_ASSERT_EQUAL(promiscuous_en, (int)0,
@@ -4231,8 +4396,12 @@ test_tlb_verify_mac_assignment(void)
        struct rte_ether_addr read_mac_addr;
        struct rte_ether_addr expected_mac_addr_0, expected_mac_addr_1;
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[0], &expected_mac_addr_0);
-       rte_eth_macaddr_get(test_params->slave_port_ids[1], &expected_mac_addr_1);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[0], &expected_mac_addr_0),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[0]);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[1], &expected_mac_addr_1),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[1]);
 
        /* Initialize bonded device with 2 slaves in active backup mode */
        TEST_ASSERT_SUCCESS(initialize_bonded_device_with_slaves(
@@ -4241,19 +4410,25 @@ test_tlb_verify_mac_assignment(void)
 
        /* Verify that bonded MACs is that of first slave and that the other slave
         * MAC hasn't been changed */
-       rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->bonded_port_id);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "bonded port (%d) mac address not set to that of primary port",
                        test_params->bonded_port_id);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[0]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not set to that of primary port",
                        test_params->slave_port_ids[0]);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[1]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_1, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not as expected",
@@ -4265,19 +4440,25 @@ test_tlb_verify_mac_assignment(void)
                        "Failed to set bonded port (%d) primary port to (%d)",
                        test_params->bonded_port_id, test_params->slave_port_ids[1]);
 
-       rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->bonded_port_id);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "bonded port (%d) mac address not set to that of primary port",
                        test_params->bonded_port_id);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[0]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not set to that of primary port",
                        test_params->slave_port_ids[0]);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[1]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_1, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not as expected",
@@ -4291,19 +4472,25 @@ test_tlb_verify_mac_assignment(void)
        TEST_ASSERT_SUCCESS(rte_eth_dev_start(test_params->bonded_port_id),
                        "Failed to start device");
 
-       rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->bonded_port_id);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_1, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "bonded port (%d) mac address not set to that of primary port",
                        test_params->bonded_port_id);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[0]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not as expected",
                        test_params->slave_port_ids[0]);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[1]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_1, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not set to that of primary port",
@@ -4316,19 +4503,25 @@ test_tlb_verify_mac_assignment(void)
                        (struct rte_ether_addr *)bonded_mac),
                        "failed to set MAC address");
 
-       rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->bonded_port_id);
        TEST_ASSERT_SUCCESS(memcmp(&bonded_mac, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "bonded port (%d) mac address not set to that of bonded port",
                        test_params->bonded_port_id);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[0], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[0]);
        TEST_ASSERT_SUCCESS(memcmp(&expected_mac_addr_0, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not as expected",
                        test_params->slave_port_ids[0]);
 
-       rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr);
+       TEST_ASSERT_SUCCESS(rte_eth_macaddr_get(test_params->slave_port_ids[1], &read_mac_addr),
+                       "Failed to get mac address (port %d)",
+                       test_params->slave_port_ids[1]);
        TEST_ASSERT_SUCCESS(memcmp(&bonded_mac, &read_mac_addr,
                        sizeof(read_mac_addr)),
                        "slave port (%d) mac address not set to that of bonded port",