From patchwork Wed Oct 14 17:58:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Smith X-Patchwork-Id: 1382284 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nutanix.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nutanix.com header.i=@nutanix.com header.a=rsa-sha256 header.s=proofpoint20171006 header.b=I1f2Ku1T; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CBKsW3RlCz9sSs for ; Thu, 15 Oct 2020 04:58:39 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EEEF286A1D; Wed, 14 Oct 2020 17:58:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LEJ2NS8yL0Ft; Wed, 14 Oct 2020 17:58:35 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id F231587BB0; Wed, 14 Oct 2020 17:58:34 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id D6DAEC07FF; Wed, 14 Oct 2020 17:58:34 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 41714C0051 for ; Wed, 14 Oct 2020 17:58:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 287B6876FD for ; Wed, 14 Oct 2020 17:58:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0AlkKwITk0LX for ; Wed, 14 Oct 2020 17:58:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx0b-002c1b01.pphosted.com (mx0b-002c1b01.pphosted.com [148.163.155.12]) by whitealder.osuosl.org (Postfix) with ESMTPS id 77ECC876FC for ; Wed, 14 Oct 2020 17:58:32 +0000 (UTC) Received: from pps.filterd (m0127843.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 09EHv1bF017555 for ; Wed, 14 Oct 2020 10:58:31 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h=date : from : to : subject : message-id : content-type : mime-version; s=proofpoint20171006; bh=ESv+cB200Cj7ZaFiPnOjPsg63XQrdWUd57khC+9za9M=; b=I1f2Ku1Trbt+qCFlnbc8B9Poj+d/j7ie+0xfH05jnWmv0DE1y2xOpaOBkRbDjQpGqDhk pkQq8aFgO5TMU13a+9tMe3MYz7BAQ5wi/wls2IvkGYYYy+CjJnf/PXDXMFjWwSgC/hWw OG3fjdTccdXilcTZeSuOCZRlp2EvZVmIj8R1eImOmu3MvL+UcBdgYkHQO20eye3S5MWU kxKWMzrC1s2dJf60oV80rhIBexqJ+ZaztPtKPWsYodvmdnYxotAgnyT1ztjLNgXradYE gVMukSwCuvKQ1gZj4MFcd5Hu13dsCGJewW0sFuC8Rqr9apsz1du3X/oZYEGW7kgI9SGu oA== Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2176.outbound.protection.outlook.com [104.47.58.176]) by mx0b-002c1b01.pphosted.com with ESMTP id 343b2j1fwd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 14 Oct 2020 10:58:31 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=llhUzu5U89AiXUp85oYLJJgF3865Etl7ycf1Hub293RpZCbmrZA+7emJLN8KQ07ZHPqDqpfmmpk53lCR5oY3xCZ7gJvMq55+TyU8oawu0Jt1cVrz2ydy2Et780487M5WRF5w7toDjXvxtcf351hn38IezX8qO2Dq/nO2/UTvQMhbm7UJw1KupwKcq9SL02AYcWjhcsZU2a0db2aPJtVWIq3e8p4LP41J3BMLNjXGzU/2kkgO3MNniHoqCuazAUCh4EVMutEfUExmhBOhx4kIULoz4Xda1yky1b7FnIPZ2MszP13PZ/NVwgVSlAfwMiNQ+ephC1Vyd5RHYzlNcbq9Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ESv+cB200Cj7ZaFiPnOjPsg63XQrdWUd57khC+9za9M=; b=MOMW0JR2wnaHSPAL6EofxEFxSnAl7fhkRQCQWhdayeUXPDcJjDw5UQUHN41Q5sbRQrWoBznaVfMn4KFzijLiOKaBhkQZOqePhJE6X5Rzw22AjgOjthgAE9HJdvxBIrNV9pFrZuux99nTko419DfljLzJU3KVc3TPMziLpBIE8xBgqALlWjCfPhs8zjlgFw3PNGnvwwK9ihxS/KFJQugrcETWcKInZZTAaydMhtaEHVI5+BZ9AnBGYppOcbEoH4xjFY5n3g8j2Pj9SmjOdT0NK+BnR9dEtFsyJUDi9u9auynlEs9L5XQoUscRhOHp7a633U7Bb4Gck5aM/68WEKUNkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none Authentication-Results: openvswitch.org; dkim=none (message not signed) header.d=none;openvswitch.org; dmarc=none action=none header.from=nutanix.com; Received: from MWHPR0201MB3513.namprd02.prod.outlook.com (2603:10b6:301:77::10) by MW2PR02MB3707.namprd02.prod.outlook.com (2603:10b6:907:12::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.20; Wed, 14 Oct 2020 17:58:30 +0000 Received: from MWHPR0201MB3513.namprd02.prod.outlook.com ([fe80::70d4:5c92:11dc:8a10]) by MWHPR0201MB3513.namprd02.prod.outlook.com ([fe80::70d4:5c92:11dc:8a10%6]) with mapi id 15.20.3455.030; Wed, 14 Oct 2020 17:58:30 +0000 Date: Wed, 14 Oct 2020 17:58:28 +0000 From: Gregory Smith To: ovs-dev@openvswitch.org Message-ID: <20201014175828.GH86739@greg-smith> Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-Originating-IP: [192.146.155.5] X-ClientProxiedBy: BYAPR06CA0029.namprd06.prod.outlook.com (2603:10b6:a03:d4::42) To MWHPR0201MB3513.namprd02.prod.outlook.com (2603:10b6:301:77::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (192.146.155.5) by BYAPR06CA0029.namprd06.prod.outlook.com (2603:10b6:a03:d4::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.21 via Frontend Transport; Wed, 14 Oct 2020 17:58:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1133f663-ca4a-45c4-65b5-08d8706ac234 X-MS-TrafficTypeDiagnostic: MW2PR02MB3707: X-Microsoft-Antispam-PRVS: x-proofpoint-crosstenant: true X-MS-Oob-TLC-OOBClassifiers: OLM:1468; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w4P/iLDD+GeYG9jAOAHu1+xUld6bwNijFe6lVKscYUAIG+WBZQZoff2zlszkZypOTIdsJTB+yRxk02Q5H6i2GqSPz+7gKaYJVETnR4pNJQ5AHgQ3DLV/q6wDVXO4E1RU9e+2CubMJ/H1qa4iAZDtDnspgSPxT83CVbhz5YBG1YQQwKjjKBa3StmuI9z6pBo0MJIpM66W98ugvaKy2feGMZHpxJz5O7pP333DaDEVJvmCCJlKidT0eExLW+mnLmrOr7fg4CZXdOyvkA8T1U37W1SijKsSBfhgTnQUQmaeiYy2W+SFtosV0fj1Ao3qy828 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR0201MB3513.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(7916004)(136003)(376002)(346002)(39860400002)(396003)(366004)(26005)(66556008)(66946007)(86362001)(8936002)(8676002)(16526019)(956004)(6496006)(186003)(6916009)(5660300002)(2906002)(1076003)(6486002)(33656002)(478600001)(9686003)(52116002)(66476007)(316002)(33716001)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 6/Ap6ASUAjShzACyhk4rq67FCiBlDPnEA4SYOaHRjE/YCY+/lJn52r9X0uqpHaMby5Q2w03cN/xgvcc+j+nAr8HGhvdnh0e9F2wmNcgMOFVcomn0ZQkrR10cpLQ/0lybAInb5f2EvSPIuWgmQozwBl0ifaCa4wqkzfB0mvmovmwmjyHqAqvlFuGm5k5ZG0ykef1o0erEfJr6beCuBIu7kQNNdaHd0VaU5KNAG1A+WMtv7quA7pMplvfMSSxjYSRIlJba5H8xq7lb0WWXwnBk5igTCz4+pgHCGCx/ePnAe8ahcgBNIRF086LSmpfZ9LqCn6p/v1q0SzGYSVPnXaWTKclQjaxBzhQk+LPzZHDpUfbpfG6CHdXlclF8DYf9nHl6sBoymHorPORFEdOGpI0AA5N+YSkZsq4UbIRKGrr6OhrVvVHYHYJfqWPequKEhkpCpYqB+Aqtd2XBCsUN4aAVoGkJG5I+mothXm0z0evGzazhv+lTtEn68yDhjhnYgGts3hZjsl0B9bADXjDfUe7KLke7Cha7xauoLB463kEJlZXkLQL9HL1Lsf3r/8Oh+PDp1HvNFntj0HcD2MC4aN887BmxzXLfcF8K9zaojEpjRIqnYL4wneYBUedt6hhpaXNzh7nlyVWhV7pt4nnIBGsOyw== X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1133f663-ca4a-45c4-65b5-08d8706ac234 X-MS-Exchange-CrossTenant-AuthSource: MWHPR0201MB3513.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Oct 2020 17:58:30.1862 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: RlFIRbTrIW2Mf7CMnXcvjq0FUAArvfElTAJbwwLMDUQHrbngYjlLD1QpOG28mnp5jtKgHiqGM8/fxYN/Ajbp4A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR02MB3707 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-10-14_11:2020-10-14, 2020-10-14 signatures=0 X-Proofpoint-Spam-Reason: safe Subject: [ovs-dev] [PATCH ovn] tests: Use ovn-nbctl --wait=hv sync for I-P test. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" This patch makes the "controller I-P handling with monitoring disabled" testcase more determinstic, by waiting for flows to be synchronized to the hypervisor before counting them. Signed-off-by: Gregory Smith --- tests/ovn.at | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index 488fd119b..ba83dc1bf 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -21083,6 +21083,7 @@ ovs-vsctl -- add-port br-int hv1-vif1 -- \ ofport-request=1 OVS_WAIT_UNTIL([test x$(ovn-nbctl lsp-get-up sw0-p1) = xup]) +ovn-nbctl --wait=hv sync # Get the number of OF flows in hv1 and hv2 hv1_offlows=$(as hv1 ovs-ofctl dump-flows br-int | wc -l) @@ -21097,6 +21098,7 @@ ovs-vsctl -- add-port br-int hv2-vif1 -- \ ofport-request=1 OVS_WAIT_UNTIL([test x$(ovn-nbctl lsp-get-up sw0-p2) = xup]) +ovn-nbctl --wait=hv sync hv2_offlows=$(as hv2 ovs-ofctl dump-flows br-int | wc -l) echo "hv2 flows : $hv2_offlows" @@ -21135,10 +21137,11 @@ ovs-vsctl -- add-port br-int hv1-vif1 -- \ ofport-request=1 OVS_WAIT_UNTIL([test x$(ovn-nbctl lsp-get-up sw0-p1) = xup]) +ovn-nbctl --wait=hv sync # Get the number of OF flows in hv1 and hv2 hv1_offlows_mon=$(as hv1 ovs-ofctl dump-flows br-int | wc -l) -echo "hv1 flows after monitor-all=true : $hv1_offlows" +echo "hv1 flows after monitor-all=true : $hv1_offlows_mon" AT_CHECK([test "$hv1_offlows" = "$hv1_offlows_mon"]) as hv2 @@ -21149,9 +21152,10 @@ ovs-vsctl -- add-port br-int hv2-vif1 -- \ ofport-request=1 OVS_WAIT_UNTIL([test x$(ovn-nbctl lsp-get-up sw0-p2) = xup]) +ovn-nbctl --wait=hv sync hv2_offlows_mon=$(as hv2 ovs-ofctl dump-flows br-int | wc -l) -echo "hv2 flows after monitor-all=true : $hv2_offlows" +echo "hv2 flows after monitor-all=true : $hv2_offlows_mon" AT_CHECK([test "$hv2_offlows" = "$hv2_offlows_mon"]) OVN_CLEANUP([hv1], [hv2])