cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yas...@apache.org
Subject [3/3] git commit: IPv6: Add support for IPv6 on DeployVMCmd
Date Tue, 29 Jan 2013 02:54:42 GMT
Updated Branches:
  refs/heads/ipv6 fa00ddf07 -> 2cbca372b


IPv6: Add support for IPv6 on DeployVMCmd


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

Branch: refs/heads/ipv6
Commit: 2cbca372bf3f9231fc8f82b88a896a71caea0ef3
Parents: 5b92c57
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Sun Jan 27 20:10:39 2013 -0800
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Mon Jan 28 18:54:34 2013 -0800

----------------------------------------------------------------------
 api/src/com/cloud/network/Network.java             |   28 ++++++++++++-
 api/src/com/cloud/vm/UserVmService.java            |   14 +++---
 .../org/apache/cloudstack/api/ApiConstants.java    |    1 +
 .../api/command/user/vm/DeployVMCmd.java           |   27 +++++++----
 server/src/com/cloud/network/NetworkManager.java   |    2 +-
 .../src/com/cloud/network/NetworkManagerImpl.java  |   33 ++++++++++++---
 .../src/com/cloud/network/PublicIpv6AddressVO.java |    1 -
 server/src/com/cloud/vm/UserVmManagerImpl.java     |   34 +++++++++------
 .../test/com/cloud/vm/MockUserVmManagerImpl.java   |    9 ++--
 utils/src/com/cloud/utils/net/NetUtils.java        |   16 +++++++
 10 files changed, 121 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2cbca372/api/src/com/cloud/network/Network.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/Network.java b/api/src/com/cloud/network/Network.java
index 29ba9f3..5019795 100644
--- a/api/src/com/cloud/network/Network.java
+++ b/api/src/com/cloud/network/Network.java
@@ -252,7 +252,33 @@ public interface Network extends ControlledEntity, InternalIdentity,
Identity {
             s_fsm.addTransition(State.Shutdown, Event.OperationFailed, State.Implemented);
         }
     }
-
+    
+    public class IpAddresses {
+    	private String ip4Address;
+    	private String ip6Address;
+    	
+    	public IpAddresses(String ip4Address, String ip6Address) {
+    		this.setIp4Address(ip4Address);
+    		this.setIp6Address(ip6Address);
+    	}
+
+		public String getIp4Address() {
+			return ip4Address;
+		}
+
+		public void setIp4Address(String ip4Address) {
+			this.ip4Address = ip4Address;
+		}
+
+		public String getIp6Address() {
+			return ip6Address;
+		}
+
+		public void setIp6Address(String ip6Address) {
+			this.ip6Address = ip6Address;
+		}
+    }
+    
     String getName();
 
     Mode getMode();

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2cbca372/api/src/com/cloud/vm/UserVmService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/com/cloud/vm/UserVmService.java
index b1ebe10..e1a4143 100755
--- a/api/src/com/cloud/vm/UserVmService.java
+++ b/api/src/com/cloud/vm/UserVmService.java
@@ -46,6 +46,7 @@ import com.cloud.exception.StorageUnavailableException;
 import com.cloud.exception.VirtualMachineMigrationException;
 import com.cloud.host.Host;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.network.Network.IpAddresses;
 import com.cloud.offering.ServiceOffering;
 import com.cloud.storage.StoragePool;
 import com.cloud.storage.Volume;
@@ -197,7 +198,7 @@ public interface UserVmService {
      * @throws InsufficientResourcesException
      */
     UserVm createBasicSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering,
VirtualMachineTemplate template, List<Long> securityGroupIdList, Account owner, String
hostName,
-            String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType
hypervisor, String userData, String sshKeyPair, Map<Long, String> requestedIps, String
defaultIp, String keyboard)
+            String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType
hypervisor, String userData, String sshKeyPair, Map<Long, IpAddresses> requestedIps,
IpAddresses defaultIp, String keyboard)
             throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException,
