diff --git a/compute/src/main/java/org/zstack/compute/vm/VmAllocateNicFlow.java b/compute/src/main/java/org/zstack/compute/vm/VmAllocateNicFlow.java index d3652621408..f6a4d78cca7 100755 --- a/compute/src/main/java/org/zstack/compute/vm/VmAllocateNicFlow.java +++ b/compute/src/main/java/org/zstack/compute/vm/VmAllocateNicFlow.java @@ -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(); diff --git a/sdk/src/main/java/org/zstack/sdk/platformservice/DeployPlatformServiceAction.java b/sdk/src/main/java/org/zstack/sdk/platformservice/DeployPlatformServiceAction.java index 75a7bcf2135..c6596f2e43f 100644 --- a/sdk/src/main/java/org/zstack/sdk/platformservice/DeployPlatformServiceAction.java +++ b/sdk/src/main/java/org/zstack/sdk/platformservice/DeployPlatformServiceAction.java @@ -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; @@ -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;