apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

api,server: encryptformat in volume response (#9106)

Browse Source 
Fixes #9014

* api,server: encryptformat in volume response

* Apply suggestions from code review

* remove passphrase db change
This commit is contained in:
Abhishek Kumar 2024-06-11 11:20:50 +05:30 committed by GitHub
parent 3321971adc
commit fcca3e8f39
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java
View File

@ -290,13 +290,17 @@ public class VolumeResponse extends BaseResponseWithTagInformation implements Co
private String externalUuid;
@SerializedName(ApiConstants.VOLUME_CHECK_RESULT)
@Param(description = "details for the volume check result, they may vary for different hypervisors, since = 4.19.1")
@Param(description = "details for the volume check result, they may vary for different hypervisors", since = "4.19.1")
private Map<String, String> volumeCheckResult;
@SerializedName(ApiConstants.VOLUME_REPAIR_RESULT)
@Param(description = "details for the volume repair result, they may vary for different hypervisors, since = 4.19.1")
@Param(description = "details for the volume repair result, they may vary for different hypervisors", since = "4.19.1")
private Map<String, String> volumeRepairResult;
@SerializedName(ApiConstants.ENCRYPT_FORMAT)
@Param(description = "the encrypt format of the volume", since = "4.19.1")
private String encryptFormat;
public String getPath() {
return path;
}
@ -842,4 +846,8 @@ public class VolumeResponse extends BaseResponseWithTagInformation implements Co
public void setVolumeRepairResult(Map<String, String> volumeRepairResult) {
this.volumeRepairResult = volumeRepairResult;
}
public void setEncryptFormat(String encryptFormat) {
this.encryptFormat = encryptFormat;
}
}

1
engine/schema/src/main/resources/META-INF/db/views/cloud.volume_view.sql
View File

@ -39,6 +39,7 @@ SELECT
`volumes`.`path` AS `path`,
`volumes`.`chain_info` AS `chain_info`,
`volumes`.`external_uuid` AS `external_uuid`,
`volumes`.`encrypt_format` AS `encrypt_format`,
`account`.`id` AS `account_id`,
`account`.`uuid` AS `account_uuid`,
`account`.`account_name` AS `account_name`,

1
server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
View File

@ -180,6 +180,7 @@ public class VolumeJoinDaoImpl extends GenericDaoBaseWithTagInformation<VolumeJo
if (view == ResponseView.Full) {
volResponse.setPath(volume.getPath());
volResponse.setEncryptFormat(volume.getEncryptFormat());
}
// populate owner.

7
server/src/main/java/com/cloud/api/query/vo/VolumeJoinVO.java
View File

@ -275,6 +275,9 @@ public class VolumeJoinVO extends BaseViewWithTagInformationVO implements Contro
@Column(name = "external_uuid")
private String externalUuid = null;
@Column(name = "encrypt_format")
private String encryptFormat;
public VolumeJoinVO() {
}
@ -610,6 +613,10 @@ public class VolumeJoinVO extends BaseViewWithTagInformationVO implements Contro
this.externalUuid = externalUuid;
}
public String getEncryptFormat() {
return encryptFormat;
}
@Override
public Class<?> getEntityType() {
return Volume.class;