Commit Graph

19 Commits

Author SHA1 Message Date
frank cef30956e9 Merge branch 'newagentmgr'
Conflicts:
	agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
	ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/F5BigIpManagerImpl.java
	server/src/com/cloud/network/JuniperSrxManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/db/GenericDao.java
2011-10-27 11:09:56 -07:00
alena 25c2734e03 More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project 2011-10-05 13:24:25 -07:00
frank 3947c9a126 Bug 11522 - New agent manager
Initailize SearchCriteria2 in order to replace search interface of DAO
2011-10-03 10:32:27 -07:00
Chiradeep Vittal 9b424a762d fix compilation of mocks 2011-09-13 09:22:52 -07:00
Chiradeep Vittal 3cb4ad4934 Add more detail when unable to schedule cleanup
clean up tests for security group manager v2

move interval to listener -- allows it to be configurable if needed

fix mocks

Enhanced logging for security group manager (from zucchini)

fix merge issues

merge issues
2011-09-12 18:22:55 -07:00
Chiradeep Vittal 7e2c2c627f unit test for SG mgr v2 2011-09-12 18:20:22 -07:00
Chiradeep Vittal 4cd6a9217c Use hashset since it is 50% faster. we can use treeset when we support priority 2011-09-12 18:20:22 -07:00
Chiradeep Vittal 2fc782b8ba Add basic Mocks for some managers 2011-09-12 18:20:22 -07:00
Chiradeep Vittal abf4754503 New security group mgr WIP : memory based queueing 2011-09-12 18:20:22 -07:00
Chiradeep Vittal ec7c9a2f7e bug 10998: maintain lb id in map table
status 10998: resolved fixed
2011-08-05 17:37:11 -07:00
Chiradeep Vittal 0c408d8da5 handle elb vm restart 2011-08-04 22:05:48 -07:00
Chiradeep Vittal e5c4bf4e28 bug 10659: manage elb vms independently of virtualnetworkappliance. 2011-08-03 18:55:01 -07:00
Chiradeep Vittal fae6fa790c ELB VM: implement delete LB by deleting ELB vm
in the future we will manage a pool of vms more intelligently
2011-07-28 00:15:16 -07:00
Chiradeep Vittal b829cde18f track ip to vm mapping 2011-07-27 12:00:08 -07:00
Alex Huang 2cda9a91e6 bug 9651: missing changes 2011-06-14 11:11:24 -07:00
Alex Huang 9c72759007 bug 9651: update network working now 2011-06-09 11:54:47 -07:00
Alex Huang 575ac62926 bug 9651: propagating 3fd50fd8634958727f4c64c9d1fb7fa27e07e4c8 2011-06-08 15:58:01 -07:00
alena 8948c3dd84 1) listNetworks for domain level network case: fixed search to do multiple joins between the tables instead of querying all the data and making search for each entry.
2) Added new config parameter 'allow.subdomain.network.access' - default value is true. If it's set to false, the child domain can't use the network of the parent domain

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
2011-06-08 12:00:19 -07:00
Alex Huang 8754f8fab8 bug 9651: checked in missing files 2011-05-31 10:27:50 -07:00