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

bug 8263: allowing a private zone to be made public

This commit is contained in:
abhishek 2011-02-11 11:34:37 -08:00
parent bda0b09441
commit 5d1d9ec387
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/com/cloud/api/commands/UpdateZoneCmd.java
View File

@ -62,6 +62,9 @@ public class UpdateZoneCmd extends BaseCmd {
@Parameter(name=ApiConstants.VLAN, type=CommandType.STRING, description="the VLAN for the Zone")
private String vlan;
@Parameter(name=ApiConstants.IS_PUBLIC, type=CommandType.BOOLEAN, description="updates a private zone to public if set, but not vice-versa")
private Boolean isPublic;
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
@ -98,6 +101,9 @@ public class UpdateZoneCmd extends BaseCmd {
return vlan;
}
public Boolean isPublic() {
return isPublic;
}
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////

7
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -944,6 +944,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
Long userId = UserContext.current().getCallerUserId();
int startVnetRange = 0;
int stopVnetRange = 0;
Boolean isPublic = cmd.isPublic();
if (userId == null) {
userId = Long.valueOf(User.UID_SYSTEM);
@ -1053,6 +1054,12 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
zone.setVnet(vnetRange);
}
//update a private zone to public; not vice versa
if(isPublic != null && isPublic) {
zone.setDomainId(null);
zone.setDomain(null);
}
if (!_zoneDao.update(zoneId, zone)) {
throw new CloudRuntimeException("Failed to edit zone. Please contact Cloud Support.");
}