From patchwork Mon Sep 23 12:58:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiago Pires X-Patchwork-Id: 1988595 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=luizalabs.com header.i=@luizalabs.com header.a=rsa-sha256 header.s=google header.b=JCwcJYqk; 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 4XC33F6Qk3z1xsg for ; Mon, 23 Sep 2024 22:59:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id C0DB38129A; Mon, 23 Sep 2024 12:59:03 +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 V7pOubfe6f-D; Mon, 23 Sep 2024 12:59:02 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 15C62810BC Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=luizalabs.com header.i=@luizalabs.com header.a=rsa-sha256 header.s=google header.b=JCwcJYqk Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 15C62810BC; Mon, 23 Sep 2024 12:59:02 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id E61D3C0012; Mon, 23 Sep 2024 12:59:01 +0000 (UTC) X-Original-To: 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 D356AC0011 for ; Mon, 23 Sep 2024 12:59:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id C30E081195 for ; Mon, 23 Sep 2024 12:59:00 +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 zfYmhCXnz-Re for ; Mon, 23 Sep 2024 12:58:59 +0000 (UTC) Received-SPF: None (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::12a; helo=mail-lf1-x12a.google.com; envelope-from=tiago.pires@luizalabs.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 113DA810BC Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=luizalabs.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 113DA810BC Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by smtp1.osuosl.org (Postfix) with ESMTPS id 113DA810BC for ; Mon, 23 Sep 2024 12:58:58 +0000 (UTC) Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-5365392cfafso4378661e87.0 for ; Mon, 23 Sep 2024 05:58:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=luizalabs.com; s=google; t=1727096336; x=1727701136; darn=openvswitch.org; h=content-transfer-encoding:to:subject:message-id:date:from :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=4dUI3SH+dEQNWmAQvMQGT4bYSp6NVbOsEdX9f4yjIbQ=; b=JCwcJYqkgA8ddSEfBpnn7Y/AfVvSrcdovKucCAPSfrP54X24Ko2hDE+SpOZLpayNIJ hS3dOs5MxJk4mHundXelqj6VjtWo+XXn/AOj5jEg3LTjJ+C+u0dM25D4sM2WlmogNdrj OLhL5Bmfuw83n0XVkVFdVGWPLikCFQijqxU2s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727096336; x=1727701136; h=content-transfer-encoding:to:subject:message-id:date:from :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4dUI3SH+dEQNWmAQvMQGT4bYSp6NVbOsEdX9f4yjIbQ=; b=BF88gn5tsn3VVOnb3AQYQ80qul69HM1tHGIkaeywscytskT8vxsdedxoKnUTxTuIvM atYbxOVdb7SKvr7f4CQE+FXNzPBiXNtTK6pY05fEktI2BvK8PxKoXD42cd+uhleC/UJa 2KIddK2ssFylJ9yXViRFYM3vSMI8IlnVmSmZI5isIdH+Kkqggr/6GKV0z5rjVVW0FLVg s5/9qrU7FKq/de44jwf40BDUMO+9w9pLbrj9u4stxUmTPTkYpC01U3WXx8lGVlPd53CB O3ogiv8qDqOhJDZA7ZoLe4fsAA4EcwS/xSTdSC3EzZayX3HoIvfd93ggFaabRDRLE9H/ XtUg== X-Gm-Message-State: AOJu0YwdhXYXvXNIc3j+bCviotHxgiCtgxPcRH+fKQRjy2FxhM143Stf h2KORl8+Pc5B9wiUv12WU4rYuTDsvt/aorvAZE1z/Hz7ITvfYSS4HOXiU80EFs44504opO8Rhlo ceUOuwt9/uVqUm+T7rnZ6iJP09BQaDtlZ50nAsRho5Tp8R7JsYVCul3x4XSUUiShxXRWlISH+TP 1eULRv8i3jCTObDpJE4t7fbu2oVN1bWYo= X-Google-Smtp-Source: AGHT+IG4pi5iA+AfWI1SWqU8Vhqno2NPxJ9ZUAMSdpqmVT+A8WRqiHcKJrKg6Zv1xsn8G4sfKtTT1r+kTo5SltqzzoQ= X-Received: by 2002:a05:6512:a93:b0:535:d4e9:28bf with SMTP id 2adb3069b0e04-536ac32f325mr5622152e87.46.1727096335748; Mon, 23 Sep 2024 05:58:55 -0700 (PDT) MIME-Version: 1.0 Date: Mon, 23 Sep 2024 09:58:44 -0300 Message-ID: To: dev@openvswitch.org Subject: [ovs-dev] [PATCH ovn v1] multinode: Fix for interfaces MTU and central prefix name 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: , X-Patchwork-Original-From: Tiago Pires via dev From: Tiago Pires Reply-To: Tiago Pires Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" This commit fixes some issues with the OVN multi-node scenario testing: - correct interfaces MTU - fixing central prefix name according with ovn-fake-multinode default configuration Signed-off-by: Tiago Pires --- tests/multinode-macros.at | 12 ++++---- tests/multinode.at | 62 +++++++++++++++++++-------------------- 2 files changed, 37 insertions(+), 37 deletions(-) 50:54:00:00:00:03 1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a m_wait_for_ports_up @@ -61,7 +61,7 @@ check multinode_nbctl lsp-set-type sw1-lr0 router check multinode_nbctl lsp-set-addresses sw1-lr0 router check multinode_nbctl lsp-set-options sw1-lr0 router-port=lr0-sw1 -m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 20.0.0.3 24 20.0.0.1 2000::4/64 1000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 1342 20.0.0.3 24 20.0.0.1 2000::4/64 1000::a m_wait_for_ports_up sw1-port1 @@ -109,8 +109,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 "50:54:00:00:00:03 10.0.0.3 10 check multinode_nbctl lsp-add sw0 sw0-port2 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 1000::4" -m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a -m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a +m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a m_wait_for_ports_up @@ -138,7 +138,7 @@ check multinode_nbctl lsp-set-type sw1-lr0 router check multinode_nbctl lsp-set-addresses sw1-lr0 router check multinode_nbctl lsp-set-options sw1-lr0 router-port=lr0-sw1 -m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 1342 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a # create exteranl connection for N/S traffic check multinode_nbctl ls-add public @@ -257,8 +257,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 "50:54:00:00:00:03 10.0.0.3 10 check multinode_nbctl lsp-add sw0 sw0-port2 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 1000::4" -m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a -m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a +m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a m_wait_for_ports_up @@ -286,7 +286,7 @@ check multinode_nbctl lsp-set-type sw1-lr0 router check multinode_nbctl lsp-set-addresses sw1-lr0 router check multinode_nbctl lsp-set-options sw1-lr0 router-port=lr0-sw1 -m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 1342 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a # create exteranl connection for N/S traffic check multinode_nbctl ls-add public @@ -386,8 +386,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 "50:54:00:00:00:03 10.0.0.3 10 check multinode_nbctl lsp-add sw0 sw0-port2 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 1000::4" -m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a -m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a +m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a m_wait_for_ports_up @@ -415,7 +415,7 @@ check multinode_nbctl lsp-set-type sw1-lr0 router check multinode_nbctl lsp-set-addresses sw1-lr0 router check multinode_nbctl lsp-set-options sw1-lr0 router-port=lr0-sw1 -m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 1342 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a # create exteranl connection for N/S traffic check multinode_nbctl ls-add public @@ -528,8 +528,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 "50:54:00:00:00:03 10.0.0.3 10 check multinode_nbctl lsp-add sw0 sw0-port2 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 1000::4" -m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a -m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a +m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a m_wait_for_ports_up @@ -557,7 +557,7 @@ check multinode_nbctl lsp-set-type sw1-lr0 router check multinode_nbctl lsp-set-addresses sw1-lr0 router check multinode_nbctl lsp-set-options sw1-lr0 router-port=lr0-sw1 -m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 1342 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a # create exteranl connection for N/S traffic check multinode_nbctl ls-add public @@ -663,8 +663,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 "50:54:00:00:00:03 10.0.0.3 10 check multinode_nbctl lsp-add sw0 sw0-port2 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 1000::4" -m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a -m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a +m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a m_wait_for_ports_up @@ -692,7 +692,7 @@ check multinode_nbctl lsp-set-type sw1-lr0 router check multinode_nbctl lsp-set-addresses sw1-lr0 router check multinode_nbctl lsp-set-options sw1-lr0 router-port=lr0-sw1 -m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 1342 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a # create exteranl connection for N/S traffic check multinode_nbctl ls-add public @@ -816,8 +816,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 "50:54:00:00:00:03 10.0.0.3 10 check multinode_nbctl lsp-add sw0 sw0-port2 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 1000::4" -m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a -m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a +m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a m_wait_for_ports_up @@ -845,7 +845,7 @@ check multinode_nbctl lsp-set-type sw1-lr0 router check multinode_nbctl lsp-set-addresses sw1-lr0 router check multinode_nbctl lsp-set-options sw1-lr0 router-port=lr0-sw1 -m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 1342 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a # create exteranl connection for N/S traffic check multinode_nbctl ls-add public @@ -971,8 +971,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 "50:54:00:00:00:03 10.0.0.3 10 check multinode_nbctl lsp-add sw0 sw0-port2 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 1000::4" -m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a -m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a +m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a # Create the second logical switch with one port check multinode_nbctl ls-add sw1 @@ -993,7 +993,7 @@ check multinode_nbctl lsp-set-type sw1-lr0 router check multinode_nbctl lsp-set-addresses sw1-lr0 router check multinode_nbctl lsp-set-options sw1-lr0 router-port=lr0-sw1 -m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 1342 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a check multinode_nbctl lr-nat-add lr0 snat 172.20.0.100 10.0.0.0/24 check multinode_nbctl lr-nat-add lr0 snat 172.20.0.100 20.0.0.0/24 @@ -1072,8 +1072,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 "50:54:00:00:00:03 10.0.0.3 10 check multinode_nbctl lsp-add sw0 sw0-port2 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 1000::4" -m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a -m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a +m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a m_wait_for_ports_up @@ -1101,7 +1101,7 @@ check multinode_nbctl lsp-set-type sw1-lr0 router check multinode_nbctl lsp-set-addresses sw1-lr0 router check multinode_nbctl lsp-set-options sw1-lr0 router-port=lr0-sw1 -m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 1342 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a # create exteranl connection for N/S traffic check multinode_nbctl ls-add public @@ -1126,7 +1126,7 @@ check multinode_nbctl lr-nat-add lr0 snat 172.20.0.100 20.0.0.0/24 check multinode_nbctl lsp-add public public-port1 check multinode_nbctl lsp-set-addresses public-port1 "60:54:00:00:00:03 172.168.0.50" -m_as ovn-chassis-1 /data/create_fake_vm.sh public-port1 pubp1 60:54:00:00:00:03 172.20.0.50 24 172.20.0.100 +m_as ovn-chassis-1 /data/create_fake_vm.sh public-port1 pubp1 60:54:00:00:00:03 1342 172.20.0.50 24 172.20.0.100 check multinode_nbctl --wait=hv sync @@ -1267,8 +1267,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 "50:54:00:00:00:03 10.0.0.3 10 check multinode_nbctl lsp-add sw0 sw0-port2 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 1000::4" -m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a -m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a +m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 1342 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 1342 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a m_wait_for_ports_up @@ -1296,7 +1296,7 @@ check multinode_nbctl lsp-set-type sw1-lr0 router check multinode_nbctl lsp-set-addresses sw1-lr0 router check multinode_nbctl lsp-set-options sw1-lr0 router-port=lr0-sw1 -m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a +m_as ovn-chassis-2 /data/create_fake_vm.sh sw1-port1 sw1p1 40:54:00:00:00:03 1342 20.0.0.3 24 20.0.0.1 2000::3/64 2000::a # create exteranl connection for N/S traffic check multinode_nbctl ls-add public diff --git a/tests/multinode-macros.at b/tests/multinode-macros.at index 757917626..5b171885e 100644 --- a/tests/multinode-macros.at +++ b/tests/multinode-macros.at @@ -50,11 +50,11 @@ m_as() { } m_central_as () { - podman exec ovn-central "$@" + podman exec ovn-central-az1-1 "$@" } check_fake_multinode_setup() { - check m_as ovn-central ovn-nbctl --wait=sb sync + check m_as ovn-central-az1-1 ovn-nbctl --wait=sb sync AT_CHECK([m_as ovn-chassis-1 ovn-appctl -t ovn-controller version], [0], [ignore]) AT_CHECK([m_as ovn-chassis-2 ovn-appctl -t ovn-controller version], [0], [ignore]) AT_CHECK([m_as ovn-gw-1 ovn-appctl -t ovn-controller version], [0], [ignore]) @@ -62,9 +62,9 @@ check_fake_multinode_setup() { } cleanup_multinode_resources() { - m_as ovn-central rm -f /etc/ovn/ovnnb_db.db - m_as ovn-central /usr/share/ovn/scripts/ovn-ctl restart_northd - check m_as ovn-central ovn-nbctl --wait=sb sync + m_as ovn-central-az1-1 rm -f /etc/ovn/ovnnb_db.db + m_as ovn-central-az1-1 /usr/share/ovn/scripts/ovn-ctl restart_northd + check m_as ovn-central-az1-1 ovn-nbctl --wait=sb sync for c in ovn-chassis-1 ovn-chassis-2 ovn-gw-1 do m_as $c ovs-vsctl del-br br-int @@ -73,7 +73,7 @@ cleanup_multinode_resources() { } multinode_nbctl () { - m_as ovn-central ovn-nbctl "$@" + m_as ovn-central-az1-1 ovn-nbctl "$@" } # m_count_rows TABLE [CONDITION...] diff --git a/tests/multinode.at b/tests/multinode.at index a0eb8fc67..408e1118d 100644 --- a/tests/multinode.at +++ b/tests/multinode.at @@ -15,8 +15,8 @@ check multinode_nbctl lsp-set-addresses sw0-port1 "50:54:00:00:00:03 10.0.0.3 10 check multinode_nbctl lsp-add sw0 sw0-port2 check multinode_nbctl lsp-set-addresses sw0-port2 "50:54:00:00:00:04 10.0.0.4 1000::4" -m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1 50:54:00:00:00:03 10.0.0.3 24 10.0.0.1 1000::3/64 1000::a -m_as ovn-chassis-2 /data/create_fake_vm.sh sw0-port2 sw0p2 50:54:00:00:00:04 10.0.0.4 24 10.0.0.1 1000::4/64 1000::a +m_as ovn-chassis-1 /data/create_fake_vm.sh sw0-port1 sw0p1