From patchwork Sat Feb 3 10:25:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 136375 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3E7BB43A5C; Sat, 3 Feb 2024 11:26:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 041E24021F; Sat, 3 Feb 2024 11:26:03 +0100 (CET) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mails.dpdk.org (Postfix) with ESMTP id 68BEF40042 for ; Sat, 3 Feb 2024 11:26:02 +0100 (CET) Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-28bec6ae0ffso2149550a91.3 for ; Sat, 03 Feb 2024 02:26:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1706955961; x=1707560761; darn=dpdk.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=hY5n3DBrjf4iHdL0XHkvRvtBu8kvV+MZF8A1U5ORGn0=; b=AY1hU/3uMXdUPLQfL0vEGe8PV7XUjzdlyJjHIo0XkKB/O5B6Tl8K+MQ3376QfFVSkj qg/nGRSf/QuT31MeQAkLUe8P2fKhKrUrGx9ToR7lWhCNwZ/xezmH1nfljzAnnl0AnESx xArH9OOoYtDzdbJbV2w/pamy7FIJB0VtaZRsMg1KBWw5nS9UP+t74JzYIS/XmhFcuEns rszvfRtcCkAXiwg9TzNaYiq3UvqimdSoAIUyYbUml7kba4E33NV3uccWUi7aUcKpmn4i yzsC23Sjb2CGaeB0jEHZFtiTZOkaPxbf3ceC/blZp+3UpnPTZ9q0BK53bShP8Qyb2cii bZkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706955961; x=1707560761; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=hY5n3DBrjf4iHdL0XHkvRvtBu8kvV+MZF8A1U5ORGn0=; b=S3zQd59pdI5I223tsICeIgSPcpXNeUYxqQZUlEaiK5jkVCFgGX5vNhZQbGZYB6EXoR HqlrqijMzel50Sf7Itf17QqeP6cz41yqHyUYaoNT/cScQPwILTzGNxTJmhnGhNUYU9RS vbcypiydI6FRxmEvCGDacQDmS7yd4iXKL8xjtyyapHi9hBwHdrl4a29dRXgmLPKp2pdO 1WXyJjAnEtH6ZCPIIWWeLgd3bo9jth95IcRU0T0Bz9ccqsJvIEF/vSNwLaedRlyvAiOs 1R2w30i3ReJaRpGRLUt10wovcJ7J/MO76q8nsPTrSHB0gLnKdAR/QEjLy9rw14KAAeMG BYdQ== X-Gm-Message-State: AOJu0YxnnbghLLUjzrtyNF2diyhgf+kRr8LGq6uZ6fQ8BK0um99/9igy znjYMFrwTNrz2M1vdE2GihA0uzPf/Vxt6iZwuoSBjk4VH1RSPA4z7wMNPaj1GuDA5kI9W6N6IoE N X-Google-Smtp-Source: AGHT+IE5l+1EdBICIKEwrx1Hsr4KwGZoYf2BhukVcnm3dNAAnvS/pNkT3gtn31DGqZI4lZjOhmD7ew== X-Received: by 2002:a05:6a20:4393:b0:19c:93b7:4a90 with SMTP id i19-20020a056a20439300b0019c93b74a90mr6029869pzl.38.1706955961465; Sat, 03 Feb 2024 02:26:01 -0800 (PST) Received: from localhost ([157.82.200.138]) by smtp.gmail.com with UTF8SMTPSA id ct24-20020a17090af59800b002965b5a09b9sm1526629pjb.0.2024.02.03.02.26.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 03 Feb 2024 02:26:01 -0800 (PST) From: Akihiko Odaki Date: Sat, 03 Feb 2024 19:25:56 +0900 Subject: [PATCH] Replace brctl command with ip MIME-Version: 1.0 Message-Id: <20240203-brctl-v1-1-e3dbcc8f2152@daynix.com> X-B4-Tracking: v=1; b=H4sIALMUvmUC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDIxMDIwNj3aSi5JIcXYu0lKTUNJNkM8ukVCWg2oKi1LTMCrA50bG1tQA3sYo pVwAAAA== To: dts@dpdk.org Cc: Akihiko Odaki X-Mailer: b4 0.12.3 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org README of bridge-utils v1.7.1 says: > This utility is DEPRECATED. No new features will ever be added. > Instead use the bridge command from the iproute2 package which > supports more features. https://git.kernel.org/pub/scm/network/bridge/bridge-utils.git/tree/README?h=v1.7.1 Signed-off-by: Akihiko Odaki --- framework/qemu_kvm.py | 2 +- framework/qemu_libvirt.py | 2 +- test_plans/sriov_kvm_test_plan.rst | 2 +- test_plans/vf_port_start_stop_test_plan.rst | 2 +- tests/TestSuite_ip_pipeline.py | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) --- base-commit: 427e7c3f37bbb1263d81c466d7a83e9193013321 change-id: 20240203-brctl-8fdbef4c69be Best regards, diff --git a/framework/qemu_kvm.py b/framework/qemu_kvm.py index b656675c..7f6df7c2 100644 --- a/framework/qemu_kvm.py +++ b/framework/qemu_kvm.py @@ -68,7 +68,7 @@ class QEMUKvm(VirtBase): + " tunctl -t $1\n" + " ip link set $1 up\n" + " sleep 0.5s\n" - + " brctl addif $switch $1\n" + + " ip link set $1 master $switch\n" + " exit 0\n" + "else\n" + " echo 'Error: no interface specified'\n" diff --git a/framework/qemu_libvirt.py b/framework/qemu_libvirt.py index e99ce8fb..22214481 100644 --- a/framework/qemu_libvirt.py +++ b/framework/qemu_libvirt.py @@ -30,7 +30,7 @@ class LibvirtKvm(VirtBase): + " tunctl -t $1\n" + " ip link set $1 up\n" + " sleep 0.5s\n" - + " brctl addif $switch $1\n" + + " ip link set $1 master $switch\n" + " exit 0\n" + "else\n" + " echo 'Error: no interface specified'\n" diff --git a/test_plans/sriov_kvm_test_plan.rst b/test_plans/sriov_kvm_test_plan.rst index c9085dd9..42d3c059 100644 --- a/test_plans/sriov_kvm_test_plan.rst +++ b/test_plans/sriov_kvm_test_plan.rst @@ -47,7 +47,7 @@ The /etc/qemu-ifup can be below script, need you to create first:: /usr/sbin/tunctl -u `whoami` -t $1 /sbin/ip link set $1 up sleep 0.5s - /usr/sbin/brctl addif $switch $1 + /sbin/ip link set $1 master $switch exit 0 else echo "Error: no interface specified" diff --git a/test_plans/vf_port_start_stop_test_plan.rst b/test_plans/vf_port_start_stop_test_plan.rst index 502afa6c..618fcb99 100644 --- a/test_plans/vf_port_start_stop_test_plan.rst +++ b/test_plans/vf_port_start_stop_test_plan.rst @@ -72,7 +72,7 @@ Create Two VF interfaces from two kernel PF interfaces, and then attach them to /usr/sbin/tunctl -u `whoami` -t $1 /sbin/ip link set $1 up sleep 0.5s - /usr/sbin/brctl addif $switch $1 + /sbin/ip link set $1 master $switch exit 0 else echo "Error: no interface specified" diff --git a/tests/TestSuite_ip_pipeline.py b/tests/TestSuite_ip_pipeline.py index 19b297de..44dfaf5f 100644 --- a/tests/TestSuite_ip_pipeline.py +++ b/tests/TestSuite_ip_pipeline.py @@ -832,9 +832,9 @@ class TestIpPipeline(TestCase): self.dut.send_expect(cmd, "fwd port 3", 60) tap_session = self.dut.new_session() - cmd = "ip link set br1 down; brctl delbr br1" + cmd = "ip link set br1 down; ip link delete br1" tap_session.send_expect(cmd, "# ", 20) - cmd = "brctl addbr br1; brctl addif br1 TAP0; brctl addif br1 TAP1" + cmd = "ip link add br1 type bridge; ip link set TAP0 master br1; ip link set TAP1 master br1" tap_session.send_expect(cmd, "# ", 20) cmd = "ifconfig TAP0 up; ifconfig TAP1 up; ifconfig br1 up" tap_session.send_expect(cmd, "# ", 20) @@ -874,7 +874,7 @@ class TestIpPipeline(TestCase): cmd = "^C" self.dut.send_expect(cmd, "# ", 20) - cmd = "ip link set br1 down; brctl delbr br1" + cmd = "ip link set br1 down; ip link delete br1" tap_session.send_expect(cmd, "# ", 20) self.dut.close_session(tap_session)