etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,208 Commits 332 Branches 325 Tags 874 MiB
Commit Graph

98 Commits

Author SHA1 Message Date
Chiradeep Vittal cfbbe4c031 fix perf. issue in deploy vm. also remove dead code in dao 2011-09-12 18:20:23 -07:00
alena 8b5f2c758e Do account permission checks for snapshots the way it's done for all other ControlledEntities 2011-08-31 18:15:08 -07:00
alena 482528ce8c Fixed the bug in extractTemplate - do ignoreCase comparison when verify the download mode. 2011-08-26 10:11:30 -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
Edison Su 1bc7631bf2 finally, test framework works now 2011-08-18 10:51:31 -07:00
Edison Su 449a12870b finally, test framework works now 2011-08-16 10:30:52 -07:00
anthony 455f9f642c bug 11014: 
1. if there is no storage pool, don't try to start system VM
2. not use "consoleproxy.restart" as other meaning

status 11014: resolved fixed
 2011-08-08 18:31:14 -07:00
anthony 1a070f4c1b bug 11014: 
1. if there is no storage pool, don't try to start system VM
2. not use "consoleproxy.restart" as other meaning

status 11014: resolved fixed
 2011-08-08 18:28:34 -07:00
Nitin a3cb6d9a09 bug 9345: Remove pool_id from template_host_ref. Its not needed anymore. Also removed the unwarranted code. 
status 9345: resolved fixed
 2011-08-04 12:51:35 +05:30
alena 9ad41d9fc8 bug 10916: don't return removed entries when do listDiskOfferings by regular user 
status 10916: resolved fixed
 2011-08-02 09:46:35 -07:00
alena bdb44c6850 bug 10916: don't return removed entries when do listDiskOfferings by regular user 
status 10916: resolved fixed
 2011-08-02 09:46:17 -07:00
nit b7f16b8b34 bug 9860 : listIsos - make the parameter - name work properly. 
status 9860: resolved fixed
 2011-08-01 15:14:35 +05:30
anthony ccc3c79466 private template may be downloaded to multiple secondary storage in a zone, 
fixed it
 2011-07-29 17:36:58 -07:00
anthony 50a2fc7111 private template may be downloaded to multiple secondary storage in a zone, 
fixed it
 2011-07-29 17:34:55 -07:00
anthony e666cf5e77 bug 10743: default local storage is ext in XenServer 6.0, add ext local storage support 2011-07-21 17:31:43 -07:00
alena c48c3edfbc bug 10271: don't include removed records when search for local storage pool 
status 10217: resolved fixed
 2011-07-19 11:10:53 -07:00
alena 84edb80c0c bug 10687: respect "bootable" parameter when listIso 
status 10687: resolved fixed
 2011-07-15 14:28:53 -07:00
alena 1979d1d065 bug 10681: for serviceOfferings, diskOfferings, templates/isos return records with not null Removed field on findById method call 
status 10681: resolved fixed

Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.java
 2011-07-13 18:25:13 -07:00
alena 25206e6257 bug 10681: for serviceOfferings, diskOfferings, templates/isos return records with not null Removed field on findById method call 
status 10681: resolved fixed
 2011-07-13 17:16:07 -07:00
alena 738811305b bug 10687: respect "bootable" parameter when listIso 
status 10687: resolved fixed
 2011-07-11 18:06:39 -07:00
Edison Su a24eef5c81 add new option to force destroy vm when delete host, if the VMs are created on local storage 2011-07-08 13:49:05 -07:00
anthony c0f22970d3 per angie, Below sequence doesn't work 
1. copy template1 from z1 to z2
2. remove template1 from z2
3. copy tempalte1 from z1 to z2 again,
4. template1 for z2 doesn't show up in MyTemplate

fixed
 2011-07-01 16:19:38 -07:00
