From patchwork Tue Nov 5 19:23:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 2007114 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Xuylrlab; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XjdYM2dTVz1xyP for ; Wed, 6 Nov 2024 06:23:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 22780810B4; Tue, 5 Nov 2024 19:23:45 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 1eLPgr8halPN; Tue, 5 Nov 2024 19:23:44 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.9.56; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 0D075810B9 Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Xuylrlab Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 0D075810B9; Tue, 5 Nov 2024 19:23:44 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id BA14EC08A8; Tue, 5 Nov 2024 19:23:43 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 55967C08A3 for ; Tue, 5 Nov 2024 19:23:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 38572810B4 for ; Tue, 5 Nov 2024 19:23:42 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id aIqRHKaifphX for ; Tue, 5 Nov 2024 19:23:41 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=lorenzo.bianconi@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 2B791810B3 Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 2B791810B3 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id 2B791810B3 for ; Tue, 5 Nov 2024 19:23:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730834619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HzIDqtrZw+QPxHD0p2F0gf+rw7qZ4QZYoWC4vwf8DK8=; b=XuylrlabaEUZgQCFCy2eOZgihwUBGgBEqdKF4HJgN6r+Vn3XUojaWdL1MikjzGDw2/ZeaB D03sA/5VukUO7OCQIW62uXOXfOTr2JtyRqHqyaCQ8VoGQyrKLCzEtb+VlR6aTnrU+kBdNh 6ufNGDyWd7OYipfLFCI5jBRc0LjNUSg= Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-59-_UW8XexvOtSNprY9wdj50w-1; Tue, 05 Nov 2024 14:23:38 -0500 X-MC-Unique: _UW8XexvOtSNprY9wdj50w-1 Received: by mail-ot1-f72.google.com with SMTP id 46e09a7af769-7181c09565eso4617049a34.1 for ; Tue, 05 Nov 2024 11:23:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730834618; x=1731439418; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HzIDqtrZw+QPxHD0p2F0gf+rw7qZ4QZYoWC4vwf8DK8=; b=q19dNIOgHZWB7VYYufUXJ5fJZXYJ+6AO5Gzdm4XOhz0IAGunm7US6V36KdFyQn+DKp rUxgaMcFEJfhxLgdp7wrGmwWOxJDdATq1FsDqBjJ0tlcN0G4KsVmSzkk0Z7G9Bwz4RPt x7CoErP9dL7H7r5ijwm5ZB5RdMk+8+EmvX3qb49u4adpEHVAPU6mlKizPCWaf3Wkhyxu PZb6HIvw6Giwgj/h1hAoySC0hfYHFpWZP36fT9dndjP34KPv4736IJCffzaIdatSng8Q KqksMnqDtei2HfPCu1M5FVQnnocaGCgQAdt+OZk23Fg8AfpPBduvMXbD8p3gshRQUEyp yx/w== X-Gm-Message-State: AOJu0YwF48+wQq+uPPscZk0h8U7ZGJ/3pZtgyiY44wXIho8u3SS7nJod 0phqgLjoM7KmjGFayLg+pOUXoqmHZzM7xMlZFsCgL6dhwY0JNBEkX8uviCttEk1l5avSAHljNA+ 2ij8SEFlP/by7G2f9aPO3FvmimJS5qaV4m2Ovy9g/HqlHTf1EHebBDLOiRBNFXbdUxOZ9X9J206 CqN+8JmYdvwYLvaPgVE6BHk7Mk8BAfAwmhigylI8PpCukkmHaMCg== X-Received: by 2002:a05:6830:44a9:b0:718:18d6:a465 with SMTP id 46e09a7af769-7186828f90bmr35500052a34.22.1730834617819; Tue, 05 Nov 2024 11:23:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IGoUwnmnFp/s01bmrATSqntTzkoBTLrTiiiPX6umvAYJANkugqVbwee+lm5NA+hQYbVHOr+Zg== X-Received: by 2002:a05:6830:44a9:b0:718:18d6:a465 with SMTP id 46e09a7af769-7186828f90bmr35500030a34.22.1730834617420; Tue, 05 Nov 2024 11:23:37 -0800 (PST) Received: from localhost (net-93-146-37-148.cust.vodafonedsl.it. [93.146.37.148]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7189ccb1247sm2551094a34.53.2024.11.05.11.23.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2024 11:23:37 -0800 (PST) From: Lorenzo Bianconi To: ovs-dev@openvswitch.org Cc: i.maximets@ovn.org Date: Tue, 5 Nov 2024 20:23:23 +0100 Message-ID: X-Mailer: git-send-email 2.47.0 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH v2 ovn 1/8] test: ovn-controller: Use check for ovn-nbctl wherever possible. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Reported-at: https://issues.redhat.com/browse/FDP-875 Signed-off-by: Lorenzo Bianconi --- tests/ovn-controller.at | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at index a2e451880..8d2b51ea3 100644 --- a/tests/ovn-controller.at +++ b/tests/ovn-controller.at @@ -424,7 +424,7 @@ OVS_WAIT_UNTIL([test xhv = x`ovn-sbctl --columns name --bare find chassis`]) # Bump the NB_Global nb_cfg value nb_global_id=$(ovn-nbctl --columns _uuid --bare find nb_global) -ovn-nbctl set NB_Global ${nb_global_id} nb_cfg=999 +check ovn-nbctl set NB_Global ${nb_global_id} nb_cfg=999 # ovn-controller should bump the nb_cfg in the chassis_private table OVS_WAIT_UNTIL([test x999 = x`ovn-sbctl --columns nb_cfg --bare find chassis_private`]) @@ -2577,7 +2577,7 @@ OVS_WAIT_UNTIL([check_ovsdb_zone lr0_snat $snat_zone]) snat_req_zone=$port1_zone check ovn-nbctl set Logical_Router lr0 options:snat-ct-zone=$snat_req_zone -ovn-nbctl --wait=hv sync +check ovn-nbctl --wait=hv sync ct_zones=$(ovn-appctl -t ovn-controller ct-zone-list) echo "$ct_zones" @@ -2708,7 +2708,7 @@ as hv1 ovs-vsctl add-br br-phys ovn_attach n1 br-phys 192.168.0.1 -ovn-nbctl --wait=sb sync +check ovn-nbctl --wait=sb sync wait_row_count Chassis 1 name=hv1 chassis_id=$(fetch_column Chassis _uuid name=hv1) @@ -2743,13 +2743,13 @@ ovs-vsctl -- add-port br-int hv1-vif1 -- \ ofport-request=1 -ovn-nbctl ls-add sw0 +check ovn-nbctl ls-add sw0 check ovn-nbctl lsp-add sw0 sw0-p1 check ovn-nbctl lsp-set-addresses sw0-p1 "50:54:00:00:00:03 10.0.0.3 1000::3" wait_for_ports_up -ovn-nbctl --wait=hv sync +check ovn-nbctl --wait=hv sync OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep -c in_port=1], [0],[dnl 1 @@ -2799,7 +2799,7 @@ done RUN_OVN_NBCTL wait_for_ports_up -ovn-nbctl --wait=hv sync +check ovn-nbctl --wait=hv sync OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_LOCAL_OUTPUT | grep reg15=0x8000,metadata=0x1 | grep -c "controller(userdata=00.00.00.1b"], [0],[dnl 3 @@ -2809,7 +2809,7 @@ for i in $(seq 1 280); do OVN_NBCTL(lsp-del sw0-p$i) done RUN_OVN_NBCTL -ovn-nbctl --wait=hv sync +check ovn-nbctl --wait=hv sync AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_LOCAL_OUTPUT | grep -q controller], [1]) @@ -3010,7 +3010,7 @@ OVS_WAIT_UNTIL([grep -q 'OVNSB commit failed' hv1/ovn-controller.log]) sleep_controller hv1 wake_up_sb -ovn-nbctl lb-del lb +check ovn-nbctl lb-del lb wake_up_controller hv1 check ovn-nbctl --wait=hv sync