|
177 | 177 | import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO; |
178 | 178 | import com.cloud.network.dao.PhysicalNetworkVO; |
179 | 179 | import com.cloud.network.rules.LoadBalancerContainer.Scheme; |
| 180 | +import com.cloud.network.vpc.PrivateIpVO; |
180 | 181 | import com.cloud.network.vpc.VpcManager; |
181 | 182 | import com.cloud.offering.DiskOffering; |
182 | 183 | import com.cloud.offering.NetworkOffering; |
@@ -266,7 +267,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati |
266 | 267 | @Inject |
267 | 268 | DomainVlanMapDao _domainVlanMapDao; |
268 | 269 | @Inject |
269 | | - PodVlanMapDao _podVlanMapDao; |
| 270 | + PodVlanMapDao podVlanMapDao; |
270 | 271 | @Inject |
271 | 272 | DataCenterDao _zoneDao; |
272 | 273 | @Inject |
@@ -3949,7 +3950,7 @@ public VlanVO doInTransaction(final TransactionStatus status) { |
3949 | 3950 | } else if (podId != null) { |
3950 | 3951 | // This VLAN is pod-wide, so create a PodVlanMapVO entry |
3951 | 3952 | final PodVlanMapVO podVlanMapVO = new PodVlanMapVO(podId, vlan.getId()); |
3952 | | - _podVlanMapDao.persist(podVlanMapVO); |
| 3953 | + podVlanMapDao.persist(podVlanMapVO); |
3953 | 3954 | } |
3954 | 3955 | return vlan; |
3955 | 3956 | } |
@@ -4046,6 +4047,11 @@ public boolean deleteVlanAndPublicIpRange(final long userId, final long vlanDbId |
4046 | 4047 | public void doInTransactionWithoutResult(final TransactionStatus status) { |
4047 | 4048 | _publicIpAddressDao.deletePublicIPRange(vlanDbId); |
4048 | 4049 | _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); |
4049 | 4055 | } |
4050 | 4056 | }); |
4051 | 4057 |
|
|
0 commit comments