From 3a1d005400a11c7f6cdeed0c23fc282f557209d4 Mon Sep 17 00:00:00 2001
From: Edison Su <edison@cloud.com>
Date: Fri, 25 Feb 2011 15:30:02 -0500
Subject: [PATCH] creating zone wide vlan is disabled if zone is security group
 enabled

---
 server/src/com/cloud/network/NetworkManagerImpl.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 0aa1182b95a..1d33cc7798d 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1486,6 +1486,10 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
             throw new InvalidParameterValueException("Virtual Network creation is not allowd if zone is security group enabled");
         }
         
+        if (zone.isSecurityGroupEnabled() && cmd.getAccountName() == null) {
+            throw new InvalidParameterValueException("Can't create a zone wide network if zone is security group enabled");
+        }
+        
         String cidr = null;
         if (gateway != null && netmask != null) {
             cidr = NetUtils.ipAndNetMaskToCidr(gateway, netmask);