Fix UUID for child datastores in all cases (apache#8057)

harikrishna-patnala · web-flow · commit 76ab621a5a32 · 2023-10-18T13:00:55.000+05:30
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
@@ -5210,7 +5210,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
`@@ -5210,7 +5210,7 @@ protected Answer execute(ModifyStoragePoolCommand cmd) {`
`5210`	`5210`	`String childPath = datacenterName + summary.getName();`
`5211`	`5211`	`poolInfo.setHostPath(childPath);`
`5212`	`5212`	`String uuid = childDsMo.getCustomFieldValue(CustomFieldConstants.CLOUD_UUID);`
`5213`		`- if (uuid == null) {`
	`5213`	`+ if (uuid == null \|\| !uuid.contains("-")) {`
`5214`	`5214`	`uuid = UUID.nameUUIDFromBytes(((pool.getHost() + childPath)).getBytes()).toString();`
`5215`	`5215`	`}`
`5216`	`5216`	`poolInfo.setUuid(uuid);`