etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,426 Commits 323 Branches 325 Tags 836 MiB
Commit Graph

189 Commits

Author SHA1 Message Date
Alena Prokharchyk 033afe05a9 listRouters: don't list Project routers when projectId is not specified in the call 2011-12-07 12:59:15 -08:00
Abhinandan Prateek d09ed94ebb Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2011-12-04 15:12:48 +05:30
Abhinandan Prateek c4f624e7c9 bug 8313: ldap authentication, still need to fix the MD5 encoded password, cuurent authenticator only works with plaintext password 2011-12-04 15:11:06 +05:30
Alena Prokharchyk a4773b7080 bug 12291: listVms - show non-project resources only if no projectId specified 
status 12291: resolved fixed
 2011-12-02 15:17:50 -08:00
Alena Prokharchyk 9f49967365 fixed listNetworks by projectId 2011-12-01 14:22:59 -08:00
prachi d98130c061 Bug 8750 - update/disable/enableAccount api commands should accept "id" request parameter to be consistent with deleteAcccount command 
These commands now accept 'id' parameter along with the 'accountname' and 'domainid'.
 2011-12-01 13:58:44 -08:00
kishan af0cf90b2b bug 12208,12238: Do not encrypt user password and api key 
status 12208,12238 : resolved fixed
reviewed-by: Abhi
 2011-12-01 23:37:37 +05:30
Alena Prokharchyk dc9efbb46e return only domains in Active state to the API 2011-11-30 13:56:37 -08:00
Alena Prokharchyk abfbac7928 Moved listAccount/listDomains/listDomainChildren methods from ManagementServer to Account/Domain managers 2011-11-28 15:32:12 -08:00
Alena Prokharchyk 102f460458 Fixed updateConfiguration - updateHostDetails used to swallow the exceptions 2011-11-28 11:52:45 -08:00
Abhinandan Prateek 655a9805f3 bug 11966: added findNonDisabledAccount 2011-11-24 13:43:12 +05:30
Abhinandan Prateek 16e342836e bug 11966: chnaged the findActiveAccount method to return only the accounts which are active 2011-11-24 13:12:28 +05:30
frank d6db4a686e Bug 11313 - Add an account param/detail/map in the XXXAccount API calls 
status 11313: resolved fixed
 2011-11-07 14:24:36 -08:00
kishan b1f78bca25 bug 5822, 10783: Use encryption/decryption for queries which use sql directly 
status 5822, 10783: resolved fixed
 2011-11-01 19:30:00 +05:30
kishan 284ee3909e bug 9842: Added task to update user stats agg bytes in sync with aggregation range 
status 9842: resolved fixed
 2011-10-31 17:15:36 +05:30
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
alena eba6864965 bug 11667: drop primary keys in cloud_usage.usage_load_balancer_policy and cloud_usage.usage_port_forwarding 
status 11667: resolved fixed

Conflicts:

	server/src/com/cloud/user/AccountManagerImpl.java
 2011-10-07 11:02:14 -07:00
alena a17570ef51 1)Implemented Suspend/Activate project 
2)Email/token based invitation system
 2011-10-06 16:10:36 -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
alena eda1b53c76 Events for adding/removing project users 2011-09-29 10:20:51 -07:00
alena ccd47c1b21 Implemented Project Invitations 2011-09-26 17:47:20 -07:00
alena 9f9b60a287 1) Added resource limits for the Projects - the same as for the account 
2) Added "Project" limit type for the Domain object
 2011-09-21 17:09:49 -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 bddc2b9e45 bug 11487: catch all exceptions in cleanupAccount, and mark the account for cleanup when the exception is caught. 
status 11487: resolved fixed

Reviewed-by: will@cloud.com
 2011-09-20 10:33:06 -07:00
alena 459b32cc6a bug 11493: no need to do cross domain checks for the templates as domain level templates are not supported. We support only public (everybody can see and use) and private (only owner can see and use unless changed with updateTemplatePermissions call) 
status 11493: resolved fixed

Reviewed-by: will@cloud.com
 2011-09-20 10:31:57 -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
Nitin 20f0707755 bug 11190: My changes got reverted. Putting them back - Treating the max account limits with -1 values as infinite 2011-09-14 19:35:48 +05:30
alena 45c595d558 Don't update resource count for system account 2011-09-13 16:58:54 -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
Nitin 002d0fda5a bug 11190: Treating the max account limits with -1 values as infinite. When acquiring a lock to check for resourceLimitExceeded if the lock times out then return as limit exceeded. 2011-09-12 14:26:15 +05:30
alena 3c0396bb20 bug 10751: don't remove already removed templates during the account cleanup 
status 10751: resolved fixed
 2011-09-02 16:06:55 -07:00
alena d65bef383c Mark account as cleanup_required=0 when cleanup was finished successfully 2011-08-30 14:09:14 -07:00
alena 8f9b929e3f Don't remove the domain when it has accounts that are removed, but require cleanup 2011-08-30 14:09:01 -07:00
alena e3f179844e bug 11236: domainAdmin/regularUser can edit/delete/copy/extract Public template/iso only if it was created by them. They still can use/see public template/iso when execute list/deploy/attachIso commands. Root admin can operate with other people templates w/o any restrictions. 
status 11236: resolved fixed
 2011-08-24 14:48:35 -07:00
