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 lbCapResponse = new ArrayList(); + 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 capabilities = new ArrayList(); @@ -2636,7 +2643,16 @@ public class ApiResponseHelper implements ResponseGenerator { capabilities.add(redundantRouter); svcRsp.setCapabilities(capabilities); - } + } else if (service == Service.StaticNat) { + List staticNatCapResponse = new ArrayList(); + + 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 implements LoadBalancingRulesMa _lbDao.remove(newRule.getId()); txn.commit(); - } } }