From 5715a949cf76c44be1c3ad3ff70e33096e6d3481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=AE=8B=E5=AE=8B?= Date: Tue, 20 Aug 2024 09:35:37 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96get=5Ftest=5Fdisk=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 宋宋宋 --- libs/locallibs/get_test_device.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/locallibs/get_test_device.py b/libs/locallibs/get_test_device.py index 01fc4942a..524462875 100644 --- a/libs/locallibs/get_test_device.py +++ b/libs/locallibs/get_test_device.py @@ -107,11 +107,11 @@ def get_test_disk(node=1): """ if os.environ.get("NODE" + str(node) + "LOCALTION") == "local": used_disk = subprocess.getoutput( - "lsblk -l | grep -e '/.*\|\[.*\]' | awk '{print $1}' | tr -d '[0-9]' | uniq | sed -e ':a;N;$!ba;s/\\n/ /g'" + "lsblk -l | grep -e '/.*\|\[.*\]' | awk '{print $1}' | sed 's/[0-9]\+$//' | uniq | sed -e ':a;N;$!ba;s/\\n/ /g'" ) test_disk = subprocess.getoutput( - "lsblk -n | grep 'disk' | grep -v '└─.*\|" + "lsblk -n | grep 'disk' | grep -v '└─.*\|├─.*\|" + used_disk.replace(" ", "\|") + "' | awk '{print $1}' | sed -e ':a;N;$!ba;s/\\n/ /g'" ) @@ -124,11 +124,11 @@ def get_test_disk(node=1): ) used_disk = ssh_cmd.pssh_cmd( conn, - "lsblk -l | grep -e '/.*\|\[.*\]' | awk '{print $1}' | tr -d '[0-9]' | uniq | sed -e ':a;N;$!ba;s/\\n/ /g'", + "lsblk -l | grep -e '/.*\|\[.*\]' | awk '{print $1}' | sed 's/[0-9]\+$//' | uniq | sed -e ':a;N;$!ba;s/\\n/ /g'", )[1] test_disk = ssh_cmd.pssh_cmd( conn, - "lsblk -n | grep 'disk' | grep -v '└─.*\|" + "lsblk -n | grep 'disk' | grep -v '└─.*\|├─.*\|" + used_disk.replace(" ", "\|") + "' | awk '{print $1}' | sed -e ':a;N;$!ba;s/\\n/ /g'", )[1] -- Gitee