Skip to content

Xenserver smoke-test: Allow emojis to be accepted in volume name during volume creation #10774

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
Pearl1594 merged 3 commits into from
Apr 29, 2025
Merged

Xenserver smoke-test: Allow emojis to be accepted in volume name during volume creation #10774

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42b70e7
Allow emojis to be accepted in volume name during volume creation
Pearl1594 Apr 24, 2025
a8099d0
Merge branch '4.20' of https://github.com/apache/cloudstack into allo…
Pearl1594 Apr 25, 2025
c74cdef
escape only non-ASCII characters
Pearl1594 Apr 25, 2025
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
23 changes: 22 additions & 1 deletion ...rver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import static com.google.common.collect.Lists.newArrayList;

import java.io.File;
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -810,7 +811,7 @@ public Answer createVolume(final CreateObjectCommand cmd) {
final SR poolSr = hypervisorResource.getStorageRepository(conn,
CitrixHelper.getSRNameLabel(primaryStore.getUuid(), primaryStore.getPoolType(), primaryStore.getPath()));
VDI.Record vdir = new VDI.Record();
vdir.nameLabel = volume.getName();
vdir.nameLabel = getEncodedVolumeName(volume.getName());
Comment thread
sureshanaparti marked this conversation as resolved.
vdir.SR = poolSr;
vdir.type = Types.VdiType.USER;

Expand All @@ -831,6 +832,26 @@ public Answer createVolume(final CreateObjectCommand cmd) {
}
}

private String getEncodedVolumeName(String volumeName) throws UnsupportedEncodingException {
byte[] utf8Bytes = volumeName.getBytes("UTF-8");
// Decode UTF-8 into a Java String (UTF-16)
String decoded = new String(utf8Bytes, "UTF-8");
// Print each code unit as a Unicode escape
StringBuilder unicodeEscaped = new StringBuilder();
for (int i = 0; i < decoded.length(); i++) {
char ch = decoded.charAt(i);
if (ch <= 127 && Character.isLetterOrDigit(ch)) {
// Keep ASCII alphanumerics as-is
unicodeEscaped.append(ch);
} else {
// Escape non-ASCII characters
unicodeEscaped.append(String.format("\\u%04X", (int) ch));
}
}

return unicodeEscaped.toString();
}

@Override
public Answer cloneVolumeFromBaseTemplate(final CopyCommand cmd) {
final Connection conn = hypervisorResource.getConnection();
Expand Down