From 2b54b587fcad403ffa16836ab92130ae345cb497 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 25 Nov 2021 12:20:48 +0100 Subject: [PATCH 1/2] engine/schema: fix findActiveAccountById in AccountDaoImpl.java (#5704) --- .../schema/src/main/java/com/cloud/user/dao/AccountDaoImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/engine/schema/src/main/java/com/cloud/user/dao/AccountDaoImpl.java b/engine/schema/src/main/java/com/cloud/user/dao/AccountDaoImpl.java index 81bd545d65d..896a3d0669c 100644 --- a/engine/schema/src/main/java/com/cloud/user/dao/AccountDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/user/dao/AccountDaoImpl.java @@ -57,6 +57,7 @@ public class AccountDaoImpl extends GenericDaoBase implements A public AccountDaoImpl() { AllFieldsSearch = createSearchBuilder(); + AllFieldsSearch.and("id", AllFieldsSearch.entity().getId(), SearchCriteria.Op.EQ); AllFieldsSearch.and("accountName", AllFieldsSearch.entity().getAccountName(), SearchCriteria.Op.EQ); AllFieldsSearch.and("domainId", AllFieldsSearch.entity().getDomainId(), SearchCriteria.Op.EQ); AllFieldsSearch.and("state", AllFieldsSearch.entity().getState(), SearchCriteria.Op.EQ); From 965316b842d19c4dcb1b2028476b47f1899f7d59 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 25 Nov 2021 21:15:51 +0100 Subject: [PATCH 2/2] server bug fix: remove network details when network is removed (#5675) --- .../cloudstack/engine/orchestration/NetworkOrchestrator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java index 136c2a7d766..7e206fffeef 100644 --- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java @@ -3116,6 +3116,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra if (networkAccount != null) { _networkAccountDao.remove(networkAccount.getId()); } + + networkDetailsDao.removeDetails(networkFinal.getId()); } final NetworkOffering ntwkOff = _entityMgr.findById(NetworkOffering.class, networkFinal.getNetworkOfferingId()); @@ -4403,4 +4405,4 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra GuestDomainSuffix, NetworkThrottlingRate, MinVRVersion, PromiscuousMode, MacAddressChanges, ForgedTransmits, MacLearning, RollingRestartEnabled}; } -} \ No newline at end of file +}