apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 10:32:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,492 Commits 312 Branches 325 Tags
Commit Graph

343 Commits

Author SHA1 Message Date
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
alena
21afc889d0 bug 10438: always return success on disableAccount when it got disabled successfully in the DB. If his vms failed to stop on the backend, mark account for cleanup and let background thread to do the cleanup job 
status 10438: resolved fixed
 2011-07-15 14:27:58 -07:00
alena
f76a5e0043 Throw correct types of exceptions when fail to create account 2011-07-13 18:25:13 -07:00
kishan
59399966c2 bug 7127: Added action event for lock user 
status 7127: resolved fixed
 2011-07-12 14:56:23 +05:30
alena
50dce6d5a0 bug 10438: always return success on disableAccount when it got disabled successfully in the DB. If his vms failed to stop on the backend, mark account for cleanup and let background thread to do the cleanup job 
status 10438: resolved fixed
 2011-07-11 17:45:50 -07:00
alena
73574ebf5b Do regular vm stop (not forced=true) when disableAccount 2011-07-11 17:35:35 -07:00
alena
67f76b5192 Do regular vm stop (not forced=true) when disableAccount 2011-07-11 17:35:22 -07:00
kishan
8069a45a26 bug 10276: Throw exception for account APIs failure 
status 10276: resolved fixed
 2011-07-11 14:09:38 +05:30
Edison Su
492bf2371c bug 10092: fix the Long compare 
status 10092: resolved fixed
 2011-07-08 13:32:54 -07:00
alena
9be9a970c9 bug 10409: added domainSuffix parameters to account/domain objects 2011-07-06 16:57:19 -07:00
kishan
561f415d5a bug 10382: Move volume delete events to destroyVolume method 
status 10382: resolved fixed
 2011-07-06 18:08:48 +05:30
alena
17f785f07a Intermidiate checkin for Projects feature; added 3 new apis - create/delete/listProject(s) - as a part of checkin 2011-07-01 13:19:12 -07:00
kishan
36d7ee5634 bug 10372: Added Vm State Machine listener for usage events 
status 10372: resolved fixed
 2011-07-01 16:37:53 +05:30
alena
74f34a0e0c bug 10435: removed vpn feature 
status 10435: resolved fixed
 2011-06-24 09:18:46 -07:00
Edison Su
54a4af2a0c bug 10092: fix the Long compare 
status 10092: resolved fixed
 2011-06-21 14:33:43 -04:00
alena
1f087371e0 bug 9620: fixed updateUser api to make updates only for the fields that are specified in the request 
status 9620: resolved fixed
 2011-06-20 11:48:32 -07:00
alena
cad16ed27f bug 10325: renamed apiKey/secretKey to userApiKey/userSecretKey in updateUser api call 
This reverts commit 927508215de383bdcc5b2e289e5103e011d72843.
 2011-06-16 11:49:40 -07:00
alena
57e4af6fd5 bug 10325: renamed apiKey/secretKey to userApiKey/userSecretKey in updateUser api call 
This reverts commit 927508215de383bdcc5b2e289e5103e011d72843.
 2011-06-16 11:47:54 -07:00
Murali Reddy
00bd79ffee bug 9419: implement api to reset resource count 
adding couple of fixes
 2011-06-16 19:01:03 +05:30
Murali Reddy
c7e347e9a4 bug 9419: implement api to reset resource count 2011-06-16 19:00:42 +05:30
Murali Reddy
aa4f654929 bug 9419: implement api to reset resource count 
added a command to reset resource count for account/domain based on real usage of resources
 2011-06-16 18:59:38 +05:30
Murali Reddy
7ce2f0362f bug 9419: implement api to reset resource count 
adding couple of fixes
 2011-06-16 17:38:20 +05:30
alena
695041ad27 Fixed the bug in updateUser api - api/secretKey update didn't work correctly when request was signed using apiKey 2011-06-15 15:04:59 -07:00
alena
cab765f85e Fixed the bug in updateUser api - api/secretKey update didn't work correctly when request was signed using apiKey 2011-06-15 15:02:07 -07:00
Murali Reddy
b625bb1d27 bug 9419: implement api to reset resource count 2011-06-13 16:32:26 +05:30
Murali Reddy
6310991bdc bug 9419: implement api to reset resource count 
added a command to reset resource count for account/domain based on real usage of resources
 2011-06-13 10:55:57 +05:30
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
f81ddc1f7b 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
 2011-06-08 11:55:36 -07:00
will
5913c5a441 Added an acknowledge process for the registration complete process of cloudzones. Only after a expires=true will the token be truly expired. 2011-06-06 11:47:59 -07:00
Alex Huang
d9e0bcfa1e bug 10126: Renamed getPodId() to getPodIdToDeployIn() 2011-06-03 22:17:08 -07:00
Murali Reddy
6de2bef7cd bug 9973: listReourceLimits A domain-admin of domain X can view Resource Limits from other domain 
adding additional checks, and moving old code to access checkers
status 9973: resolved fixed
 2011-05-31 14:00:27 +05:30
will
fef2c58996 bug 9982: Ensuring that the registration token is used only once. 2011-05-25 16:06:49 -07:00