etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow network offering upgrade for any combination of services

This commit is contained in:
alena 2011-10-24 17:56:34 -07:00
parent 6379c9c61e
commit 345b1421c8
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -3414,8 +3414,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
return false;
}
//compare providers
return canUpgradeProviders(oldNetworkOfferingId, newNetworkOfferingId);
return true;
}
@ -3962,20 +3961,12 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
@Override
public List<Long> listNetworkOfferingsForUpgrade(long networkId) {
List<Long> offeringIdsToReturn = new ArrayList<Long>();
NetworkOffering originalOffering = _configMgr.getNetworkOffering(getNetwork(networkId).getNetworkOfferingId());
List<Long> offerings = _networkOfferingDao.getOfferingIdsToUpgradeFrom(originalOffering);
//check if providers are upgradable
for (Long offering : offerings) {
if (canUpgradeProviders(originalOffering.getId(), offering.longValue())) {
offeringIdsToReturn.add(offering);
}
}
return offeringIdsToReturn;
return offerings;
}
}