This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 26f4edff34b2b05081548ba593763ae55505cedf Merge: b534d2b 5526342 Author: Rohit Yadav <[email protected]> AuthorDate: Thu Jun 25 10:42:15 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 Signed-off-by: Rohit Yadav <[email protected]> .../org/apache/cloudstack/api/ApiConstants.java | 3 +++ .../api/response/DomainRouterResponse.java | 16 +++++++++++++++ .../cloudstack/api/response/IPAddressResponse.java | 11 +++++++++- .../api/response/PrivateGatewayResponse.java | 10 ++++++++- .../api/response/Site2SiteVpnGatewayResponse.java | 8 ++++++++ .../cloudstack/api/response/SystemVmResponse.java | 24 ++++++++++++++++++++++ .../cloudstack/api/response/UserVmResponse.java | 13 +++++++++++- .../cloudstack/api/response/VpcResponse.java | 8 ++++++++ .../main/java/com/cloud/api/ApiResponseHelper.java | 6 ++++++ .../api/query/dao/DomainRouterJoinDaoImpl.java | 13 +++++++++++- .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 7 ++++++- .../com/cloud/storage/VolumeApiServiceImpl.java | 17 +++++++++++++++ 12 files changed, 131 insertions(+), 5 deletions(-) diff --cc api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java index b8b0189,b37e1c8..44eaba7 --- a/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java @@@ -298,14 -290,10 +298,18 @@@ public class UserVmResponse extends Bas @Param(description = "OS type id of the vm", since = "4.4") private String osTypeId; + @SerializedName(ApiConstants.OS_DISPLAY_NAME) + @Param(description = "OS name of the vm", since = "4.13.2") + private String osDisplayName; + + @SerializedName(ApiConstants.BOOT_MODE) + @Param(description = "Guest vm Boot Mode") + private String bootMode; + + @SerializedName(ApiConstants.BOOT_TYPE) + @Param(description = "Guest vm Boot Type") + private String bootType; + public UserVmResponse() { securityGroupList = new LinkedHashSet<SecurityGroupResponse>(); nics = new LinkedHashSet<NicResponse>(); @@@ -882,12 -858,7 +890,15 @@@ return osTypeId; } + public String getOsDisplayName() { + return osDisplayName; + } ++ + public String getBootType() { return bootType; } + + public void setBootType(String bootType) { this.bootType = bootType; } + + public String getBootMode() { return bootMode; } + + public void setBootMode(String bootMode) { this.bootMode = bootMode; } - }
