cloudstack/api/src/com/cloud
Alena Prokharchyk 810151586b 1) Allow having multiple shared networks with the same vlan
2) Added new parameter to listNetworks command - canUseForDeploy(boolean). When true, list only networks that can be used for vm deployment (networks have enough ip addresses to allocate from for the vm)

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
2012-06-15 16:47:13 -07:00
..
acl committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
agent/api committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
alert committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
api 1) Allow having multiple shared networks with the same vlan 2012-06-15 16:47:13 -07:00
async committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
capacity committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
cluster committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
configuration committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
consoleproxy committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
dao committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
dc committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
deploy committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
domain committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
event committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
exception committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
host committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
hypervisor committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
network 1) Allow having multiple shared networks with the same vlan 2012-06-15 16:47:13 -07:00
offering committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
org committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
projects committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
resource committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
serializer committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
server committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
storage committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
template committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
user committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
uservm committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
vm committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00