Adding protocol parameter to loadbalancer response

Syed Ahmed · murali-reddy · commit 481af07fb130 · 2013-11-19T22:12:44.000+05:30
diff --git a/api/src/com/cloud/network/rules/LoadBalancer.java b/api/src/com/cloud/network/rules/LoadBalancer.java
@@ -25,4 +25,5 @@ public interface LoadBalancer extends FirewallRule, LoadBalancerContainer {
 
     int getDefaultPortEnd();
 
+
 }
diff --git a/api/src/com/cloud/network/rules/LoadBalancerContainer.java b/api/src/com/cloud/network/rules/LoadBalancerContainer.java
@@ -27,6 +27,8 @@ public enum Scheme {
     String getDescription();
     
     String getAlgorithm();
+
+    String getLbProtocol();
     
     Scheme getScheme();
 
diff --git a/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java b/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java
@@ -91,6 +91,11 @@ public class LoadBalancerResponse extends BaseResponse implements ControlledEnti
     @Param(description = "the id of the zone the rule belongs to")
     private String zoneId;
 
+    @SerializedName(ApiConstants.PROTOCOL)
+    @Param(description = "the protocol of the loadbalanacer rule")
+    private String lbProtocol;
+
+
     @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with load balancer", responseObject = ResourceTagResponse.class)
     private List<ResourceTagResponse> tags;
     
@@ -170,4 +175,7 @@ public void setNetworkId(String networkId) {
         this.networkId = networkId;
     }
 
+    public void setLbProtocol(String lbProtocol) {
+        this.lbProtocol = lbProtocol;
+    }
 }
diff --git a/engine/schema/src/org/apache/cloudstack/lb/ApplicationLoadBalancerRuleVO.java b/engine/schema/src/org/apache/cloudstack/lb/ApplicationLoadBalancerRuleVO.java
@@ -58,6 +58,10 @@ public class ApplicationLoadBalancerRuleVO extends FirewallRuleVO implements App
     
     @Column(name="source_ip_address_network_id")
     Long sourceIpNetworkId;
+
+    @Column(name="lb_protocol")
+    String lbProtocol;
+
     
     @Column(name="source_ip_address")
     @Enumerated(value=EnumType.STRING)
@@ -111,6 +115,11 @@ public String getAlgorithm() {
         return algorithm;
     }
 
+    @Override
+    public String getLbProtocol() {
+        return lbProtocol;
+    }
+
     @Override
     public int getDefaultPortStart() {
         return defaultPortStart;
@@ -130,4 +139,6 @@ public Scheme getScheme() {
     public int getInstancePort() {
         return defaultPortStart;
     }
+
+
 }
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -748,6 +748,7 @@ public LoadBalancerResponse createLoadBalancerResponse(LoadBalancer loadBalancer
         lbResponse.setPublicPort(Integer.toString(loadBalancer.getSourcePortStart()));
         lbResponse.setPrivatePort(Integer.toString(loadBalancer.getDefaultPortStart()));
         lbResponse.setAlgorithm(loadBalancer.getAlgorithm());
+        lbResponse.setLbProtocol(loadBalancer.getLbProtocol());
         FirewallRule.State state = loadBalancer.getState();
         String stateToSet = state.toString();
         if (state.equals(FirewallRule.State.Revoke)) {

Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,5 @@ public interface LoadBalancer extends FirewallRule, LoadBalancerContainer {`
`25`	`25`
`26`	`26`	`int getDefaultPortEnd();`
`27`	`27`
	`28`	`+`
`28`	`29`	`}`