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

Added parameter to enable the firewall rule UI to the list capabilities API.

This commit is contained in:
keshav 2011-08-11 11:54:41 -07:00
parent 4e4a44f2c4
commit 4da9b6bfb4
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
View File

@ -49,6 +49,7 @@ public class ListCapabilitiesCmd extends BaseCmd {
response.setSecurityGroupsEnabled((Boolean)capabilities.get("securityGroupsEnabled"));
response.setCloudStackVersion((String)capabilities.get("cloudStackVersion"));
response.setUserPublicTemplateEnabled((Boolean)capabilities.get("userPublicTemplateEnabled"));
response.setFirewallRuleUiEnabled((Boolean) capabilities.get("firewallRuleUiEnabled"));
response.setObjectName("capability");
response.setResponseName(getCommandName());
this.setResponseObject(response);

11
api/src/com/cloud/api/response/CapabilitiesResponse.java
View File

@ -30,6 +30,9 @@ public class CapabilitiesResponse extends BaseResponse {
@SerializedName("userpublictemplateenabled") @Param(description="true if user and domain admins can set templates to be shared, false otherwise")
private boolean userPublicTemplateEnabled;
@SerializedName("firewallRuleUiEnabled") @Param(description="true if the firewall rule UI is enabled")
private boolean firewallRuleUiEnabled;
public boolean getSecurityGroupsEnabled() {
return securityGroupsEnabled;
@ -54,4 +57,12 @@ public class CapabilitiesResponse extends BaseResponse {
public void setUserPublicTemplateEnabled(boolean userPublicTemplateEnabled) {
this.userPublicTemplateEnabled = userPublicTemplateEnabled;
}
public void setFirewallRuleUiEnabled(boolean firewallRuleUiEnabled) {
this.firewallRuleUiEnabled = firewallRuleUiEnabled;
}
public boolean getFirewallRuleUiEnabled() {
return firewallRuleUiEnabled;
}
}

2
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -4213,11 +4213,13 @@ public class ManagementServerImpl implements ManagementServer {
securityGroupsEnabled = true;
}
String firewallRuleUiEnabled = _configs.get(Config.FirewallRuleUiEnabled.key());
String userPublicTemplateEnabled = _configs.get(Config.AllowPublicUserTemplates.key());
capabilities.put("securityGroupsEnabled", securityGroupsEnabled);
capabilities.put("userPublicTemplateEnabled", (userPublicTemplateEnabled == null || userPublicTemplateEnabled.equals("false") ? false : true));
capabilities.put("cloudStackVersion", getVersion());
capabilities.put("firewallRuleUiEnabled", (firewallRuleUiEnabled != null && firewallRuleUiEnabled.equals("true")) ? true : false);
return capabilities;
}