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

Fixed ipAssoc in Basic zone (elastic IP)

This commit is contained in:
alena 2011-04-27 11:15:30 -07:00
parent 7e8d02defb
commit 81e7b25217
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -501,8 +501,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
_accountMgr.checkAccess(caller, ipOwner);
DataCenterVO zone = null;
if (zoneId != null) {
DataCenterVO zone = _dcDao.findById(zoneId);
zone = _dcDao.findById(zoneId);
if (zone == null) {
throw new InvalidParameterValueException("Can't find zone by id " + zoneId);
}
@ -521,8 +522,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
}
// Check that network belongs to IP owner
if (network.getAccountId() != ipOwner.getId()) {
// Check that network belongs to IP owner - skip this check for Basic zone as there is just one guest network, and it
// belongs to the system
if (zone.getNetworkType() != NetworkType.Basic && network.getAccountId() != ipOwner.getId()) {
throw new InvalidParameterValueException("The owner of the network is not the same as owner of the IP");
}
@ -555,10 +557,10 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
boolean isSourceNat = false;
txn.start();
// First IP address should be source nat
// First IP address should be source nat when it's being associated with Guest Virtual network
List<IPAddressVO> addrs = listPublicIpAddressesInVirtualNetwork(ownerId, zoneId, true, networkId);
if (addrs.isEmpty()) {
if (addrs.isEmpty() && network.getGuestType() == GuestIpType.Virtual) {
isSourceNat = true;
}