From 630cbb2243e8fa6189095ff2d7f4937f27f4f0a3 Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <Alena.Prokharchyk@citrix.com>
Date: Thu, 12 Jan 2012 14:49:25 -0800
Subject: [PATCH] Added elb and eip capabilities to network offering response

---
 .../src/com/cloud/api/ApiResponseHelper.java   | 18 +++++++++++++++++-
 .../lb/LoadBalancingRulesManagerImpl.java      |  1 -
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index e1104224985..0c6193d81c7 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -2618,10 +2618,17 @@ public class ApiResponseHelper implements ResponseGenerator {
 
             if (Service.Lb == service) {
                 List<CapabilityResponse> lbCapResponse = new ArrayList<CapabilityResponse>();
+                
                 CapabilityResponse lbIsoaltion = new CapabilityResponse();
                 lbIsoaltion.setName(Capability.SupportedLBIsolation.getName());
                 lbIsoaltion.setValue(offering.getDedicatedLB()?"dedicated":"shared");
                 lbCapResponse.add(lbIsoaltion);
+                
+                CapabilityResponse eLb = new CapabilityResponse();
+                eLb.setName(Capability.ElasticLb.getName());
+                eLb.setValue(offering.getElasticLb()?"true":"false");
+                lbCapResponse.add(eLb);
+                
                 svcRsp.setCapabilities(lbCapResponse);
             } else if (Service.SourceNat == service) {
                 List<CapabilityResponse> capabilities = new ArrayList<CapabilityResponse>();
@@ -2636,7 +2643,16 @@ public class ApiResponseHelper implements ResponseGenerator {
                 capabilities.add(redundantRouter);
                 
                 svcRsp.setCapabilities(capabilities);
-            } 
+            } else if (service == Service.StaticNat) {
+                List<CapabilityResponse> staticNatCapResponse = new ArrayList<CapabilityResponse>();
+                
+                CapabilityResponse eIp = new CapabilityResponse();
+                eIp.setName(Capability.ElasticIp.getName());
+                eIp.setValue(offering.getElasticLb()?"true":"false");
+                staticNatCapResponse.add(eIp);
+
+                svcRsp.setCapabilities(staticNatCapResponse);
+            }
 
             serviceResponses.add(svcRsp);
         }
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
index d50318f8fa2..97b3b5cf7ba 100755
--- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
+++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -743,7 +743,6 @@ public class LoadBalancingRulesManagerImpl<Type> implements LoadBalancingRulesMa
                 _lbDao.remove(newRule.getId());
                 
                 txn.commit();
-                
             }
         }
     }