Skip to content

<fix>[compute]: fix magic string enableDpdkVhostuser in VmNicManagerImpl #3840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZStack-Robot wants to merge 1 commit into
base: feature-5.5.22-zcf-temporary
Choose a base branch
from
Open

<fix>[compute]: fix magic string enableDpdkVhostuser in VmNicManagerImpl #3840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion compute/src/main/java/org/zstack/compute/vm/VmNicManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions compute/src/main/java/org/zstack/compute/vm/VmSystemTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}