From 55c21ab85a2e4ed6759c926cea3071b73faa2e79 Mon Sep 17 00:00:00 2001 From: "shixin.ruan" Date: Wed, 22 Apr 2026 19:31:12 +0800 Subject: [PATCH] [compute]: fix magic string enableDpdkVhostuser in VmNicManagerImpl Move enableDpdkVhostuser tag constant from premium ZNS to VmSystemTags in the zstack project to eliminate magic string in VmNicManagerImpl.getVmNicType(). Resolves: ZCF-1936 Change-Id: I21bec7237d909922c08f369ac5b269b4de14c8d3 --- .../src/main/java/org/zstack/compute/vm/VmNicManagerImpl.java | 3 ++- compute/src/main/java/org/zstack/compute/vm/VmSystemTags.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/compute/src/main/java/org/zstack/compute/vm/VmNicManagerImpl.java b/compute/src/main/java/org/zstack/compute/vm/VmNicManagerImpl.java index 4a2ddd2a8be..5effcf3d7d9 100644 --- a/compute/src/main/java/org/zstack/compute/vm/VmNicManagerImpl.java +++ b/compute/src/main/java/org/zstack/compute/vm/VmNicManagerImpl.java @@ -299,7 +299,8 @@ public VmNicType getVmNicType(String vmUuid, L3NetworkInventory l3nw) { boolean enableDpdkVhostuser = Q.New(SystemTagVO.class) .eq(SystemTagVO_.resourceType, VmInstanceVO.class.getSimpleName()) .eq(SystemTagVO_.resourceUuid, vmUuid) - .eq(SystemTagVO_.tag, String.format("enableDpdkVhostuser::%s", l3nw.getUuid())) + .eq(SystemTagVO_.tag, VmSystemTags.ENABLE_DPDK_VHOSTUSER.instantiateTag( + Collections.singletonMap(VmSystemTags.ENABLE_DPDK_VHOSTUSER_L3_UUID_TOKEN, l3nw.getUuid()))) .isExists(); VmNicType.VmNicSubType subType = VmNicType.VmNicSubType.NONE; diff --git a/compute/src/main/java/org/zstack/compute/vm/VmSystemTags.java b/compute/src/main/java/org/zstack/compute/vm/VmSystemTags.java index 98f973b325f..5fd7ecf9d37 100755 --- a/compute/src/main/java/org/zstack/compute/vm/VmSystemTags.java +++ b/compute/src/main/java/org/zstack/compute/vm/VmSystemTags.java @@ -324,4 +324,8 @@ public String desensitizeTag(SystemTag systemTag, String tag) { public static String IFACE_ID_TOKEN = "ifaceId"; public static PatternedSystemTag IFACE_ID = new PatternedSystemTag( String.format("ifaceId::{%s}", IFACE_ID_TOKEN), VmNicVO.class); + + public static String ENABLE_DPDK_VHOSTUSER_L3_UUID_TOKEN = "l3NetworkUuid"; + public static PatternedSystemTag ENABLE_DPDK_VHOSTUSER = new PatternedSystemTag( + String.format("enableDpdkVhostuser::{%s}", ENABLE_DPDK_VHOSTUSER_L3_UUID_TOKEN), VmInstanceVO.class); }