Merge pull request #748 from MissionCriticalCloud/fix/guesos-response…

…-to-uuid osTypeId is supposed to be UUID instead of ID
MissionCriticalCloud · Jul 17, 2018 · 6cd3e90 · 6cd3e90
2 parents 7d14dad + a457ad1
commit 6cd3e90
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cosmic-core/api/src/main/java/com/cloud/api/response/UserVmResponse.java b/cosmic-core/api/src/main/java/com/cloud/api/response/UserVmResponse.java
@@ -214,7 +214,7 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp
 
     @SerializedName(ApiConstants.OS_TYPE_ID)
     @Param(description = "OS type id of the vm", since = "4.4")
-    private Long osTypeId;
+    private String osTypeId;
 
     @SerializedName(ApiConstants.MAINTENANCE_POLICY)
     @Param(description = "Maintenance Policy of the VM")
@@ -713,7 +713,7 @@ public void setDetails(final Map details) {
         this.details = details;
     }
 
-    public void setOsTypeId(final Long osTypeId) {
+    public void setOsTypeId(final String osTypeId) {
         this.osTypeId = osTypeId;
     }
 

diff --git a/cosmic-core/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/cosmic-core/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
@@ -167,7 +167,7 @@ public UserVmResponse newUserVmResponse(final ResponseView view, final String ob
         userVmResponse.setPublicIpId(userVm.getPublicIpUuid());
         userVmResponse.setPublicIp(userVm.getPublicIpAddress());
         userVmResponse.setKeyPairName(userVm.getKeypairName());
-        userVmResponse.setOsTypeId(userVm.getGuestOsId());
+        userVmResponse.setOsTypeId(userVm.getGuestOsUuid());
         userVmResponse.setManufacturerString(userVm.getManufacturerString());
         userVmResponse.setOptimiseFor(userVm.getOptimiseFor());
         userVmResponse.setRequiresRestart(userVm.getRequiresRestart());