Skip to content

ZSTAC-86553 Fix IPv6 NBD target URI formatting #4412

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

Merged
MatheMatrix merged 1 commit into from
Jul 3, 2026
+16 −2
Merged

ZSTAC-86553 Fix IPv6 NBD target URI formatting #4412

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
4 changes: 3 additions & 1 deletion header/src/main/java/org/zstack/header/storage/addon/NbdRemoteTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package org.zstack.header.storage.addon;

import org.zstack.utils.network.IPv6NetworkUtils;

public class NbdRemoteTarget extends BlockRemoteTarget {
private String ip;
private int port;
Expand Down Expand Up @@ -28,6 +30,6 @@ public String getInstallPath() {

@Override
public String getResourceURI() {
return String.format("nbd://%s:%s", ip, port);
return String.format("nbd://%s:%s", IPv6NetworkUtils.formatHostForUrl(ip), port);
}
}
3 changes: 2 additions & 1 deletion header/src/main/java/org/zstack/header/storage/backup/NbdRemoteTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import org.apache.commons.lang.StringUtils;
import org.zstack.header.exception.CloudRuntimeException;
import org.zstack.utils.network.IPv6NetworkUtils;

import java.net.URI;
import java.net.URISyntaxException;
Expand Down Expand Up @@ -51,7 +52,7 @@ public String getTargetUri() {
public String getTargetUri(String hostname) {
StringBuilder uriBuilder = new StringBuilder();
uriBuilder.append("nbd://");
uriBuilder.append(hostname);
uriBuilder.append(IPv6NetworkUtils.formatHostForUrl(hostname));
uriBuilder.append(":").append(this.port);
if (!StringUtils.isEmpty(this.exportName)) {
uriBuilder.append("/").append(this.getExportName());
Expand Down
11 changes: 11 additions & 0 deletions test/src/test/groovy/org/zstack/test/integration/core/ManagementNetworkIpv6Case.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,17 @@ class ManagementNetworkIpv6Case extends SubCase {
assert SshShell.formatScpTarget("root", "host-01.example.com") == "root@host-01.example.com"
}

void testNbdTargetUriUsesBracketedIpv6Host() {
def backupTarget = new org.zstack.header.storage.backup.NbdRemoteTarget(IPV6, 10401, "disk0", null)
assert backupTarget.getTargetUri() == "nbd://[2001:db8::1]:10401/disk0"
assert backupTarget.getTargetUri(IPV4) == "nbd://192.168.1.10:10401/disk0"

def addonTarget = new org.zstack.header.storage.addon.NbdRemoteTarget()
addonTarget.setIp(IPV6)
addonTarget.setPort(10401)
assert addonTarget.getResourceURI() == "nbd://[2001:db8::1]:10401"
}

void testCallbackCheckerUsesIpv6Options() {
String ipv4Script = CallBackNetworkChecker.buildCallbackCheckScript("password", REST_PORT, IPV4)
assert ipv4Script.contains("nc ${IPV4} ${REST_PORT}")
Expand Down