Revert "CLOUDSTACK-737"

Anthony Xu · Anthony Xu · commit dd67cfc5d077 · 2013-02-08T10:45:40.000-08:00
This reverts commit d7201df. Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/resource/ResourceManagerImpl.java
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1854,6 +1854,7 @@ public Network createGuestNetwork(long networkOfferingId, String name, String di
 
         } 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 Network createGuestNetwork(long networkOfferingId, String name, String di
 =======
                 // 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
@@ -421,10 +421,15 @@ public List<? extends Cluster> discoverCluster(AddClusterCmd cmd)
 		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;
