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

Owner of the network is system if the network is shared to Domain

This commit is contained in:
Alena Prokharchyk 2011-11-21 11:52:23 -08:00
parent 22619711e7
commit d67bef8e78
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1776,7 +1776,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
} else {
throw new InvalidParameterValueException("Incorrect aclType specified. Check the API documentation for supported types");
}
} else if (zone.getNetworkType() == NetworkType.Advanced) {
} else if (zone.getNetworkType() == NetworkType.Advanced){
aclType = ACLType.Account;
} else if (zone.getNetworkType() == NetworkType.Basic){
aclType = ACLType.Domain;
@ -1882,6 +1882,11 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
sharedDomainId = _domainMgr.getDomain(Domain.ROOT_DOMAIN).getId();
}
}
//default owner to system if network has aclType=Domain
if (aclType == ACLType.Domain) {
owner = _accountMgr.getAccount(Account.ACCOUNT_ID_SYSTEM);
}
Network network = createGuestNetwork(networkOfferingId, name, displayText, isDefault, gateway, cidr, vlanId, networkDomain, owner, false, sharedDomainId, pNtwk, zoneId, aclType, subdomainAccess);
//Vlan is created in 2 cases - works in Advance zone only:
@ -2006,9 +2011,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
} else {
if (networkDomain == null) {
//1) Get networkDomain from the corresponding account/domain/zone
if (aclType == null) {
networkDomain = getZoneNetworkDomain(zoneId);
} else if (aclType == ACLType.Domain) {
if (aclType == ACLType.Domain) {
networkDomain = getDomainNetworkDomain(domainId, zoneId);
} else if (aclType == ACLType.Account){
networkDomain = getAccountNetworkDomain(owner.getId(), zoneId);