add encryption type to volume response

Author: DaanHoogland

api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java

@@ -298,8 +298,8 @@ public class VolumeResponse extends BaseResponseWithTagInformation implements Co
     private Map<String, String> volumeRepairResult;
 
     @SerializedName(ApiConstants.ENCRYPT_FORMAT)
-    @Param(description = "the encrypt format of the volume", since = "4.19.1")
-    private String encryptFormat;
+    @Param(description = "the format of the disk encryption if applicable", since = "4.19.1")
+    private String encryptionFormat;
 
     public String getPath() {
         return path;
@@ -847,7 +847,7 @@ public void setVolumeRepairResult(Map<String, String> volumeRepairResult) {
         this.volumeRepairResult = volumeRepairResult;
     }
 
-    public void setEncryptFormat(String encryptFormat) {
-        this.encryptFormat = encryptFormat;
+    public void setEncryptionFormat(String encryptionFormat) {
+        this.encryptionFormat = encryptionFormat;
     }
 }

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

@@ -180,7 +180,7 @@ public VolumeResponse newVolumeResponse(ResponseView view, VolumeJoinVO volume)
 
         if (view == ResponseView.Full) {
             volResponse.setPath(volume.getPath());
-            volResponse.setEncryptFormat(volume.getEncryptFormat());
+            volResponse.setEncryptionFormat(volume.getEncryptionFormat());
         }
 
         // populate owner.
@@ -279,6 +279,7 @@ public VolumeResponse newVolumeResponse(ResponseView view, VolumeJoinVO volume)
 
         volResponse.setObjectName("volume");
         volResponse.setExternalUuid(volume.getExternalUuid());
+        volResponse.setEncryptionFormat(volume.getEncryptionFormat());
         return volResponse;
     }
 

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

@@ -276,7 +276,7 @@ public class VolumeJoinVO extends BaseViewWithTagInformationVO implements Contro
     private String externalUuid = null;
 
     @Column(name = "encrypt_format")
-    private String encryptFormat;
+    private String encryptionFormat = null;
 
     public VolumeJoinVO() {
     }
@@ -613,13 +613,12 @@ public void setExternalUuid(String externalUuid) {
         this.externalUuid = externalUuid;
     }
 
-    public String getEncryptFormat() {
-        return encryptFormat;
+    public String getEncryptionFormat() {
+        return encryptionFormat;
     }
 
     @Override
     public Class<?> getEntityType() {
         return Volume.class;
     }
-
 }