fixups

Author: vishesh92

api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java

@@ -609,6 +609,4 @@ DirectDownloadCertificateHostStatusResponse createDirectDownloadCertificateProvi
     ApiKeyPairResponse createKeyPairResponse(ApiKeyPair keyPair);
 
     ListResponse<BaseRolePermissionResponse> createKeypairPermissionsResponse(List<ApiKeyPairPermission> permissions);
-
-    KMSKeyResponse createKMSKeyResponse(KMSKey kmsKey);
 }

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

@@ -63,11 +63,6 @@ public class CreateKMSKeyCmd extends BaseCmd implements UserCmd {
                description = "Description of the KMS key")
     private String description;
 
-    @Parameter(name = ApiConstants.PURPOSE,
-               type = CommandType.STRING,
-               description = "Purpose of the key: volume, tls. (default: volume)")
-    private String purpose;
-
     @Parameter(name = ApiConstants.ZONE_ID,
                required = true,
                type = CommandType.UUID,
@@ -112,10 +107,6 @@ public String getDescription() {
         return description;
     }
 
-    public String getPurpose() {
-        return purpose == null ? "volume" : purpose;
-    }
-
     public Long getZoneId() {
         return zoneId;
     }

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

@@ -54,11 +54,6 @@ public class ListKMSKeysCmd extends BaseListProjectAndAccountResourcesCmd implem
                description = "List KMS key by UUID")
     private Long id;
 
-    @Parameter(name = ApiConstants.PURPOSE,
-               type = CommandType.STRING,
-               description = "Filter by purpose: volume, tls")
-    private String purpose;
-
     @Parameter(name = ApiConstants.ZONE_ID,
                type = CommandType.UUID,
                entityType = ZoneResponse.class,
@@ -80,10 +75,6 @@ public Long getId() {
         return id;
     }
 
-    public String getPurpose() {
-        return purpose;
-    }
-
     public Long getZoneId() {
         return zoneId;
     }

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

@@ -44,10 +44,6 @@ public class KMSKeyResponse extends BaseResponse implements ControlledViewEntity
     @Param(description = "the description of the key")
     private String description;
 
-    @SerializedName(ApiConstants.PURPOSE)
-    @Param(description = "the purpose of the key (VOLUME_ENCRYPTION, TLS_CERT)")
-    private String purpose;
-
     @SerializedName(ApiConstants.ACCOUNT)
     @Param(description = "the account owning the key")
     private String accountName;
@@ -140,14 +136,6 @@ public void setDescription(String description) {
         this.description = description;
     }
 
-    public String getPurpose() {
-        return purpose;
-    }
-
-    public void setPurpose(String purpose) {
-        this.purpose = purpose;
-    }
-
     public String getAccountName() {
         return accountName;
     }

server/src/main/java/com/cloud/api/ApiResponseHelper.java

@@ -5802,48 +5802,4 @@ public ListResponse<BaseRolePermissionResponse> createKeypairPermissionsResponse
         response.setResponses(permissionResponses);
         return response;
     }
-
-    @Override
-    public KMSKeyResponse createKMSKeyResponse(KMSKey kmsKey) {
-        KMSKeyResponse response = new KMSKeyResponse();
-        response.setId(kmsKey.getUuid());
-        response.setName(kmsKey.getName());
-        response.setDescription(kmsKey.getDescription());
-        response.setPurpose(kmsKey.getPurpose().getName());
-        response.setAccountId(String.valueOf(kmsKey.getAccountId()));
-        response.setDomainId(String.valueOf(kmsKey.getDomainId()));
-        response.setZoneId(String.valueOf(kmsKey.getZoneId()));
-        response.setProvider(kmsKey.getProviderName());
-        response.setAlgorithm(kmsKey.getAlgorithm());
-        response.setKeyBits(kmsKey.getKeyBits());
-        response.setState(kmsKey.getState().toString());
-        response.setCreated(kmsKey.getCreated());
-
-        // Set account name
-        Account account = ApiDBUtils.findAccountById(kmsKey.getAccountId());
-        if (account != null) {
-            response.setAccountName(account.getAccountName());
-        }
-
-        // Set domain name
-        Domain domain = ApiDBUtils.findDomainById(kmsKey.getDomainId());
-        if (domain != null) {
-            response.setDomainName(domain.getName());
-        }
-
-        // Set zone name
-        DataCenter zone = ApiDBUtils.findZoneById(kmsKey.getZoneId());
-        if (zone != null) {
-            response.setZoneName(zone.getName());
-        }
-
-        // Set KEK label (admin only)
-        Account caller = CallContext.current().getCallingAccount();
-        if (caller != null && (caller.getType() == Account.Type.ADMIN || caller.getType() == Account.Type.RESOURCE_DOMAIN_ADMIN)) {
-            response.setKekLabel(kmsKey.getKekLabel());
-        }
-
-        response.setObjectName("kmskey");
-        return response;
-    }
 }

server/src/main/java/org/apache/cloudstack/kms/KMSManagerImpl.java

@@ -318,7 +318,7 @@ public KMSKeyResponse createKMSKey(CreateKMSKeyCmd cmd) throws KMSException {
         Account targetAccount = accountManager.finalizeOwner(caller, cmd.getAccountName(), cmd.getDomainId(),
                 cmd.getProjectId());
 
-        KeyPurpose keyPurpose = parseKeyPurpose(cmd.getPurpose());
+        KeyPurpose keyPurpose = parseKeyPurpose("volume");
 
         int bits = cmd.getKeyBits();
         if (bits != 128 && bits != 192 && bits != 256) {
@@ -349,7 +349,6 @@ KMSKeyResponse createKMSKeyResponse(KMSKey kmsKey) {
         response.setId(kmsKey.getUuid());
         response.setName(kmsKey.getName());
         response.setDescription(kmsKey.getDescription());
-        response.setPurpose(kmsKey.getPurpose().getName());
         response.setAlgorithm(kmsKey.getAlgorithm());
         response.setKeyBits(kmsKey.getKeyBits());
         response.setEnabled(kmsKey.isEnabled());
@@ -482,7 +481,7 @@ SearchCriteria<KMSKeyVO> getSearchCriteriaForKMSKeys(SearchBuilder<KMSKeyVO> sea
         SearchCriteria<KMSKeyVO> sc = searchBuilder.create();
         accountManager.buildACLSearchCriteria(sc, domainId, isRecursive, permittedAccounts,
                 listProjectResourcesCriteria);
-        KeyPurpose keyPurpose = parseKeyPurpose(cmd.getPurpose());
+        KeyPurpose keyPurpose = parseKeyPurpose("volume");
         if (cmd.getId() != null) {
             sc.setParameters("id", cmd.getId());
         }