Revert "Revert "CLOUDSTACK-737"" This reverts commit 447d49ae91277be2d8e60c28a5acd86a0e6691d5.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b66f6c88 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b66f6c88 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b66f6c88 Branch: refs/heads/ui-plugins Commit: b66f6c88f931e1b4c57f48fe2eb9de3dcd29d1f2 Parents: 27d1f3f Author: anthony <[email protected]> Authored: Fri Feb 8 12:19:03 2013 -0800 Committer: anthony <[email protected]> Committed: Fri Feb 8 12:19:03 2013 -0800 ---------------------------------------------------------------------- .../src/com/cloud/network/NetworkManagerImpl.java | 8 -------- .../com/cloud/resource/ResourceManagerImpl.java | 3 --- 2 files changed, 0 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b66f6c88/server/src/com/cloud/network/NetworkManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index f02bcec..7a84e6e 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -1856,7 +1856,6 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L if (zone.isSecurityGroupEnabled()) { <<<<<<< HEAD <<<<<<< HEAD -<<<<<<< HEAD if (ipv6) { throw new InvalidParameterValueException("IPv6 is not supported with security group!"); } @@ -1877,19 +1876,12 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L // Only Account specific Isolated network with sourceNat service disabled are allowed in security group // enabled zone >>>>>>> parent of d7201df... CLOUDSTACK-737 -======= - // 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 -<<<<<<< HEAD ->>>>>>> parent of d7201df... CLOUDSTACK-737 -======= >>>>>>> parent of d7201df... CLOUDSTACK-737 ======= >>>>>>> parent of d7201df... CLOUDSTACK-737 http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b66f6c88/server/src/com/cloud/resource/ResourceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index 43967e2..bd4f338 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -429,9 +429,6 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, ======= 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 "); -<<<<<<< HEAD ->>>>>>> parent of d7201df... CLOUDSTACK-737 -======= >>>>>>> parent of d7201df... CLOUDSTACK-737 }
