106 Commits

Author SHA1 Message Date
Kelven Yang
7e9b210d5c bug 6745: Fix problems in Async create commands 2011-11-03 07:34:02 -07:00
anthony
46dac852fa Merge branch 'swift'
Conflicts:
	server/src/com/cloud/agent/AgentManager.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2011-10-31 15:04:48 -07:00
alena
b413a625f4 1) replaced joinProject API with updateProjectInvitation api. You can accept/decline the invitataion with this command
2) Added deleteProjectInviation command. Can be executed by project admin only
2011-10-27 18:32:00 -07:00
frank
9e88c40ab0 clean out various interface from agent manager to decent managers 2011-10-27 16:06:51 -07:00
anthony
4116d0d4e4 Swift : bug fix 2011-10-27 16:04:18 -07:00
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
frank
88b863d6e3 Bug 11522 - New agent manager
Initialize unit test case for resource manager
2011-10-07 15:51:24 -07:00
frank
0f5384d086 Bug 11522 - New agent manager
move findxxx interface from HostDao to Managers
2011-10-06 11:56:17 -07:00
frank
24b82a7a89 Bug 11522 - New agent manager
call SearchCriteriaService interface instead of SearchCriteria2 instance
2011-10-06 10:32:07 -07:00
frank
2b0afe505d Bug 11522 - New agent manager
refine SearchCirteria2
2011-10-05 16:49:47 -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
alena
998568283c Don't allow to add accounts to the domain of type Project
Don't allow to manipulate (delete/update) accounts/domains of type Project
2011-10-05 13:24:25 -07:00
frank
683113cc38 Bug 11522 - New agent manager
get rid of all secondary storage interface from HostDao, instead, put them in
SecondaryStorageVmManager using SearchCriteria2 with decent name
2011-10-03 11:21:34 -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
frank
a1193149a0 Bug 11522 - New agent manager
renamce updateResourceState to resourceStateTransitTo
2011-09-29 11:58:41 -07:00
alena
ccd47c1b21 Implemented Project Invitations 2011-09-26 17:47:20 -07:00
frank
e8c3ff653d Bug 11522 - New agent manager
move maintanenceFailed to ResourceManager
2011-09-23 16:54:28 -07:00
frank
95dbf2ac73 Bug 11522 - New agent manager
move updatePassword to ResourceManager
2011-09-23 15:48:06 -07:00
frank
7c5d3597a9 Bug 11522 - New agent manager
move cancelMaintenanceMode to ResourceManager
2011-09-23 15:32:58 -07:00
Kelven Yang
b06543a8db bug 11531: forget to include newly added JUnit test along with the fix, here it is 2011-09-22 16:22:24 -07:00
alena
a1331d1cfc Intermidiate checkin to Project feature:
1) Introduce new managers - ProjectManager and DomainManager. Moved all domain related code from AccountManager to DomainManager.
2) Moved some code from ManagementServerImpl to the correct managers.
3) New resource limit for Domain - Project
2011-09-20 18:35:28 -07:00
alena
ba64010cb5 bug 11470: 1) fixed listResourceLimits 2) Fixed -1 to be treated as unlimited for all the resources
status 11470: resolved fixed
2011-09-19 09:47:07 -07:00
alena
f6a79c603f bug 11036: resource count update is refactored
status 11036: resolved fixed

1) Use row locks instead of global lock when update resource_count table. When update resource_count for account, make sure that we lock account+all related domains
2) Insert resource_count records for account/domain at the moment when account/domain is created.
3) As a part of DB upgrade, insert missing resource_count records for all non-removed accounts/domains

Conflicts:

	core/src/com/cloud/alert/AlertManager.java
	server/test/com/cloud/agent/MockAgentManagerImpl.java
2011-09-13 10:47:36 -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
frank
b3478c377e Full opensource 2011-08-23 19:52:19 -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
alena
0d84cde633 bug 10409: added domainSuffix parameters to account/domain objects 2011-07-15 14:40:39 -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
alena
158807c877 Fixed unittest 2011-06-06 16:52:11 -07:00
Alex Huang
d9e0bcfa1e bug 10126: Renamed getPodId() to getPodIdToDeployIn() 2011-06-03 22:17:08 -07:00
Alex Huang
8754f8fab8 bug 9651: checked in missing files 2011-05-31 10:27:50 -07:00
alena
5148725916 Fixed bunch of db upgrade bugs. 2011-05-18 17:38:49 -07:00
alena
b963429063 Added upgrade from 224 to 225
Conflicts:

	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
2011-05-17 16:43:53 -07:00
Alex Huang
ea9703997b proxy agent 2011-05-17 07:12:58 -07:00
Alex Huang
eb4fd2fb53 Database upgrade from 2.2.2 to 2.2.4 was broken. 2011-05-16 16:32:08 -07:00
Kelven Yang
824f0586f7 Add manager context to CleanupMaid to allow management service access in cleanup() method 2011-05-02 18:28:38 -07:00
alena
11ef6bbbe2 bug 9638: fixed bunch of DB upgrade bugs
status 9638: resolved fixed

Conflicts:

	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	utils/src/com/cloud/utils/net/NetUtils.java
2011-04-28 18:30:40 -07:00
Kelven Yang
814fe02c59 Recalculate and update host used capacity (mem & cpu) in upgrade (2.1.x to 2.2.y)
Conflicts:

	server/src/com/cloud/upgrade/dao/Upgrade218to22.java
2011-04-28 10:11:01 -07:00