StorageUnavailableException, ResourceAllocationException;
 
     /**
@@ -244,7 +245,7 @@ public interface UserVmService {
      *            - name of the ssh key pair used to login to the virtual machine
      * @param requestedIps
      *            TODO
-     * @param defaultIp
+     * @param defaultIps
      *            TODO
      * @param accountName
      *            - an optional account for the virtual machine. Must be used with domainId
@@ -262,8 +263,8 @@ public interface UserVmService {
      * @throws InsufficientResourcesException
      */
     UserVm createAdvancedSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering,
VirtualMachineTemplate template, List<Long> networkIdList, List<Long> securityGroupIdList,
-            Account owner, String hostName, String displayName, Long diskOfferingId, Long
diskSize, String group, HypervisorType hypervisor, String userData, String sshKeyPair, Map<Long,
String> requestedIps,
-            String defaultIp, String keyboard)
+            Account owner, String hostName, String displayName, Long diskOfferingId, Long
diskSize, String group, HypervisorType hypervisor, String userData, String sshKeyPair, Map<Long,
IpAddresses> requestedIps,
+            IpAddresses defaultIps, String keyboard)
             throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException,
StorageUnavailableException, ResourceAllocationException;
 
     /**
@@ -308,8 +309,7 @@ public interface UserVmService {
      *            - name of the ssh key pair used to login to the virtual machine
      * @param requestedIps
      *            TODO
-     * @param defaultIp
-     *            TODO
+     * @param defaultIps TODO
      * @param accountName
      *            - an optional account for the virtual machine. Must be used with domainId
      * @param domainId
@@ -326,7 +326,7 @@ public interface UserVmService {
      * @throws InsufficientResourcesException
      */
     UserVm createAdvancedVirtualMachine(DataCenter zone, ServiceOffering serviceOffering,
VirtualMachineTemplate template, List<Long> networkIdList, Account owner, String hostName,
-            String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType
hypervisor, String userData, String sshKeyPair, Map<Long, String> requestedIps, String
defaultIp, String keyboard)
+            String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType
hypervisor, String userData, String sshKeyPair, Map<Long, IpAddresses> requestedIps,
IpAddresses defaultIps, String keyboard)
             throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException,
