[New feature] Load balancer customization (haproxy-based) #4141
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
| package com.cloud.agent.api.to; | ||
|
|
||
| import org.apache.cloudstack.network.lb.LoadBalancerConfig; | ||
|
|
||
| public class LoadBalancerConfigTO { | ||
| private String name; | ||
| private String value; | ||
|
|
||
| public LoadBalancerConfigTO(String name, String value) { | ||
| this.name = name; | ||
| this.value = value; | ||
| } | ||
|
|
||
| public LoadBalancerConfigTO(LoadBalancerConfig config) { | ||
| this.name = config.getName(); | ||
| this.value = config.getValue(); | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| public String getValue() { | ||
| return value; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,6 +35,8 @@ | |
| import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy; | ||
| import com.cloud.utils.Pair; | ||
|
|
||
| import org.apache.cloudstack.network.lb.LoadBalancerConfig; | ||
|
|
||
| public class LoadBalancerTO { | ||
| String uuid; | ||
| String srcIp; | ||
|
|
@@ -50,6 +52,7 @@ public class LoadBalancerTO { | |
| String srcIpNetmask; | ||
| Long networkId; | ||
| DestinationTO[] destinations; | ||
| private LoadBalancerConfigTO[] lbConfigs; | ||
| private StickinessPolicyTO[] stickinessPolicies; | ||
| private HealthCheckPolicyTO[] healthCheckPolicies; | ||
| private LbSslCert sslCert; /* XXX: Should this be SslCertTO? */ | ||
|
|
@@ -179,6 +182,22 @@ public boolean isInline() { | |
| return inline; | ||
| } | ||
|
|
||
| public LoadBalancerConfigTO[] getLbConfigs() { | ||
| return this.lbConfigs; | ||
| } | ||
|
|
||
| public void setLbConfigs(List<? extends LoadBalancerConfig> lbConfigs) { | ||
| if (lbConfigs == null || lbConfigs.size() == 0) { | ||
| this.lbConfigs = new LoadBalancerConfigTO[0]; | ||
| return; | ||
| } | ||
| this.lbConfigs = new LoadBalancerConfigTO[lbConfigs.size()]; | ||
|
There was a problem hiding this comment. @weizhouapache advised changes to improve similar code, consider this as well. thanks. There was a problem hiding this comment. @sureshanaparti this has been changed in commit as well |
||
| int i = 0; | ||
| for (LoadBalancerConfig lbConfig : lbConfigs) { | ||
| this.lbConfigs[i++] = new LoadBalancerConfigTO(lbConfig); | ||
| } | ||
| } | ||
|
|
||
| public StickinessPolicyTO[] getStickinessPolicies() { | ||
| return stickinessPolicies; | ||
| } | ||
|
|
@@ -207,6 +226,10 @@ public LbSslCert getSslCert() { | |
| return this.sslCert; | ||
| } | ||
|
|
||
| public void setLbSslCert(LbSslCert sslCert) { | ||
| this.sslCert = sslCert; | ||
| } | ||
|
|
||
| public String getSrcIpVlan() { | ||
| return srcIpVlan; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could use
org.apache.commons.lang3.ArrayUtilshere:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@GutoVeronezi
org.apache.commons.lang3.ArrayUtilspackage don't have isEmpty method which accepts List object. I have to override it like:It imposes unnecessary conversion. What do you think?