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

IPv6: Disable untested features 

Conflicts:

	api/src/com/cloud/api/commands/DeployVMCmd.java
This commit is contained in:
Sheng Yang 2013-01-30 17:07:33 -08:00
parent ff06a26c4d
commit 41a815e762
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/com/cloud/api/commands/CreateNetworkCmd.java
View File

@ -262,6 +262,10 @@ public class CreateNetworkCmd extends BaseCmd {
@Override
// an exception thrown by createNetwork() will be caught by the dispatcher.
public void execute() throws InsufficientCapacityException, ConcurrentOperationException, ResourceAllocationException{
if (getStartIpv6() != null && getStartIp() != null) {
throw new InvalidParameterValueException("Cannot support dualstack at this moment!");
}
Network result = _networkService.createGuestNetwork(this);
if (result != null) {
NetworkResponse response = _responseGenerator.createNetworkResponse(result);

4
server/src/com/cloud/network/NetworkServiceImpl.java
View File

@ -764,10 +764,6 @@ public class NetworkServiceImpl implements NetworkService, Manager {
UserContext.current().setAccountId(owner.getAccountId());
if (startIPv6 != null && startIP != null) {
throw new InvalidParameterValueException("Cannot support dualstack at this moment!");
}
boolean ipv4 = false, ipv6 = false;
if (startIP != null) {
ipv4 = true;