Dynamic: list bgp peers by useSystemBgpPeers

weizhouapache · Aug 22, 2024 · 035c440 · 035c440
1 parent fb7af43
commit 035c440
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/network/dao/BgpPeerDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/network/dao/BgpPeerDaoImpl.java
@@ -29,6 +29,7 @@
 import org.apache.cloudstack.network.BgpPeerDetailsVO;
 import org.apache.cloudstack.network.BgpPeerNetworkMapVO;
 import org.apache.cloudstack.network.BgpPeerVO;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
@@ -140,11 +141,23 @@ public BgpPeerVO persist(BgpPeerVO bgpPeerVO, Map<BgpPeer.Detail, String> detail
 
     @Override
     public List<Long> listAvailableBgpPeerIdsForAccount(long zoneId, long domainId, long accountId, boolean useSystemBgpPeers) {
+        if (useSystemBgpPeers) {
+            return listBgpPeerIdsForAccount(zoneId, domainId, accountId, false);
+        } else {
+            List<Long> dedicatedBgpPeerIds = listBgpPeerIdsForAccount(zoneId, domainId, accountId, true);
+            if (CollectionUtils.isNotEmpty(dedicatedBgpPeerIds)) {
+                return dedicatedBgpPeerIds;
+            }
+            return listBgpPeerIdsForAccount(zoneId, domainId, accountId, false);
+        }
+    }
+
+    private List<Long> listBgpPeerIdsForAccount(long zoneId, long domainId, long accountId, boolean isDedicated) {
         TransactionLegacy txn = TransactionLegacy.currentTxn();
         PreparedStatement pstmt = null;
         List<Long> result = new ArrayList<Long>();
 
-        StringBuilder sql = useSystemBgpPeers ? new StringBuilder(LIST_ALL_BGP_PEERS_IDS_FOR_ACCOUNT): new StringBuilder(LIST_DEDICATED_BGP_PEERS_IDS_FOR_ACCOUNT);
+        StringBuilder sql = isDedicated ? new StringBuilder(LIST_DEDICATED_BGP_PEERS_IDS_FOR_ACCOUNT): new StringBuilder(LIST_ALL_BGP_PEERS_IDS_FOR_ACCOUNT);
 
         try {
             pstmt = txn.prepareAutoCloseStatement(sql.toString());