etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "CLOUDSTACK-737" 

This reverts commit d7201dfe1f.

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
This commit is contained in:
Anthony Xu 2013-02-08 10:45:40 -08:00
parent 0a6c6bb254
commit dd67cfc5d0
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -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
}
}

5
server/src/com/cloud/resource/ResourceManagerImpl.java
View File

@ -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;