[cloudstack] branch 4.18 updated: Fix UUID for child datastores in all cases (#8057)

[rohit]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.18
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.18 by this push:
     new 76ab621a5a3 Fix UUID for child datastores in all cases (#8057)
76ab621a5a3 is described below

commit 76ab621a5a32025911a568d5c658bae63a2085e2
Author: Harikrishna <harikrishna.patn...@gmail.com>
AuthorDate: Wed Oct 18 13:00:55 2023 +0530

    Fix UUID for child datastores in all cases (#8057)
---
 .../main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index e76b34954c6..6af074222fa 100644
--- 
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
@@ -5210,7 +5210,7 @@ public class VmwareResource extends ServerResourceBase 
implements StoragePoolRes
                     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);