DaanHoogland commented on code in PR #7630:
URL: https://github.com/apache/cloudstack/pull/7630#discussion_r1230852575
##########
server/src/main/java/com/cloud/network/NetworkServiceImpl.java:
##########
@@ -4264,23 +4265,37 @@ public boolean deletePhysicalNetwork(final Long
physicalNetworkId) {
return Transaction.execute(new TransactionCallback<Boolean>() {
@Override
public Boolean doInTransaction(TransactionStatus status) {
- // delete vlans for this zone
- List<VlanVO> vlans =
_vlanDao.listVlansByPhysicalNetworkId(physicalNetworkId);
- for (VlanVO vlan : vlans) {
- _vlanDao.remove(vlan.getId());
- }
-
- // Delete networks
- List<NetworkVO> networks =
_networksDao.listByPhysicalNetwork(physicalNetworkId);
- if (networks != null && !networks.isEmpty()) {
- for (NetworkVO network : networks) {
- _networksDao.remove(network.getId());
- }
- }
+ disablePhysicalNetwork(physicalNetworkId, pNetwork);
+ deleteVlans();
+ deleteNetworks();
+ deleteIpAddresses();
// delete vnets
_dcDao.deleteVnet(physicalNetworkId);
+ boolean x = deleteProviders();
+ if (!x) return false;
Review Comment:
```suggestion
if (!deleteProviders()) {
return false;
}
```
this is actually according to our coding stadards, three lines :(
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
