From 065d2561b9532c6f7536d22ce067d6085238a76b Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Mon, 13 May 2013 11:40:40 -0700 Subject: [PATCH] CLOUDSTACK-2392: Not allow create pvlan network with ipv6 --- server/src/com/cloud/network/NetworkServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 7c4d7027c6b..ebada5c3fc3 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