anthony 09562e771c per angie, Below sequence doesn't work 
1. copy template1 from z1 to z2
2. remove template1 from z2
3. copy tempalte1 from z1 to z2 again,
4. template1 for z2 doesn't show up in MyTemplate

fixed
 2011-07-01 16:17:18 -07:00
anthony 494f29702b fixed list featured template 2011-07-01 16:09:18 -07:00
anthony 010858da0d fixed list featured template 2011-07-01 16:08:17 -07:00
alena 9b54b8761a bug 10538: avoid duplicated config values insertion when multiple management servers start at the same time 
status 10538: resolved fixed
 2011-06-30 18:26:52 -07:00
alena e0c74004f1 bug 10538: avoid duplicated config values insertion when multiple management servers start at the same time 
status 10538: resolved fixed
 2011-06-30 18:24:28 -07:00
anthony 2fb5de8852 fixed several template issues 
merge createtemplateresponse and createteisoresponse

on UI template
only show template corresponding hypervisor exists

Conflicts:

	api/src/com/cloud/api/ResponseGenerator.java
	server/src/com/cloud/storage/StorageManager.java
 2011-06-29 18:31:13 -07:00
anthony 446d08187b fixed several template issues 
merge createtemplateresponse and createteisoresponse

on UI template
only show template corresponding hypervisor exists
 2011-06-29 15:56:01 -07:00
Edison Su 28f0068151 add new option to force destroy vm when delete host, if the VMs are created on local storage 2011-06-23 20:36:13 -04:00
Murali Reddy c9dbda493a Bug 10174 - Should not return public and featured templates for accounts that do not have access to their respective zones 
pushing 2.2.8 fix to master
 2011-06-21 19:50:48 +05:30
Murali Reddy 83ee4e653c Bug 10174 - Should not return public and featured templates for accounts that do not have access to their respective zones 
status 10174: resolved fixed
 2011-06-21 19:20:25 +05:30
alena fc28a332c5 bug 10271: don't include removed records when search for local storage pool 
status 10217: resolved fixed
 2011-06-16 16:00:45 -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
nit 197dc6cf6e registerIso - remove hardcoding of GuestosId when its None. Retrieve it from DB. 2011-06-13 19:04:27 +05:30
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
nit 8a4e060dc9 bug 9860 : listIsos - make the parameter - name work properly. 
status 9860: resolved fixed
 2011-06-09 14:29:55 +05:30
Edison Su 36fa0fbf52 bug 10177: fix multiple local secondary storage: when we starting vm, only choose the local secondary storage that related to the planned computing host 
status 10177: resolved, fixed
 2011-06-08 11:14:59 -04:00
Edison Su 00268632ac bug 10177: fix multiple local secondary storage: when we starting vm, only choose the local secondary storage that related to the planned computing host 
status 10177: resolved, fixed
 2011-06-07 20:22:16 -04:00
Edison Su 0d064c46b4 listemplate should only list templates that owned by caller 2011-06-07 14:20:23 -04:00
Edison Su 4529e1c615 Revert "listemplate should only list templates that owned by caller" 
This reverts commit df1ba3b3f437644c5e565676c1d617b90bb28072.
 2011-06-07 13:41:49 -04:00
Edison Su 6540154420 listemplate should only list templates that owned by caller 2011-06-07 12:33:11 -04:00
nit 679159ccf4 bug 9922 : My ISOs shouldnt list Featured ISOs when the user is not the owner of those isos. 
status 9922: resolved fixed
 2011-06-07 12:22:49 +05:30
Edison Su f7414b83aa fix listtempalte and listiso, if there are multiple secondary storage 2011-06-01 16:01:51 -04:00
anthony fed7d1ebdb delete secondary storage, 
1. check if there are snapshotsin this secondary storage, if yes , fails
2. check if there are private templatesin this secondary storage , if yes, fails
 2011-05-31 17:57:10 -07:00
Alex Huang 0ab12edd6c network tagging changes 2011-05-31 09:49:27 -07:00