apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Delete corresponding networks during zone deletion.

Browse Source
This commit is contained in:
alena 2010-12-10 20:31:47 -08:00
parent 8db9f9fbdb
commit 7d7817ecba
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -860,6 +860,14 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
try {
// Delete vNet
_zoneDao.deleteVnet(zoneId);
//Delete networks
List<NetworkVO> networks = _networkDao.listByZone(zoneId);
if (networks != null && !networks.isEmpty()) {
for (NetworkVO network : networks) {
_networkDao.remove(network.getId());
}
}
} catch (Exception ex) {
s_logger.error("Failed to delete zone " + zoneId);
throw new CloudRuntimeException("Failed to delete zone " + zoneId);

2
server/src/com/cloud/network/dao/NetworkDao.java
View File

@ -49,6 +49,8 @@ public interface NetworkDao extends GenericDao<NetworkVO, Long> {
List<NetworkVO> listBy(long zoneId, String broadcastUri);
List<NetworkVO> listByZone(long zoneId);
void changeActiveNicsBy(long networkId, int nicsCount);
int getActiveNicsIn(long networkId);

7
server/src/com/cloud/network/dao/NetworkDaoImpl.java
View File

@ -210,6 +210,13 @@ public class NetworkDaoImpl extends GenericDaoBase<NetworkVO, Long> implements N
return search(sc, null);
}
@Override
public List<NetworkVO> listByZone(long zoneId) {
SearchCriteria<NetworkVO> sc = ZoneBroadcastUriSearch.create();
sc.setParameters("dataCenterId", zoneId);
return search(sc, null);
}
@Override
public void changeActiveNicsBy(long networkId, int count) {
_opDao.changeActiveNicsBy(networkId, count);