Skip to content

Commit eb536a6

Browse files
author
GabrielBrascher
committed
Remove deleted VLAN on table pod_vlan_map
1 parent b81e9c9 commit eb536a6

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@
177177
import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO;
178178
import com.cloud.network.dao.PhysicalNetworkVO;
179179
import com.cloud.network.rules.LoadBalancerContainer.Scheme;
180+
import com.cloud.network.vpc.PrivateIpVO;
180181
import com.cloud.network.vpc.VpcManager;
181182
import com.cloud.offering.DiskOffering;
182183
import com.cloud.offering.NetworkOffering;
@@ -266,7 +267,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
266267
@Inject
267268
DomainVlanMapDao _domainVlanMapDao;
268269
@Inject
269-
PodVlanMapDao _podVlanMapDao;
270+
PodVlanMapDao podVlanMapDao;
270271
@Inject
271272
DataCenterDao _zoneDao;
272273
@Inject
@@ -3949,7 +3950,7 @@ public VlanVO doInTransaction(final TransactionStatus status) {
39493950
} else if (podId != null) {
39503951
// This VLAN is pod-wide, so create a PodVlanMapVO entry
39513952
final PodVlanMapVO podVlanMapVO = new PodVlanMapVO(podId, vlan.getId());
3952-
_podVlanMapDao.persist(podVlanMapVO);
3953+
podVlanMapDao.persist(podVlanMapVO);
39533954
}
39543955
return vlan;
39553956
}
@@ -4046,6 +4047,11 @@ public boolean deleteVlanAndPublicIpRange(final long userId, final long vlanDbId
40464047
public void doInTransactionWithoutResult(final TransactionStatus status) {
40474048
_publicIpAddressDao.deletePublicIPRange(vlanDbId);
40484049
_vlanDao.remove(vlanDbId);
4050+
4051+
SearchBuilder<PodVlanMapVO> podVlanMapVoSearchBuilder = podVlanMapDao.createSearchBuilder();
4052+
SearchCriteria<PodVlanMapVO> sc = podVlanMapVoSearchBuilder.create();
4053+
sc.setParameters("vlan_db_id", vlanDbId);
4054+
podVlanMapDao.remove(sc);
40494055
}
40504056
});
40514057

0 commit comments

Comments
 (0)