From 9d706bfc96850f0039746d14a5c2543199168e94 Mon Sep 17 00:00:00 2001
From: Rakesh Venkatesh <rakeshv.com@gmail.com>
Date: Tue, 8 Dec 2020 15:26:02 +0100
Subject: [PATCH] Display lb rule name instead of uuid

Display proper error message while deleting ssl cert which is
associated with a load balancer rule
---
 .../apache/cloudstack/network/ssl/CertServiceImpl.java   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/server/src/main/java/org/apache/cloudstack/network/ssl/CertServiceImpl.java b/server/src/main/java/org/apache/cloudstack/network/ssl/CertServiceImpl.java
index ae347488e4d6..00ea94a44446 100644
--- a/server/src/main/java/org/apache/cloudstack/network/ssl/CertServiceImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/network/ssl/CertServiceImpl.java
@@ -169,14 +169,14 @@ public void deleteSslCert(final DeleteSslCertCmd deleteSslCertCmd) {
         final List<LoadBalancerCertMapVO> lbCertRule = _lbCertDao.listByCertId(certId);
 
         if (lbCertRule != null && !lbCertRule.isEmpty()) {
-            String lbUuids = "";
+            StringBuilder lbNames = new StringBuilder();
 
             for (final LoadBalancerCertMapVO rule : lbCertRule) {
                 final LoadBalancerVO lb = _entityMgr.findById(LoadBalancerVO.class, rule.getLbId());
-                lbUuids += " " + lb.getUuid();
+                lbNames.append(lb.getName()).append(" ");
             }
 
-            throw new CloudRuntimeException("Certificate in use by a loadbalancer(s)" + lbUuids);
+            throw new CloudRuntimeException("Certificate in use by a loadbalancer(s) " + lbNames.toString());
         }
 
         _sslCertDao.remove(certId);
@@ -311,9 +311,8 @@ public SslCertResponse createCertResponse(final SslCertVO cert, final List<LoadB
             {
                 response.setProjectId(project.getUuid());
                 response.setProjectName(project.getName());
-            } else {
-                response.setAccountName(account.getAccountName());
             }
+            response.setAccountName(account.getAccountName());
         } else {
             response.setAccountName(account.getAccountName());
         }