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

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 <github@remi.nl>
This commit is contained in:
Remi Bergsma 2015-12-11 19:45:14 +01:00
parent c9985e96a5 51c9f0e3b5
commit 6be2cc78c7
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/network/vpc/VpcManagerImpl.java
View File

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