From 1d43bddacfc0bf9d4374314ad2339b9638394ebe Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 9 Dec 2019 11:04:14 +0100 Subject: [PATCH] revert b13acc6459fe5c824206ae77885600404368c476 to once again allow a VM to be on multiple networks from VPCs --- server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index bb4246eb7df9..da38205037a6 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -3613,7 +3613,6 @@ private UserVm createVirtualMachine(DataCenter zone, ServiceOffering serviceOffe short defaultNetworkNumber = 0; boolean securityGroupEnabled = false; - boolean vpcNetwork = false; for (NetworkVO network : networkList) { if ((network.getDataCenterId() != zone.getId())) { if (!network.isStrechedL2Network()) { @@ -3684,14 +3683,6 @@ private UserVm createVirtualMachine(DataCenter zone, ServiceOffering serviceOffe securityGroupEnabled = true; } - // vm can't be a part of more than 1 VPC network - if (network.getVpcId() != null) { - if (vpcNetwork) { - throw new InvalidParameterValueException("Vm can't be a part of more than 1 VPC network"); - } - vpcNetwork = true; - } - networkNicMap.put(network.getUuid(), profile); }