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

CLOUDSTACK-2894. Removing all vlan ranges should update the vnet column to NULL.

Browse Source
This commit is contained in:
Likitha Shetty 2013-06-07 19:22:39 +05:30
parent 8bc72ad55c
commit 22a8508280
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/src/com/cloud/network/NetworkServiceImpl.java
View File

@ -2680,8 +2680,9 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
vnetString = vnetString+vnetRange.first().toString()+"-"+value.toString()+";"; vnetString = vnetString+vnetRange.first().toString()+"-"+value.toString()+";";
} }
} }
vnetString = vnetString+"*"; if (vnetString.length() > 0 && vnetString.charAt(vnetString.length()-1)==';') {
vnetString = vnetString.replace(";*",""); vnetString = vnetString.substring(0, vnetString.length()-1);
}
network.setVnet(vnetString); network.setVnet(vnetString);
} }
@ -2788,12 +2789,15 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
_datacneter_vnet.deleteRange(txn, network.getDataCenterId(), network.getId(), start, end); _datacneter_vnet.deleteRange(txn, network.getDataCenterId(), network.getId(), start, end);
String vnetString=""; String vnetString="";
for (Pair<Integer,Integer> vnetRange : existingRanges ){ if (existingRanges.isEmpty()) {
network.setVnet(null);
} else {
for (Pair<Integer,Integer> vnetRange : existingRanges ) {
vnetString=vnetString+vnetRange.first().toString()+"-"+vnetRange.second().toString()+";"; vnetString=vnetString+vnetRange.first().toString()+"-"+vnetRange.second().toString()+";";
} }
vnetString = vnetString+"*"; vnetString = vnetString.substring(0, vnetString.length()-1);
vnetString = vnetString.replace(";*","");
network.setVnet(vnetString); network.setVnet(vnetString);
}
_physicalNetworkDao.update(network.getId(), network); _physicalNetworkDao.update(network.getId(), network);
txn.commit(); txn.commit();
_physicalNetworkDao.releaseFromLockTable(network.getId()); _physicalNetworkDao.releaseFromLockTable(network.getId());