fixup

Author: vishesh92

api/src/main/java/org/apache/cloudstack/api/command/user/kms/UpdateKMSKeyCmd.java

@@ -19,16 +19,14 @@
 
 package org.apache.cloudstack.api.command.user.kms;
 
-import com.cloud.event.EventTypes;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
-import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.command.user.UserCmd;
 import org.apache.cloudstack.api.response.KMSKeyResponse;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.framework.kms.KMSException;
@@ -43,7 +41,7 @@
             authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User},
             requestHasSensitiveInfo = false,
             responseHasSensitiveInfo = false)
-public class UpdateKMSKeyCmd extends BaseAsyncCmd implements UserCmd {
+public class UpdateKMSKeyCmd extends BaseCmd {
 
     @Inject
     private KMSManager kmsManager;
@@ -109,16 +107,6 @@ public Long getApiResourceId() {
         return getId();
     }
 
-    @Override
-    public String getEventType() {
-        return EventTypes.EVENT_KMS_KEY_UPDATE;
-    }
-
-    @Override
-    public String getEventDescription() {
-        return "updating KMS key: " + getId();
-    }
-
     public Long getId() {
         return id;
     }

api/src/main/java/org/apache/cloudstack/api/command/user/kms/hsm/ListHSMProfilesCmd.java

@@ -51,10 +51,10 @@ public class ListHSMProfilesCmd extends BaseListProjectAndAccountResourcesCmd {
     @Parameter(name = ApiConstants.ENABLED, type = CommandType.BOOLEAN, description = "list only enabled profiles")
     private Boolean enabled;
 
-    @Parameter(name = ApiConstants.IS_SYSTEM,
+    @Parameter(name = ApiConstants.IS_PUBLIC,
                type = CommandType.BOOLEAN,
                description = "when true, non-admin users see only system (global) profiles")
-    private Boolean isSystem;
+    private Boolean isPublic;
 
     public Long getId() {
         return id;
@@ -72,8 +72,8 @@ public Boolean getEnabled() {
         return enabled;
     }
 
-    public Boolean getIsSystem() {
-        return isSystem;
+    public Boolean getIsPublic() {
+        return isPublic;
     }
 
     @Override

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

@@ -880,6 +880,10 @@ public void setVolumeRepairResult(Map<String, String> volumeRepairResult) {
         this.volumeRepairResult = volumeRepairResult;
     }
 
+    public String getEncryptionFormat() {
+        return encryptionFormat;
+    }
+
     public void setEncryptionFormat(String encryptionFormat) {
         this.encryptionFormat = encryptionFormat;
     }

plugins/kms/pkcs11/src/main/java/org/apache/cloudstack/kms/provider/pkcs11/PKCS11HSMProvider.java

@@ -691,29 +691,30 @@ private String buildSunPKCS11Config(Map<String, String> config, String nameSuffi
          */
         private void handlePKCS11Exception(Exception e, String context) throws KMSException {
             String errorMsg = e.getMessage();
+            String causeErrorMessage = e.getCause() != null ? e.getCause().getMessage() : "";
             if (errorMsg == null) {
                 errorMsg = e.getClass().getSimpleName();
             }
             logger.warn("PKCS#11 error: {} - {}", errorMsg, context, e);
 
-            if (errorMsg.contains("CKR_CRYPTOKI_NOT_INITIALIZED") || errorMsg.contains("CRYPTOKI_NOT_INITIALIZED")) {
+            if (causeErrorMessage.contains("CRYPTOKI_NOT_INITIALIZED") || errorMsg.contains("CRYPTOKI_NOT_INITIALIZED")) {
                 hsmRestartCount.incrementAndGet();
                 throw new KMSException(KMSException.ErrorType.CONNECTION_FAILED,
                         context + ": HSM requires re-initialization (CRYPTOKI_NOT_INITIALIZED)", e);
-            } else if (errorMsg.contains("CKR_PIN_INCORRECT") || errorMsg.contains("PIN_INCORRECT")) {
+            } else if (causeErrorMessage.contains("PIN_INCORRECT") || errorMsg.contains("PIN_INCORRECT")) {
                 throw new KMSException(KMSException.ErrorType.AUTHENTICATION_FAILED,
                         context + ": Incorrect PIN", e);
-            } else if (errorMsg.contains("CKR_SLOT_ID_INVALID") || errorMsg.contains("SLOT_ID_INVALID")) {
+            } else if (causeErrorMessage.contains("SLOT_ID_INVALID") || errorMsg.contains("SLOT_ID_INVALID")) {
                 throw KMSException.invalidParameter(context + ": Invalid slot ID");
-            } else if (errorMsg.contains("CKR_KEY_NOT_FOUND") || errorMsg.contains("KEY_NOT_FOUND")) {
+            } else if (causeErrorMessage.contains("KEY_NOT_FOUND") || errorMsg.contains("KEY_NOT_FOUND")) {
                 throw KMSException.kekNotFound(context + ": Key not found");
-            } else if (errorMsg.contains("CKR_DEVICE_ERROR") || errorMsg.contains("DEVICE_ERROR")) {
+            } else if (causeErrorMessage.contains("DEVICE_ERROR") || errorMsg.contains("DEVICE_ERROR")) {
                 throw new KMSException(KMSException.ErrorType.CONNECTION_FAILED,
                         context + ": HSM device error", e);
-            } else if (errorMsg.contains("CKR_SESSION_HANDLE_INVALID") || errorMsg.contains("SESSION_HANDLE_INVALID")) {
+            } else if (causeErrorMessage.contains("SESSION_HANDLE_INVALID") || errorMsg.contains("SESSION_HANDLE_INVALID")) {
                 throw new KMSException(KMSException.ErrorType.CONNECTION_FAILED,
                         context + ": Invalid session handle", e);
-            } else if (errorMsg.contains("CKR_KEY_ALREADY_EXISTS") || errorMsg.contains("KEY_ALREADY_EXISTS")) {
+            } else if (causeErrorMessage.contains("KEY_ALREADY_EXISTS") || errorMsg.contains("KEY_ALREADY_EXISTS")) {
                 throw KMSException.keyAlreadyExists(context);
             } else if (e instanceof KeyStoreException) {
                 throw new KMSException(KMSException.ErrorType.WRAP_UNWRAP_FAILED,