From patchwork Tue Oct 24 11:00:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 116939 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5663715qgn; Tue, 24 Oct 2017 04:01:23 -0700 (PDT) X-Google-Smtp-Source: ABhQp+R6EfJvPR0UAiQ/592Q0Fvp/jqVaVxL9A2QHNrvTsEMt1swJOj1YbTcBXj7BgKEAfZl2boQ X-Received: by 10.55.82.86 with SMTP id g83mr22744066qkb.342.1508842883787; Tue, 24 Oct 2017 04:01:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508842883; cv=none; d=google.com; s=arc-20160816; b=fY1VAMD+1WKBbcCX4AtArYAf/h9aw2X1Hw247kODX/GOcBEJE1R3/MSY4dIwN0ngiP p4r4RyI9MSxfURDq2amaEDRBHh4lgPfrERfIjID0daPkDkkmxilx8MbHnE93Jb1TfAVQ zuPobMQAmZVf1tPydzZmydGoMJsOqNgVWIvEgkQPhwvG/XNr1LaTQVuWvYaoF3dyI3nk 4l4PulLcOLV1GygCd27+vSbDx/kkVWweKrU3z7KzvEsgIMgLgY2eQSZPD8ISIihLe6Kc aVUlx18NKEcJ3OkEVNZJxmE/hEEVN5EwaL6YN3r5K7aM1j6IYkl9tG2pIqBkUJ1yaYlM tzWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=rg/rsJ6OZay3rQjK8ygXQtJj0nQpQzR7wDPsf8Fhd3o=; b=Opm8//K7cft8D7oi9VsiWhxnHkTtetWkZo5fuYoNbsmlp7mCqtmunhsh/FtR79BmWs xE7yp6vCr8Pp+1/hFs9D9Qwsvy9Cru/Tyase13XBQQq19L0ACVRL5F/B78rqK3IuiAwA R7mf1BD/eRkVauQeJzFdtk1ajGNMRI99hrqRHa8ArxxeA4qiruL7mvbPIJxZV3Pzu5sf eS8+WiZqjR1z5MmiKJ8BI9FRH3U6/NQ6eO9ejbI4+NcYjbOKofeh3nAeXqDXE0WkOWB3 nsj5YDQ7seuVv9oqFjxgaUJCW2BZr4RhyWQuGdYXZUgCEUPItR41X1Jl5Yz9t3RuHOGs 9IHA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id i127si18890qkf.196.2017.10.24.04.01.23; Tue, 24 Oct 2017 04:01:23 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 6FD95622CF; Tue, 24 Oct 2017 11:01:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 53C476286B; Tue, 24 Oct 2017 11:00:45 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E244B622D5; Tue, 24 Oct 2017 11:00:33 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id 2A682622D5 for ; Tue, 24 Oct 2017 11:00:32 +0000 (UTC) Received: from mxback11j.mail.yandex.net (mxback11j.mail.yandex.net [IPv6:2a02:6b8:0:1619::84]) by forward100j.mail.yandex.net (Yandex) with ESMTP id 8C1235D81A25 for ; Tue, 24 Oct 2017 14:00:30 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback11j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id i5bx5C64tv-0U9q4jKf; Tue, 24 Oct 2017 14:00:30 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id hdAvnRHsih-0TPCCNEj; Tue, 24 Oct 2017 14:00:29 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 24 Oct 2017 14:00:05 +0300 Message-Id: <1508842806-17934-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508842806-17934-1-git-send-email-odpbot@yandex.ru> References: <1508842806-17934-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 256 Subject: [lng-odp] [PATCH API-NEXT v1 2/3] validation: ipsec: adapt to odp_ipsec_sa_disable() change X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 256 (lumag:ipsec_sa_disable_v2) ** https://github.com/Linaro/odp/pull/256 ** Patch: https://github.com/Linaro/odp/pull/256.patch ** Base sha: 825f75ed8644ef57c5648961e7982daf13cd9375 ** Merge commit sha: 1bab6bb255422c8eb061c6482397eb498fc7b1cc **/ test/validation/api/ipsec/ipsec.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c index a8fdf2b14..ea385d2ae 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c @@ -315,7 +315,9 @@ void ipsec_sa_param_fill(odp_ipsec_sa_param_t *param, void ipsec_sa_destroy(odp_ipsec_sa_t sa) { odp_event_t event; - odp_ipsec_status_t status; + odp_packet_t packet; + odp_ipsec_packet_result_t result; + odp_event_subtype_t subtype; CU_ASSERT_EQUAL(ODP_IPSEC_OK, odp_ipsec_sa_disable(sa)); @@ -324,14 +326,18 @@ void ipsec_sa_destroy(odp_ipsec_sa_t sa) event = odp_queue_deq(suite_context.queue); } while (event == ODP_EVENT_INVALID); - CU_ASSERT_EQUAL(ODP_EVENT_IPSEC_STATUS, odp_event_type(event)); + CU_ASSERT_EQUAL(ODP_EVENT_PACKET, + odp_event_types(event, &subtype)); + CU_ASSERT_EQUAL(ODP_EVENT_PACKET_IPSEC, + subtype); - CU_ASSERT_EQUAL(ODP_IPSEC_OK, odp_ipsec_status(&status, event)); + packet = odp_ipsec_packet_from_event(event); - CU_ASSERT_EQUAL(ODP_IPSEC_STATUS_SA_DISABLE, status.id); - CU_ASSERT_EQUAL(sa, status.sa); - CU_ASSERT_EQUAL(0, status.result); - CU_ASSERT_EQUAL(0, status.warn.all); + CU_ASSERT_EQUAL(0, odp_ipsec_result(&result, packet)); + + CU_ASSERT_EQUAL(sa, result.sa); + CU_ASSERT_EQUAL(1, result.status.error.sa_disabled); + CU_ASSERT_EQUAL(0, result.status.warn.all); odp_event_free(event); }