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

Added elb and eip capabilities to network offering response

This commit is contained in:
Alena Prokharchyk 2012-01-12 14:49:25 -08:00
parent a8758d292e
commit 630cbb2243
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -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);
}

1
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
View File

@ -743,7 +743,6 @@ public class LoadBalancingRulesManagerImpl<Type> implements LoadBalancingRulesMa
_lbDao.remove(newRule.getId());
txn.commit();
}
}
}