Skip to content

[ZCF-2893] VM NIC lifecycle extension point abstraction #3807

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-2 wants to merge 8 commits into
base: feature-5.5.12-zns
Choose a base branch
from
Open

[ZCF-2893] VM NIC lifecycle extension point abstraction #3807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
90b0714
<feature>[vm]: introduce VmNicLifecycleExtensionPoint skeleton
ruansteve Apr 21, 2026
092e47a
<fix>[vm]: fix TestVmNicLifecycleExtension not in Spring ctx
ruansteve Apr 21, 2026
b24b024
<chore>[hooks]: whitelist ZCF- and AIOS- jira keys
ruansteve Apr 23, 2026
bfe14d5
<feature>[network]: M1 management network IPv6 support
ruansteve Apr 24, 2026
a197403
<feature>[network]: M2 management network IPv6 support (Java)
ruansteve Apr 24, 2026
6d52ece
<test>[network]: M2 IPv6 groovy tests TP-032~046
ruansteve Apr 24, 2026
f19fdab
<feature>[network]: M3 management network IPv6 support
ruansteve Apr 24, 2026
9aee467
<test>[network]: M3/M4 IPv6 groovy tests TP-062~089
ruansteve Apr 25, 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
5 changes: 3 additions & 2 deletions .gitconfig/hooks/commit-msg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,9 @@ def check_commit_msg(file_path):
full_lines = 0
FAIL = False

jira_patterns = [r"\bZSTAC-\d+\b", r"\bZSTACK-\d+\b", r"\bMINI-\d+\b",
r"\bZOPS-\d+\b", r"\bZHCI-\d+\b", r"\bZSV-\d+\b"]
jira_patterns = [r"\bZSTAC-\d+\b", r"\bZSTACK-\d+\b", r"\bMINI-\d+\b",
r"\bZOPS-\d+\b", r"\bZHCI-\d+\b", r"\bZSV-\d+\b",
r"\bZCF-\d+\b", r"\bAIOS-\d+\b"]
with open(file_path, 'r', encoding='utf8') as f:
lines = f.readlines()
full_lines = len(lines)
Expand Down
9 changes: 7 additions & 2 deletions compute/src/main/java/org/zstack/compute/host/HostApiInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.zstack.header.message.APIMessage;
import org.zstack.utils.ShellResult;
import org.zstack.utils.ShellUtils;
import org.zstack.utils.network.IPv6Utils;
import org.zstack.utils.network.NetworkUtils;

import static org.zstack.core.Platform.argerr;
Expand Down Expand Up @@ -121,9 +122,13 @@ private void validate(APIUpdateHostMsg msg) {
}

private void validate(APIAddHostMsg msg) {
if (!NetworkUtils.isIpv4Address(msg.getManagementIp()) && !NetworkUtils.isHostname(msg.getManagementIp())) {
throw new ApiMessageInterceptionException(argerr(ORG_ZSTACK_COMPUTE_HOST_10113, "managementIp[%s] is neither an IPv4 address nor a valid hostname", msg.getManagementIp()));
String ip = msg.getManagementIp();
if (!NetworkUtils.isHostname(ip) && !IPv6Utils.isValidManagementIp(ip)) {
throw new ApiMessageInterceptionException(argerr(ORG_ZSTACK_COMPUTE_HOST_10113,
"managementIp[%s] is not a valid IPv4/IPv6 address or hostname", ip));
}
// Normalize IPv6 to RFC 5952 compressed form; IPv4/hostname returned as-is
msg.setManagementIp(IPv6Utils.normalizeIpv6(ip));
}

private void validate(APIChangeHostStateMsg msg){
Expand Down
23 changes: 23 additions & 0 deletions compute/src/main/java/org/zstack/compute/vm/VmNicLifecycleGlobalConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package org.zstack.compute.vm;

import org.zstack.core.config.GlobalConfig;
import org.zstack.core.config.GlobalConfigDefinition;
import org.zstack.core.config.GlobalConfigValidation;

/**
* GlobalConfig for VmNicLifecycleExtensionPoint routing (F-010).
*
* Defaults are declared in {@code conf/globalConfig/vmNicLifecycle.xml}.
*/
@GlobalConfigDefinition
public class VmNicLifecycleGlobalConfig {
public static final String CATEGORY = "vmNicLifecycle";

/**
* Per-implementation timeout (seconds) for {@code reconcileOnHost} during host heartbeat
* reconciliation. Default is 30s (see XML).
*/
@GlobalConfigValidation(numberGreaterThan = 0)
public static GlobalConfig RECONCILE_TIMEOUT =
new GlobalConfig(CATEGORY, "reconcileOnHost.timeout");
}
Loading