net/ice: fix perfect match for ACL rule

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

diff --git a/app/test/test_event_crypto_adapter.c b/app/test/test_event_crypto_adapter.c
index db9d75d..a0169aa 100644 (file)
--- a/app/test/test_event_crypto_adapter.c
+++ b/app/test/test_event_crypto_adapter.c
@@ -201,8 +201,8 @@ test_op_forward_mode(uint8_t session_less)
                                &cipher_xform, params.session_priv_mpool);
                TEST_ASSERT_SUCCESS(ret, "Failed to init session\n");
 
-               ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID,
-                                                       evdev, &cap);
+               ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID,
+                                                       &cap);
                TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
                if (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_SESSION_PRIVATE_DATA) {
@@ -288,7 +288,7 @@ test_sessionless_with_op_forward_mode(void)
        uint32_t cap;
        int ret;
 
-       ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap);
+       ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap);
        TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
        if (!(cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) &&
@@ -313,7 +313,7 @@ test_session_with_op_forward_mode(void)
        uint32_t cap;
        int ret;
 
-       ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap);
+       ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap);
        TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
        if (!(cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) &&
@@ -394,8 +394,8 @@ test_op_new_mode(uint8_t session_less)
                                params.session_mpool);
                TEST_ASSERT_NOT_NULL(sess, "Session creation failed\n");
 
-               ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID,
-                                                       evdev, &cap);
+               ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID,
+                                                       &cap);
                TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
                if (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_SESSION_PRIVATE_DATA) {
@@ -444,7 +444,7 @@ test_sessionless_with_op_new_mode(void)
        uint32_t cap;
        int ret;
 
-       ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap);
+       ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap);
        TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
        if (!(cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) &&
@@ -470,7 +470,7 @@ test_session_with_op_new_mode(void)
        uint32_t cap;
        int ret;
 
-       ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap);
+       ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap);
        TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
        if (!(cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) &&
@@ -692,7 +692,7 @@ test_crypto_adapter_create(void)
 
        /* Create adapter with default port creation callback */
        ret = rte_event_crypto_adapter_create(TEST_ADAPTER_ID,
-                                             TEST_CDEV_ID,
+                                             evdev,
                                              &conf, 0);
        TEST_ASSERT_SUCCESS(ret, "Failed to create event crypto adapter\n");
 
@@ -705,7 +705,7 @@ test_crypto_adapter_qp_add_del(void)
        uint32_t cap;
        int ret;
 
-       ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap);
+       ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap);
        TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
        if (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND) {
@@ -885,6 +885,27 @@ testsuite_setup(void)
        return TEST_SUCCESS;
 }
 
+static void
+crypto_adapter_teardown(void)
+{
+       int ret;
+
+       ret = rte_event_crypto_adapter_stop(TEST_ADAPTER_ID);
+       if (ret < 0)
+               RTE_LOG(ERR, USER1, "Failed to stop adapter!");
+
+       ret = rte_event_crypto_adapter_queue_pair_del(TEST_ADAPTER_ID,
+                                       TEST_CDEV_ID, TEST_CDEV_QP_ID);
+       if (ret < 0)
+               RTE_LOG(ERR, USER1, "Failed to delete queue pair!");
+
+       ret = rte_event_crypto_adapter_free(TEST_ADAPTER_ID);
+       if (ret < 0)
+               RTE_LOG(ERR, USER1, "Failed to free adapter!");
+
+       crypto_adapter_setup_done = 0;
+}
+
 static void
 crypto_teardown(void)
 {
@@ -927,6 +948,7 @@ eventdev_teardown(void)
 static void
 testsuite_teardown(void)
 {
+       crypto_adapter_teardown();
        crypto_teardown();
        eventdev_teardown();
 }