From 4da9b6bfb49d40d0ea4a4eb7a87344ab99daca95 Mon Sep 17 00:00:00 2001
From: keshav <keshav@cloud.com>
Date: Thu, 11 Aug 2011 11:54:41 -0700
Subject: [PATCH] Added parameter to enable the firewall rule UI to the list
 capabilities API.

---
 .../com/cloud/api/commands/ListCapabilitiesCmd.java   |  1 +
 .../com/cloud/api/response/CapabilitiesResponse.java  | 11 +++++++++++
 server/src/com/cloud/server/ManagementServerImpl.java |  2 ++
 3 files changed, 14 insertions(+)

diff --git a/api/src/com/cloud/api/commands/ListCapabilitiesCmd.java b/api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
index 22d44848484..5ae97335046 100644
--- a/api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
+++ b/api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
@@ -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);
diff --git a/api/src/com/cloud/api/response/CapabilitiesResponse.java b/api/src/com/cloud/api/response/CapabilitiesResponse.java
index 808770b3edc..e0222244705 100644
--- a/api/src/com/cloud/api/response/CapabilitiesResponse.java
+++ b/api/src/com/cloud/api/response/CapabilitiesResponse.java
@@ -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;
+    }
 }
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 3b61e83f072..8fbde17c45d 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -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;
     }