From ca162bca11849e79d88ccd5def37fcf6ebfebf81 Mon Sep 17 00:00:00 2001 From: abhishek Date: Fri, 19 Nov 2010 17:52:58 -0800 Subject: [PATCH] bug 6936: for some reason, we had a check on pod-wide or account specific vlan creation. This seems to be a left over from legacy code. Removing the same. I tested to make sure both zone wide vlan and account specific vlan creation for direct tagged case works fine status 6936: resolved fixed --- .../com/cloud/configuration/ConfigurationManagerImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 023c3dea0b7..d818cdcecc4 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -1516,10 +1516,10 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura associateIpRangeToAccount = true; } } else if (vlanType.equals(VlanType.DirectAttached)) { - if (!((account != null && podId == null) || - (account == null && podId != null))) { - throw new InvalidParameterValueException("Direct Attached IP ranges must either be pod-wide, or for one account."); - } +// if (!((account != null && podId == null) || +// (account == null && podId != null))) { +// throw new InvalidParameterValueException("Direct Attached IP ranges must either be pod-wide, or for one account."); +// } if (account != null) { // VLANs for an account must be tagged