Merge release branch 4.18 to main

DaanHoogland · DaanHoogland · commit 8eaf2648b64c · 2023-10-18T11:22:42.000+02:00
* 4.18: Fix UUID for child datastores in all cases (#8057)
diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -5219,7 +5219,7 @@ protected Answer execute(ModifyStoragePoolCommand cmd) {
                     String childPath = datacenterName + summary.getName();
                     poolInfo.setHostPath(childPath);
                     String uuid = childDsMo.getCustomFieldValue(CustomFieldConstants.CLOUD_UUID);
-                    if (uuid == null) {
+                    if (uuid == null || !uuid.contains("-")) {
                         uuid = UUID.nameUUIDFromBytes(((pool.getHost() + childPath)).getBytes()).toString();
                     }
                     poolInfo.setUuid(uuid);

Original file line number	Diff line number	Diff line change
`@@ -5219,7 +5219,7 @@ protected Answer execute(ModifyStoragePoolCommand cmd) {`
`5219`	`5219`	`String childPath = datacenterName + summary.getName();`
`5220`	`5220`	`poolInfo.setHostPath(childPath);`
`5221`	`5221`	`String uuid = childDsMo.getCustomFieldValue(CustomFieldConstants.CLOUD_UUID);`
`5222`		`- if (uuid == null) {`
	`5222`	`+ if (uuid == null \|\| !uuid.contains("-")) {`
`5223`	`5223`	`uuid = UUID.nameUUIDFromBytes(((pool.getHost() + childPath)).getBytes()).toString();`
`5224`	`5224`	`}`
`5225`	`5225`	`poolInfo.setUuid(uuid);`