Updated Branches: refs/heads/4.2 28f04c8ec -> 5c18483d8
Cloudstack-2997 unable to update concurrent_conncetions feild in network_offerin. Signed-off-by: Abhinandan Prateek <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5c18483d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5c18483d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5c18483d Branch: refs/heads/4.2 Commit: 5c18483d8182ea3da9d8a34778b7f98f72bcd29c Parents: 28f04c8 Author: Bharat Kumar <[email protected]> Authored: Mon Jul 29 15:27:11 2013 +0530 Committer: Abhinandan Prateek <[email protected]> Committed: Wed Jul 31 15:32:28 2013 +0530 ---------------------------------------------------------------------- .../cloudstack/api/response/NetworkOfferingResponse.java | 6 ++++++ .../schema/src/com/cloud/offerings/NetworkOfferingVO.java | 7 ++++--- server/src/com/cloud/api/ApiResponseHelper.java | 1 + .../com/cloud/configuration/ConfigurationManagerImpl.java | 9 +++++---- 4 files changed, 16 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c18483d/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java index 6b35d7b..a593ae6 100644 --- a/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java +++ b/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java @@ -91,6 +91,8 @@ public class NetworkOfferingResponse extends BaseResponse { @SerializedName(ApiConstants.EGRESS_DEFAULT_POLICY) @Param(description="true if network offering supports persistent networks, false otherwise") private Boolean egressDefaultPolicy; + @SerializedName(ApiConstants.MAX_CONNECTIONS) @Param(description = "maximum number of concurrents connections to be handled by lb") + private Integer concurrentConnections; public void setId(String id) { this.id = id; @@ -173,4 +175,8 @@ public class NetworkOfferingResponse extends BaseResponse { this.egressDefaultPolicy = egressDefaultPolicy; } + public void setConcurrentConnections(Integer concurrentConnections) { + this.concurrentConnections = concurrentConnections; + } + } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c18483d/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java b/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java index 406d98a..1ab463b 100755 --- a/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java +++ b/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java @@ -134,7 +134,8 @@ public class NetworkOfferingVO implements NetworkOffering { boolean egressdefaultpolicy; @Column(name = "concurrent_connections") - Integer concurrent_connections; + Integer concurrentConnections; + @Override public String getDisplayText() { @@ -433,10 +434,10 @@ public class NetworkOfferingVO implements NetworkOffering { this.publicLb = publicLb; } public Integer getConcurrentConnections() { - return this.concurrent_connections; + return this.concurrentConnections; } public void setConcurrentConnections(Integer concurrent_connections) { - this.concurrent_connections = concurrent_connections; + this.concurrentConnections = concurrent_connections; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c18483d/server/src/com/cloud/api/ApiResponseHelper.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 307e6bb..4832d71 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -2001,6 +2001,7 @@ public class ApiResponseHelper implements ResponseGenerator { response.setIsPersistent(offering.getIsPersistent()); response.setNetworkRate(ApiDBUtils.getNetworkRate(offering.getId())); response.setEgressDefaultPolicy(offering.getEgressDefaultPolicy()); + response.setConcurrentConnections(offering.getConcurrentConnections()); Long so = null; if (offering.getServiceOfferingId() != null) { so = offering.getServiceOfferingId(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c18483d/server/src/com/cloud/configuration/ConfigurationManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 3ec3514..9a21df7 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -3926,7 +3926,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } validateLoadBalancerServiceCapabilities(lbServiceCapabilityMap); - if (lbServiceCapabilityMap != null && !lbServiceCapabilityMap.isEmpty()) { + if (!serviceProviderMap.containsKey(Service.Lb) && lbServiceCapabilityMap != null && !lbServiceCapabilityMap.isEmpty()) { maxconn = cmd.getMaxconnections(); if (maxconn == null) { maxconn=Integer.parseInt(_configDao.getValue(Config.NetworkLBHaproxyMaxConn.key())); @@ -4718,9 +4718,10 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati offering.setAvailability(availability); } } - - if (maxconn != null) { - offering.setConcurrentConnections(maxconn); + if (_ntwkOffServiceMapDao.areServicesSupportedByNetworkOffering(offering.getId(), Service.Lb)){ + if (maxconn != null) { + offering.setConcurrentConnections(maxconn); + } } if (_networkOfferingDao.update(id, offering)) {
