Skip to content

Display lb rule name instead of uuid #4524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 1 commit into from
Feb 12, 2021
Merged

Display lb rule name instead of uuid #4524

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions server/src/main/java/org/apache/cloudstack/network/ssl/CertServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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());

@davidjumani davidjumani Dec 9, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be more efficient to just remove the else block below entirely

} else {
response.setAccountName(account.getAccountName());
}
Expand Down