[6/9] git commit: refs/heads/network-refactor - IPv6: Disable untested features

[yasker]

IPv6: Disable untested features

Conflicts:

        api/src/com/cloud/api/commands/DeployVMCmd.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/41a815e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/41a815e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/41a815e7

Branch: refs/heads/network-refactor
Commit: 41a815e7627eadd7c63d8a6a6b10072be57ee6fe
Parents: ff06a26
Author: Sheng Yang <sheng.y...@citrix.com>
Authored: Wed Jan 30 17:07:33 2013 -0800
Committer: Sheng Yang <sheng.y...@citrix.com>
Committed: Mon Feb 4 15:32:37 2013 -0800

----------------------------------------------------------------------
 .../com/cloud/api/commands/CreateNetworkCmd.java   |    4 ++++
 .../src/com/cloud/network/NetworkServiceImpl.java  |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/41a815e7/api/src/com/cloud/api/commands/CreateNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/CreateNetworkCmd.java 
b/api/src/com/cloud/api/commands/CreateNetworkCmd.java
index fcc1fa7..336dcec 100644
--- a/api/src/com/cloud/api/commands/CreateNetworkCmd.java
+++ b/api/src/com/cloud/api/commands/CreateNetworkCmd.java
@@ -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);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/41a815e7/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java 
b/server/src/com/cloud/network/NetworkServiceImpl.java
index 42a05a6..1e3c9eb 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -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;