Skip to content

<fix>[platformservice]: persist service VM static network #4586

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
MatheMatrix wants to merge 2 commits into
base: zsv_5.1.0
Choose a base branch
from
Open

<fix>[platformservice]: persist service VM static network #4586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f6b40c
<fix>[platformservice]: persist service VM static network
Jul 16, 2026
38fde38
<fix>[platformservice]: pass ZCenter deployment language
Jul 16, 2026
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: 1 addition & 2 deletions compute/src/main/java/org/zstack/compute/vm/VmAllocateNicFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,7 @@ public void run(final FlowTrigger trigger, final Map data) {
protected String scripts() {
VmNicVO nicVO = vnicFactory.createVmNic(nic, spec);
if (!nw.enableIpAllocation() && nicNetworkInfoMap != null
&& nicNetworkInfoMap.containsKey(nw.getUuid())
&& spec.getVmInventory().getType().equals(VmInstanceConstant.USER_VM_TYPE)) {
&& nicNetworkInfoMap.containsKey(nw.getUuid())) {
NicIpAddressInfo nicIpAddressInfo = nicNetworkInfoMap.get(nic.getL3NetworkUuid());
if (!StringUtils.isEmpty(nicIpAddressInfo.ipv6Address)) {
UsedIpVO vo = new UsedIpVO();
Expand Down
9 changes: 9 additions & 0 deletions sdk/src/main/java/org/zstack/sdk/platformservice/DeployPlatformServiceAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ public Result throwExceptionIfError() {
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
public java.lang.String staticIp;

@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
public java.lang.String netmask;

@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
public java.lang.String gateway;

@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
public java.lang.String clusterUuid;

Expand All @@ -58,6 +64,9 @@ public Result throwExceptionIfError() {
@Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
public java.lang.String allocatorStrategy;

@Param(required = false, validValues = {"zh_CN","en_US"}, maxLength = 5, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
public java.lang.String language;

@Param(required = false)
public java.util.List systemTags;

Expand Down