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

bug 6133: incremental checkin

This commit is contained in:
abhishek 2010-09-15 17:35:53 -07:00
parent 0b5178573a
commit 2f3a43ddda
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -934,10 +934,17 @@ public class ConfigurationManagerImpl implements ConfigurationManager {
if (!(accountId == null && podId == null) && false) {
throw new InvalidParameterValueException("VLANs for the virtual network must be zone-wide.");
}
} else if (vlanType.equals(VlanType.DirectAttached)) {
if (!((accountId != null && podId == null) || (accountId == null && podId != null))) {
throw new InvalidParameterValueException("Direct Attached VLANs must either be pod-wide, or for one account.");
}
}
else if (vlanType.equals(VlanType.DirectAttached))
{
// if (!((accountId != null && podId == null) || (accountId == null && podId != null))) {
// throw new InvalidParameterValueException("Direct Attached VLANs must either be pod-wide, or for one account.");
// }
if (accountId!=null && podId!=null)
{
throw new InvalidParameterValueException("Direct Attached VLANs must either be pod-wide,for one account or zone wide");
}
if (accountId != null) {
// VLANs for an account must be tagged