From dd67cfc5d07783cd4f8cf3480323f3ed030cc216 Mon Sep 17 00:00:00 2001 From: Anthony Xu Date: Fri, 8 Feb 2013 10:45:40 -0800 Subject: [PATCH] Revert "CLOUDSTACK-737" This reverts commit d7201dfe1f49fb75054e1f0b6922ed21446ad130. Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/resource/ResourceManagerImpl.java --- server/src/com/cloud/network/NetworkManagerImpl.java | 8 ++++++++ server/src/com/cloud/resource/ResourceManagerImpl.java | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 57555a1cc37..19c1d9fd295 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -1854,6 +1854,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L } else if (zone.getNetworkType() == NetworkType.Advanced) { if (zone.isSecurityGroupEnabled()) { +<<<<<<< HEAD <<<<<<< HEAD if (ipv6) { throw new InvalidParameterValueException("IPv6 is not supported with security group!"); @@ -1871,11 +1872,18 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L ======= // Only Account specific Isolated network with sourceNat service disabled are allowed in security group // enabled zone +======= + // Only Account specific Isolated network with sourceNat service disabled are allowed in security group + // enabled zone +>>>>>>> parent of d7201df... CLOUDSTACK-737 boolean allowCreation = (ntwkOff.getGuestType() == GuestType.Isolated && !_networkModel.areServicesSupportedByNetworkOffering(ntwkOff.getId(), Service.SourceNat)); if (!allowCreation) { throw new InvalidParameterValueException("Only Account specific Isolated network with sourceNat " + "service disabled are allowed in security group enabled zone"); +<<<<<<< HEAD +>>>>>>> parent of d7201df... CLOUDSTACK-737 +======= >>>>>>> parent of d7201df... CLOUDSTACK-737 } } diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index 82013d4380d..bd4f338bdc5 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -421,10 +421,15 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, Hypervisor.HypervisorType hypervisorType = Hypervisor.HypervisorType .getType(cmd.getHypervisor()); if (hypervisorType == null) { +<<<<<<< HEAD s_logger.error("Unable to resolve " + cmd.getHypervisor() + " to a valid supported hypervisor type"); throw new InvalidParameterValueException("Unable to resolve " + cmd.getHypervisor() + " to a supported "); +======= + s_logger.error("Unable to resolve " + cmd.getHypervisor() + " to a valid supported hypervisor type"); + throw new InvalidParameterValueException("Unable to resolve " + cmd.getHypervisor() + " to a supported "); +>>>>>>> parent of d7201df... CLOUDSTACK-737 } Cluster.ClusterType clusterType = null;