You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/12/11 19:45:43 UTC
[1/2] git commit: updated refs/heads/master to 6be2cc7
Repository: cloudstack
Updated Branches:
refs/heads/master c9985e96a -> 6be2cc78c
CLOUDSTACK-9138 - Adds multiple providers back to VPC implementation
- It is need and already allowed/used in the current implementation. For example, the Default [redundant] VPC offerings use
two LB providers. If we cannot create offerings with 2 LB providers, the whole internal loadbalancer implementation won't work
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/51c9f0e3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/51c9f0e3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/51c9f0e3
Branch: refs/heads/master
Commit: 51c9f0e3b524f978eadb6a6ba630c3f7281b1a11
Parents: 0c7a562
Author: Wilder Rodrigues <wr...@schubergphilis.com>
Authored: Thu Dec 10 19:51:28 2015 +0100
Committer: Wilder Rodrigues <wr...@schubergphilis.com>
Committed: Thu Dec 10 19:51:28 2015 +0100
----------------------------------------------------------------------
server/src/com/cloud/network/vpc/VpcManagerImpl.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51c9f0e3/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index bb857e4..fe9a86f 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -412,10 +412,6 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
final Network.Service service = Network.Service.getService(serviceEntry.getKey());
if (svcProviderMap.containsKey(service)) {
final Set<Provider> providers = new HashSet<Provider>();
- // don't allow to specify more than 1 provider per service
- if (serviceEntry.getValue() != null && serviceEntry.getValue().size() > 1) {
- throw new InvalidParameterValueException("In the current release only one provider can be " + "specified for the service");
- }
for (final String prvNameStr : serviceEntry.getValue()) {
// check if provider is supported
final Network.Provider provider = Network.Provider.getProvider(prvNameStr);
[2/2] git commit: updated refs/heads/master to 6be2cc7
Posted by re...@apache.org.
Merge pull request #1215 from ekholabs/improve/mult-providers-CLOUDSTACK-9138
CLOUDSTACK-9138 - Adds multiple providers back to VPC implementation - It is need and already allowed/used in the current implementation. For example, the Default [redundant] VPC offerings use two LB providers. If we cannot create offerings with 2 LB providers, the whole internal loadbalancer implementation won't work.
* pr/1215:
CLOUDSTACK-9138 - Adds multiple providers back to VPC implementation
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6be2cc78
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6be2cc78
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6be2cc78
Branch: refs/heads/master
Commit: 6be2cc78c7585659a58d4715fc7082426c4192be
Parents: c9985e9 51c9f0e
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Dec 11 19:45:14 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Fri Dec 11 19:45:15 2015 +0100
----------------------------------------------------------------------
server/src/com/cloud/network/vpc/VpcManagerImpl.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------