From 07a2523923c170d82d0d162b3438f2dc70d99c04 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 10 Nov 2021 11:41:30 +0100 Subject: [PATCH 1/2] server bug fix: remove network details when network is removed --- .../cloudstack/engine/orchestration/NetworkOrchestrator.java | 2 ++ 1 file changed, 2 insertions(+) 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 f6e80f3a38bd..cf3e15feffea 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 void doInTransactionWithoutResult(final TransactionStatus status) { if (networkAccount != null) { _networkAccountDao.remove(networkAccount.getId()); } + // Remove network details + networkDetailsDao.removeDetails(networkFinal.getId()); } final NetworkOffering ntwkOff = _entityMgr.findById(NetworkOffering.class, networkFinal.getNetworkOfferingId()); From 0a07a07533693e7eded6e9f97eb15207bc264994 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 18 Nov 2021 12:36:03 +0100 Subject: [PATCH 2/2] Update #5675: remove comment --- .../cloudstack/engine/orchestration/NetworkOrchestrator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 cf3e15feffea..f2706fedf0bf 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,7 +3116,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) { if (networkAccount != null) { _networkAccountDao.remove(networkAccount.getId()); } - // Remove network details + networkDetailsDao.removeDetails(networkFinal.getId()); } @@ -4405,4 +4405,4 @@ public ConfigKey[] getConfigKeys() { GuestDomainSuffix, NetworkThrottlingRate, MinVRVersion, PromiscuousMode, MacAddressChanges, ForgedTransmits, MacLearning, RollingRestartEnabled}; } -} \ No newline at end of file +}