alena 8a7feb8ec1 Merge branch '2.2.y' 
Conflicts:
	agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
	api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
	api/src/com/cloud/agent/api/to/FirewallRuleTO.java
	api/src/com/cloud/agent/api/to/IpAddressTO.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
	api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
	api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
	api/src/com/cloud/api/commands/UpdateNetworkCmd.java
	api/src/com/cloud/api/response/CapabilitiesResponse.java
	api/src/com/cloud/network/Network.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/firewall/FirewallService.java
	api/src/com/cloud/network/lb/LoadBalancingRule.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	api/src/com/cloud/network/rules/FirewallRule.java
	api/src/com/cloud/network/rules/RulesService.java
	api/src/com/cloud/offering/NetworkOffering.java
	client/tomcatconf/commands.properties.in
	cloud.spec
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	core/src/com/cloud/vm/DomainRouterVO.java
	debian/cloud-deps.install
	patches/systemvm/debian/config/etc/init.d/cloud-early-config
	patches/systemvm/debian/config/root/ipassoc.sh
	patches/systemvm/debian/config/root/loadbalancer.sh
	scripts/vm/hypervisor/kvm/rundomrpre.sh
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/agent/manager/AgentAttache.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/agent/manager/AgentMonitor.java
	server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
	server/src/com/cloud/alert/ClusterAlertAdapter.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/cluster/ClusterManagerImpl.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/network/LoadBalancerVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDao.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/element/DhcpElement.java
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/FirewallManager.java
	server/src/com/cloud/network/rules/FirewallRuleVO.java
	server/src/com/cloud/network/rules/PortForwardingRuleVO.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/rules/StaticNatRuleImpl.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/server/ConfigurationServerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/StorageManager.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
	server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
	server/src/com/cloud/user/AccountManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDao.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql
	setup/db/db/schema-222to224.sql
	setup/db/db/schema-227to228.sql
	setup/db/db/schema-228to229.sql
	setup/db/db/schema-229to2210.sql
	tools/testClient/README
	ui/scripts/cloud.core.instance.js
	utils/src/com/cloud/utils/SerialVersionUID.java
	utils/src/com/cloud/utils/db/ConnectionConcierge.java
	utils/src/com/cloud/utils/db/Merovingian2.java
	utils/src/com/cloud/utils/db/Transaction.java
	utils/src/com/cloud/utils/nio/Link.java
	utils/src/com/cloud/utils/nio/NioConnection.java
	utils/src/com/cloud/utils/time/InaccurateClock.java
 2011-08-22 20:28:30 -07:00
alena 0afa6f052f bug 11167: no need to lock account when create security group to ensure that the group name is unique for account. If group already exists in the db, and we try to persist it again, mysql constraint (groupName, accountId) will fail and exception will be thrown. 
status 11167: resolved fixed
 2011-08-18 10:16:37 -07:00
alena 0cdb67fdc7 bug 11167: no need to lock account when create security group to ensure that the group name is unique for account. If group already exists in the db, and we try to persist it again, mysql constraint (groupName, accountId) will fail and exception will be thrown. 
status 11167: resolved fixed
 2011-08-18 10:16:20 -07:00
alena 8d47c53735 Revert "bug 10435: removed vpn feature" 
This reverts commit ea9e1b5d138950e8de49fce7ffdbb12a1c72c560.

Conflicts:

	api/src/com/cloud/api/ResponseGenerator.java
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2011-08-02 18:12:57 -07:00
Nitin 63205f1f02 bug 10868: CheckAccess - If the domainId = -1 and the accountId is still valid then try and calculate the domainId. This case will be hit for all the entities which do not have domain id column in the DB table. What was happenning due to this was that we were not checking the domain hierarchy in such case which was leading to security leaks. Example - templates. 2011-07-28 17:11:14 +05:30
Nitin 527a668ca2 bug 10868: CheckAccess - If the domainId = -1 and the accountId is still valid then try and calculate the domainId. This case will be hit for all the entities which do not have domain id column in the DB table. What was happenning due to this was that we were not checking the domain hierarchy in such case which was leading to security leaks. Example - templates. 2011-07-28 17:01:26 +05:30
alena d6112b1632 Revert "bug 10373: Intermediate checkin for Domain level guest Virtual networks" 
This reverts commit e5c25f3868965e36c4bff1c78ca4552a8c852241.

Conflicts:

	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/network/NetworkManagerImpl.java
 2011-07-21 16:04:55 -07:00
alena 36edf298e7 bug 10373: Intermediate checkin for Domain level guest Virtual networks 2011-07-20 13:44:26 -07:00
kishan 6b4c61a348 bug 10382: Move volume delete events to destroyVolume method 
status 10382: resolved fixed
 2011-07-20 11:22:31 +05:30
kishan 427b73a2b9 bug 10372: Added Vm State Machine listener for usage events 
status 10372: resolved fixed
 2011-07-20 11:13:56 +05:30
alena 5be1f94c0d bug 9620: fixed updateUser api to make updates only for the fields that are specified in the request 
status 9620: resolved fixed
 2011-07-19 11:10:52 -07:00
alena 8b100f7c4d bug 10409: added domainSuffix parameters to account/domain objects 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
	server/src/com/cloud/user/AccountManagerImpl.java
	setup/db/db/schema-228to229.sql
 2011-07-19 11:10:52 -07:00
alena ca87603925 Throw correct types of exceptions when fail to create account 2011-07-19 10:33:34 -07:00
kishan 427b70e572 bug 10276: Throw exception for account APIs failure 
status 10276: resolved fixed
 2011-07-19 18:38:54 +05:30
alena 0d84cde633 bug 10409: added domainSuffix parameters to account/domain objects 2011-07-15 14:40:39 -07:00