StorageUnavailableException, ResourceAllocationException;
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2cbca372/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java b/api/src/org/apache/cloudstack/api/ApiConstants.java
index 1787f21..80e382c 100644
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -93,6 +93,7 @@ public class ApiConstants {
     public static final String INTERNAL_DNS2 = "internaldns2";
     public static final String INTERVAL_TYPE = "intervaltype";
     public static final String IP_ADDRESS = "ipaddress";
+    public static final String IP6_ADDRESS = "ip6address";
     public static final String IP_ADDRESS_ID = "ipaddressid";
     public static final String IS_ASYNC = "isasync";
     public static final String IP_AVAILABLE = "ipavailable";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2cbca372/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
index 5300e3c..b3eaed8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
@@ -51,6 +51,7 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.network.IpAddress;
 import com.cloud.network.Network;
+import com.cloud.network.Network.IpAddresses;
 import com.cloud.offering.DiskOffering;
 import com.cloud.offering.ServiceOffering;
 import com.cloud.template.VirtualMachineTemplate;
@@ -148,12 +149,15 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
 
     @Parameter(name = ApiConstants.IP_NETWORK_LIST, type = CommandType.MAP,
             description = "ip to network mapping. Can't be specified with networkIds parameter."
+
-                    " Example: iptonetworklist[0].ip=10.10.10.11&iptonetworklist[0].networkid=uuid
- requests to use ip 10.10.10.11 in network id=uuid")
+                    " Example: iptonetworklist[0].ip=10.10.10.11&iptonetworklist[0].ipv6=fc00:1234:5678::abcd&iptonetworklist[0].networkid=uuid
- requests to use ip 10.10.10.11 in network id=uuid")
     private Map ipToNetworkList;
 
     @Parameter(name=ApiConstants.IP_ADDRESS, type=CommandType.STRING, description="the ip
address for default vm's network")
     private String ipAddress;
 
+    @Parameter(name=ApiConstants.IP6_ADDRESS, type=CommandType.STRING, description="the ipv6
address for default vm's network")
+    private String ip6Address;
+
     @Parameter(name=ApiConstants.KEYBOARD, type=CommandType.STRING, description="an optional
keyboard device type for the virtual machine. valid value can be one of de,de-ch,es,fi,fr,fr-be,fr-ch,is,it,jp,nl-be,no,pt,uk,us")
     private String keyboard;
 
@@ -244,7 +248,7 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
 
     public List<Long> getNetworkIds() {
        if (ipToNetworkList != null) {
-           if (networkIds != null || ipAddress != null) {
+           if (networkIds != null || ipAddress != null || ip6Address != null) {
                throw new InvalidParameterValueException("ipToNetworkMap can't be specified
along with networkIds or ipAddress");
            } else {
                List<Long> networks = new ArrayList<Long>();
@@ -271,13 +275,13 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
         return startVm == null ? true : startVm;
     }
 
-    private Map<Long, String> getIpToNetworkMap() {
-        if ((networkIds != null || ipAddress != null) && ipToNetworkList != null)
{
+    private Map<Long, IpAddresses> getIpToNetworkMap() {
+        if ((networkIds != null || ipAddress != null || ip6Address != null) && ipToNetworkList
!= null) {
             throw new InvalidParameterValueException("NetworkIds and ipAddress can't be specified
along with ipToNetworkMap parameter");
         }
-        LinkedHashMap<Long, String> ipToNetworkMap = null;
+        LinkedHashMap<Long, IpAddresses> ipToNetworkMap = null;
         if (ipToNetworkList != null && !ipToNetworkList.isEmpty()) {
-            ipToNetworkMap = new LinkedHashMap<Long, String>();
+            ipToNetworkMap = new LinkedHashMap<Long, IpAddresses>();
             Collection ipsCollection = ipToNetworkList.values();
             Iterator iter = ipsCollection.iterator();
             while (iter.hasNext()) {
@@ -294,7 +298,9 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
                     }
                 }
                 String requestedIp = (String) ips.get("ip");
-                ipToNetworkMap.put(networkId, requestedIp);
+                String requestedIpv6 = (String) ips.get("ipv6");
+                IpAddresses addrs = new IpAddresses(requestedIp, requestedIpv6);
+                ipToNetworkMap.put(networkId, addrs);
             }
         }
 
@@ -428,23 +434,24 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
             if (getHypervisor() == HypervisorType.BareMetal) {
                 vm = _bareMetalVmService.createVirtualMachine(this);
             } else {
+            	IpAddresses addrs = new IpAddresses(ipAddress, ip6Address);
                 if (zone.getNetworkType() == NetworkType.Basic) {
                     if (getNetworkIds() != null) {
                         throw new InvalidParameterValueException("Can't specify network Ids
in Basic zone");
                     } else {
                         vm = _userVmService.createBasicSecurityGroupVirtualMachine(zone,
serviceOffering, template, getSecurityGroupIdList(), owner, name,
-                                displayName, diskOfferingId, size, group, getHypervisor(),
userData, sshKeyPairName, getIpToNetworkMap(), ipAddress, keyboard);
+                                displayName, diskOfferingId, size, group, getHypervisor(),
userData, sshKeyPairName, getIpToNetworkMap(), addrs, keyboard);
                     }
                 } else {
                     if (zone.isSecurityGroupEnabled())  {
                         vm = _userVmService.createAdvancedSecurityGroupVirtualMachine(zone,
serviceOffering, template, getNetworkIds(), getSecurityGroupIdList(),
-                                owner, name, displayName, diskOfferingId, size, group, getHypervisor(),
userData, sshKeyPairName, getIpToNetworkMap(), ipAddress, keyboard);
+                                owner, name, displayName, diskOfferingId, size, group, getHypervisor(),
userData, sshKeyPairName, getIpToNetworkMap(), addrs, keyboard);
                     } else {
                         if (getSecurityGroupIdList() != null && !getSecurityGroupIdList().isEmpty())
{
                             throw new InvalidParameterValueException("Can't create vm with
security groups; security group feature is not enabled per zone");
                         }
                         vm = _userVmService.createAdvancedVirtualMachine(zone, serviceOffering,
template, getNetworkIds(), owner, name, displayName,
-                                diskOfferingId, size, group, getHypervisor(), userData, sshKeyPairName,
getIpToNetworkMap(), ipAddress, keyboard);
+                                diskOfferingId, size, group, getHypervisor(), userData, sshKeyPairName,
getIpToNetworkMap(), addrs, keyboard);
                     }
                 }
             }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2cbca372/server/src/com/cloud/network/NetworkManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManager.java b/server/src/com/cloud/network/NetworkManager.java
index 7228a83..71ad72a 100755
--- a/server/src/com/cloud/network/NetworkManager.java
+++ b/server/src/com/cloud/network/NetworkManager.java
@@ -329,6 +329,6 @@ public interface NetworkManager  {
     LoadBalancingServiceProvider getLoadBalancingProviderForNetwork(Network network);
 
 	PublicIpv6Address assignPublicIp6Address(long dcId, Long podId, Account owner,
-			VlanType type, Long networkId, String requestedIp, boolean isSystem)
+			VlanType type, Long networkId, String requestedIp6, boolean isSystem)
 			throws InsufficientAddressCapacityException;
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2cbca372/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 705e5f2..cea935e 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -298,17 +298,38 @@ public class NetworkManagerImpl implements NetworkManager, Manager,
Listener {
     }
 
     @Override
-    public PublicIpv6Address assignPublicIp6Address(long dcId, Long podId, Account owner,
VlanType type, Long networkId, String requestedIp, boolean isSystem) throws InsufficientAddressCapacityException
{
+    public PublicIpv6Address assignPublicIp6Address(long dcId, Long podId, Account owner,
VlanType type, Long networkId, String requestedIp6, boolean isSystem) throws InsufficientAddressCapacityException
{
     	Vlan vlan = _networkModel.getVlanForNetwork(networkId);
     	if (vlan == null) {
     		s_logger.debug("Cannot find related vlan or too many vlan attached to network " + networkId);
     		return null;
     	}
-    	String ip = NetUtils.getIp6FromRange(vlan.getIp6Range());
-    	//Check for duplicate IP
-    	if (_ipv6Dao.findByDcIdAndIp(dcId, ip) != null) {
-    		//TODO regenerate ip
-    		throw new CloudRuntimeException("Fail to get unique ipv6 address");
+    	//TODO should check before this point
+    	if (!NetUtils.isIp6InRange(requestedIp6, vlan.getIp6Range())) {
+    		throw new CloudRuntimeException("Requested IPv6 is not in the predefined range!");
+    	}
+    	String ip = null;
+    	if (requestedIp6 == null) {
+    		int count = 0;
+    		while (ip == null || count >= 10) {
+    			ip = NetUtils.getIp6FromRange(vlan.getIp6Range());
+    			//Check for duplicate IP
+    			if (_ipv6Dao.findByDcIdAndIp(dcId, ip) == null) {
+    				break;
+    			} else {
+    				ip = null;
+    			}
+    			count ++;
+    		}
+    		if (ip == null) {
+    			throw new CloudRuntimeException("Fail to get unique ipv6 address after 10 times trying!");
+    		}
+    	} else {
+    		ip = requestedIp6;
+    		//TODO should check before this point
+    		if (_ipv6Dao.findByDcIdAndIp(dcId, ip) != null) {
+    			throw new CloudRuntimeException("The requested IP is already taken!");
+    		}
     	}
     	DataCenterVO dc = _dcDao.findById(dcId);
         Long mac = dc.getMacAddress();

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2cbca372/server/src/com/cloud/network/PublicIpv6AddressVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/PublicIpv6AddressVO.java b/server/src/com/cloud/network/PublicIpv6AddressVO.java
index 7594fc1..e5d00a1 100644
--- a/server/src/com/cloud/network/PublicIpv6AddressVO.java
+++ b/server/src/com/cloud/network/PublicIpv6AddressVO.java
@@ -39,7 +39,6 @@ public class PublicIpv6AddressVO implements PublicIpv6Address {
     @Column(name="id")
     long id;
 
-	@Id
 	@Column(name="ip_address")
 	@Enumerated(value=EnumType.STRING)
 	private String address = null;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2cbca372/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 870eecc..491f8a2 100644
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -59,6 +59,7 @@ import com.cloud.host.dao.HostDao;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.hypervisor.dao.HypervisorCapabilitiesDao;
 import com.cloud.network.*;
+import com.cloud.network.Network.IpAddresses;
 import com.cloud.network.Network.Provider;
 import com.cloud.network.Network.Service;
 import com.cloud.network.Networks.TrafficType;
@@ -1994,7 +1995,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService,
Manager
 
     @Override
     public UserVm createBasicSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering
serviceOffering, VirtualMachineTemplate template, List<Long> securityGroupIdList, Account
owner,
-            String hostName, String displayName, Long diskOfferingId, Long diskSize, String
group, HypervisorType hypervisor, String userData, String sshKeyPair, Map<Long, String>
requestedIps, String defaultIp, String keyboard)
+            String hostName, String displayName, Long diskOfferingId, Long diskSize, String
group, HypervisorType hypervisor, String userData, String sshKeyPair, Map<Long, IpAddresses>
requestedIps, IpAddresses defaultIps, String keyboard)
                     throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException,
StorageUnavailableException, ResourceAllocationException {
 
         Account caller = UserContext.current().getCaller();
@@ -2037,13 +2038,13 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService,
Manager
         }
 
         return createVirtualMachine(zone, serviceOffering, template, hostName, displayName,
owner, diskOfferingId,
-                diskSize, networkList, securityGroupIdList, group, userData, sshKeyPair,
hypervisor, caller, requestedIps, defaultIp, keyboard);
+                diskSize, networkList, securityGroupIdList, group, userData, sshKeyPair,
hypervisor, caller, requestedIps, defaultIps, keyboard);
     }
 
     @Override
     public UserVm createAdvancedSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering
serviceOffering, VirtualMachineTemplate template, List<Long> networkIdList,
             List<Long> securityGroupIdList, Account owner, String hostName, String
displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor,
String userData,
-            String sshKeyPair, Map<Long, String> requestedIps, String defaultIp, String
keyboard) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException,
StorageUnavailableException,
+            String sshKeyPair, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps,
String keyboard) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException,
StorageUnavailableException,
             ResourceAllocationException {
 
         Account caller = UserContext.current().getCaller();
@@ -2142,12 +2143,12 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService,
Manager
         }
 
         return createVirtualMachine(zone, serviceOffering, template, hostName, displayName,
owner, diskOfferingId,
-                diskSize, networkList, securityGroupIdList, group, userData, sshKeyPair,
hypervisor, caller, requestedIps, defaultIp, keyboard);
+                diskSize, networkList, securityGroupIdList, group, userData, sshKeyPair,
hypervisor, caller, requestedIps, defaultIps, keyboard);
     }
 
     @Override
     public UserVm createAdvancedVirtualMachine(DataCenter zone, ServiceOffering serviceOffering,
VirtualMachineTemplate template, List<Long> networkIdList, Account owner, String hostName,
-            String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType
hypervisor, String userData, String sshKeyPair, Map<Long, String> requestedIps, String
defaultIp, String keyboard)
+            String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType
hypervisor, String userData, String sshKeyPair, Map<Long, IpAddresses> requestedIps,
IpAddresses defaultIps, String keyboard)
                     throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException,
StorageUnavailableException, ResourceAllocationException {
 
         Account caller = UserContext.current().getCaller();
@@ -2228,12 +2229,13 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService,
Manager
             }
         }
 
-        return createVirtualMachine(zone, serviceOffering, template, hostName, displayName,
owner, diskOfferingId, diskSize, networkList, null, group, userData, sshKeyPair, hypervisor,
caller, requestedIps, defaultIp, keyboard);
+        return createVirtualMachine(zone, serviceOffering, template, hostName, displayName,
owner, diskOfferingId, diskSize, networkList, null, group, userData, sshKeyPair, hypervisor,
caller, requestedIps, defaultIps, keyboard);
     }
 
     @DB @ActionEvent(eventType = EventTypes.EVENT_VM_CREATE, eventDescription = "deploying
Vm", create = true)
     protected UserVm createVirtualMachine(DataCenter zone, ServiceOffering serviceOffering,
VirtualMachineTemplate template, String hostName, String displayName, Account owner, Long
diskOfferingId,
-            Long diskSize, List<NetworkVO> networkList, List<Long> securityGroupIdList,
String group, String userData, String sshKeyPair, HypervisorType hypervisor, Account caller,
Map<Long, String> requestedIps, String defaultNetworkIp, String keyboard) throws InsufficientCapacityException,
ResourceUnavailableException, ConcurrentOperationException, StorageUnavailableException, ResourceAllocationException
{
+            Long diskSize, List<NetworkVO> networkList, List<Long> securityGroupIdList,
String group, String userData, String sshKeyPair, HypervisorType hypervisor, Account caller,
Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, String keyboard)
+            		throws InsufficientCapacityException, ResourceUnavailableException, ConcurrentOperationException,
StorageUnavailableException, ResourceAllocationException {
 
         _accountMgr.checkAccess(caller, null, true, owner);
 
@@ -2243,7 +2245,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService,
Manager
 
         long accountId = owner.getId();
 
-        assert !(requestedIps != null && defaultNetworkIp != null) : "requestedIp
list and defaultNetworkIp should never be specified together";
+        assert !(requestedIps != null && (defaultIps.getIp4Address() != null || defaultIps.getIp6Address()
!= null)) : "requestedIp list and defaultNetworkIp should never be specified together";
 
         if (Grouping.AllocationState.Disabled == zone.getAllocationState() && !_accountMgr.isRootAdmin(caller.getType()))
{
             throw new PermissionDeniedException("Cannot perform this operation, Zone is currently
disabled: " + zone.getId());
@@ -2367,18 +2369,22 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService,
Manager
                 throw new InvalidParameterValueException("Network id=" + network.getId()
+ " doesn't belong to zone " + zone.getId());
             }
 
-            String requestedIp = null;
+            IpAddresses requestedIpPair = null;
             if (requestedIps != null && !requestedIps.isEmpty()) {
-                requestedIp = requestedIps.get(network.getId());
+                requestedIpPair = requestedIps.get(network.getId());
             }
-
-            NicProfile profile = new NicProfile(requestedIp, null);
+            
+            if (requestedIpPair == null) {
+            	requestedIpPair = new IpAddresses(null, null);
+            }
+            
+            NicProfile profile = new NicProfile(requestedIpPair.getIp4Address(), requestedIpPair.getIp6Address());
 
             if (defaultNetworkNumber == 0) {
                 defaultNetworkNumber++;
                 // if user requested specific ip for default network, add it
-                if (defaultNetworkIp != null) {
-                    profile = new NicProfile(defaultNetworkIp, null);
+                if (defaultIps.getIp4Address() != null || defaultIps.getIp4Address() != null)
{
+                    profile = new NicProfile(defaultIps.getIp4Address(), defaultIps.getIp6Address());
                 }
 
                 profile.setDefaultNic(true);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2cbca372/server/test/com/cloud/vm/MockUserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vm/MockUserVmManagerImpl.java b/server/test/com/cloud/vm/MockUserVmManagerImpl.java
index 27508b1..83fd1f0 100644
--- a/server/test/com/cloud/vm/MockUserVmManagerImpl.java
+++ b/server/test/com/cloud/vm/MockUserVmManagerImpl.java
@@ -58,6 +58,7 @@ import com.cloud.exception.VirtualMachineMigrationException;
 import com.cloud.host.Host;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.network.Network;
+import com.cloud.network.Network.IpAddresses;
 import com.cloud.offering.ServiceOffering;
 import com.cloud.projects.Project.ListProjectResourcesCriteria;
 import com.cloud.server.Criteria;
@@ -351,8 +352,8 @@ public class MockUserVmManagerImpl implements UserVmManager, UserVmService,
Mana
 
     @Override
     public UserVm createBasicSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering
serviceOffering, VirtualMachineTemplate template, List<Long> securityGroupIdList, Account
owner,
-            String hostName, String displayName, Long diskOfferingId, Long diskSize, String
group, HypervisorType hypervisor, String userData, String sshKeyPair, Map<Long, String>
requestedIps,
-            String defaultIp, String keyboard) throws InsufficientCapacityException, ConcurrentOperationException,
ResourceUnavailableException, StorageUnavailableException,
+            String hostName, String displayName, Long diskOfferingId, Long diskSize, String
group, HypervisorType hypervisor, String userData, String sshKeyPair, Map<Long, IpAddresses>
requestedIps,
+            IpAddresses defaultIp, String keyboard) throws InsufficientCapacityException,
ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException,
             ResourceAllocationException {
         // TODO Auto-generated method stub
         return null;
@@ -361,7 +362,7 @@ public class MockUserVmManagerImpl implements UserVmManager, UserVmService,
Mana
     @Override
     public UserVm createAdvancedSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering
serviceOffering, VirtualMachineTemplate template, List<Long> networkIdList,
             List<Long> securityGroupIdList, Account owner, String hostName, String
displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor,
String userData,
-            String sshKeyPair, Map<Long, String> requestedIps, String defaultIp, String
keyboard) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException,
+            String sshKeyPair, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps,
String keyboard) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException,
             StorageUnavailableException, ResourceAllocationException {
         // TODO Auto-generated method stub
         return null;
@@ -369,7 +370,7 @@ public class MockUserVmManagerImpl implements UserVmManager, UserVmService,
Mana
 
     @Override
     public UserVm createAdvancedVirtualMachine(DataCenter zone, ServiceOffering serviceOffering,
VirtualMachineTemplate template, List<Long> networkIdList, Account owner, String hostName,
-            String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType
hypervisor, String userData, String sshKeyPair, Map<Long, String> requestedIps, String
defaultIp,
+            String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType
hypervisor, String userData, String sshKeyPair, Map<Long, IpAddresses> requestedIps,
IpAddresses defaultIps,
             String keyboard) throws InsufficientCapacityException, ConcurrentOperationException,
ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException {
         // TODO Auto-generated method stub
         return null;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2cbca372/utils/src/com/cloud/utils/net/NetUtils.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java
index b81aff6..e3bf707 100755
--- a/utils/src/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -1217,4 +1217,20 @@ public class NetUtils {
     	}
     	return endLow - startLow + 1;
 	}
+
+	public static boolean isIp6InRange(String ip6, String ip6Range) {
+    	String[] ips = ip6Range.split("-");
+    	String startIp = ips[0];
+    	String endIp = null;
+    	if (ips.length > 1) {
+    		endIp = ips[1];
+    	}
+    	IPv6Address start = IPv6Address.fromString(startIp);
+    	IPv6Address end = IPv6Address.fromString(endIp);
+    	IPv6Address ip = IPv6Address.fromString(ip6);
+    	if (start.compareTo(ip) <= 0 && end.compareTo(ip) >= 0) {
+    		return true;
+    	}
+		return false;
+	}
 }


Mime
View raw message