sslcert: add account and domainid to api

streamline ssl cert list api, deprecate accountid

Author: resmo

api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java

@@ -26,6 +26,7 @@
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.AccountResponse;
+import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.api.response.FirewallRuleResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.ProjectResponse;
@@ -50,9 +51,15 @@ public class ListSslCertsCmd extends BaseCmd {
     @Parameter(name = ApiConstants.CERTIFICATE_ID, type = CommandType.UUID, entityType = SslCertResponse.class, required = false, description = "ID of SSL certificate")
     private Long certId;
 
-    @Parameter(name = ApiConstants.ACCOUNT_ID, type = CommandType.UUID, entityType = AccountResponse.class, required = false, description = "Account ID")
+    @Parameter(name = ApiConstants.ACCOUNT_ID, type = CommandType.UUID, entityType = AccountResponse.class, required = false, description = "Account ID, deprecated: use " + ApiConstants.ACCOUNT + " and " + ApiConstants.DOMAIN_ID + " instead")
     private Long accountId;
 
+    @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, since = "4.24", description = "Account owning the SSL certificate")
+    private String accountName;
+
+    @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, since = "4.24", entityType = DomainResponse.class, description = "Domain ID of the account owning the SSL certificate")
+    private Long domainId;
+
     @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = false, description = "Load balancer rule ID")
     private Long lbId;
 
@@ -67,6 +74,7 @@ public Long getCertId() {
         return certId;
     }
 
+    @Deprecated
     public Long getAccountId() {
         return accountId;
     }
@@ -79,6 +87,14 @@ public Long getProjectId() {
         return projectId;
     }
 
+    public  String getAccountName() {
+        return accountName;
+    }
+
+    public Long getDomainId() {
+        return domainId;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////

server/src/main/java/org/apache/cloudstack/network/ssl/CertServiceImpl.java

@@ -198,8 +198,15 @@ public List<SslCertResponse> listSslCerts(final ListSslCertsCmd listSslCertCmd)
         final CallContext ctx = CallContext.current();
         final Account caller = ctx.getCallingAccount();
 
+        Account owner = null;
+        if (StringUtils.isNotEmpty(listSslCertCmd.getAccountName()) && listSslCertCmd.getDomainId() != null || listSslCertCmd.getProjectId() != null) {
+            owner = _accountMgr.finalizeOwner(caller, listSslCertCmd.getAccountName(), listSslCertCmd.getDomainId(), listSslCertCmd.getProjectId());
+        } else {
+            owner = caller;
+        }
+
         final Long certId = listSslCertCmd.getCertId();
-        final Long accountId = listSslCertCmd.getAccountId() != null ? listSslCertCmd.getAccountId() : caller.getAccountId();
+        final Long accountId = listSslCertCmd.getAccountId() != null ? listSslCertCmd.getAccountId() : owner.getId();
         final Long lbRuleId = listSslCertCmd.getLbId();
         final Long projectId = listSslCertCmd.getProjectId();