cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [11/39] git commit: updated refs/heads/ui-vpc-redesign to 8d9a8ca
Date Thu, 16 May 2013 17:12:32 GMT
CLOUDSTACK-2392: Not allow create pvlan network with ipv6



Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/065d2561
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/065d2561
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/065d2561

Branch: refs/heads/ui-vpc-redesign
Commit: 065d2561b9532c6f7536d22ce067d6085238a76b
Parents: 25e992d
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Mon May 13 11:40:40 2013 -0700
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Mon May 13 11:40:40 2013 -0700

----------------------------------------------------------------------
 .../src/com/cloud/network/NetworkServiceImpl.java  |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/065d2561/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index 7c4d702..ebada5c 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -1019,6 +1019,10 @@ public class NetworkServiceImpl extends ManagerBase implements  NetworkService
{
         	throw new InvalidParameterValueException("Can only support create Private VLAN network
with advance shared network!");
         }
         
+        if (isolatedPvlan != null && ipv6) {
+        	throw new InvalidParameterValueException("Can only support create Private VLAN network
with IPv4!");
+        }
+        
         // Regular user can create Guest Isolated Source Nat enabled network only
         if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL
                 && (ntwkOff.getTrafficType() != TrafficType.Guest || ntwkOff.getGuestType()
!= Network.GuestType.Isolated


Mime
View raw message