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

bug 12700: ipAssoc - owner of the ip is the owner of the guest network 

status 12700: resolved fixed
This commit is contained in:
Alena Prokharchyk 2012-01-04 14:58:59 -08:00
parent 867afce8da
commit 0538872003
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
View File

@ -115,7 +115,13 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
String domain = _domainService.getDomain(getDomainId()).getName();
throw new InvalidParameterValueException("Account name=" + getAccountName() + " domain=" + domain + " doesn't have virtual networks in zone=" + zone.getName());
}
assert (networks.size() <= 1) : "Too many virtual networks. This logic should be obsolete";
if (networks.size() < 1) {
throw new InvalidParameterValueException("Account doesn't have any Isolated networks in the zone");
} else if (networks.size() > 1) {
throw new InvalidParameterValueException("Account has more than one Isolated network in the zone");
}
return networks.get(0).getId();
} else {
Network defaultGuestNetwork = _networkService.getExclusiveGuestNetwork(zoneId);
@ -128,13 +134,10 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
}
@Override
public long getEntityOwnerId() {
Long accountId = finalyzeAccountId(accountName, domainId, projectId, true);
if (accountId == null) {
return UserContext.current().getCaller().getId();
}
return accountId;
public long getEntityOwnerId() {
//owner of the network should be the same as the owner of the ip
Network network = _networkService.getNetwork(getNetworkId());
return network.getAccountId();
}
@Override

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

@ -776,6 +776,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
throw new InvalidParameterValueException("Network id is invalid: " + networkId);
}
//check permissions
_accountMgr.checkAccess(caller, null, network);
DataCenter zone = _configMgr.getZone(network.getDataCenterId());
//allow associating IP addresses to guest network only