Commit Graph

676 Commits

Author SHA1 Message Date
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
frank 0c0fe8c1b3 Bug 8966 - Oracle VM (OVM) support
configure hostname of host for OCFS2
small fixes
2011-08-31 17:25:04 -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 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
Edison Su 9a6fc7de45 bug 11217: add secondary storage id into snapshot, if it's an empty snapshot
status 11217: resolved fixed
2011-08-24 11:05:45 -07:00
Edison Su 9a65935809 bug 11217: add secondary storage id into snapshot, if it's an empty snapshot
status 11217: resolved fixed
2011-08-24 10:48:10 -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
anthony 7084c270d3 reversed funtion parameter 2011-08-19 18:48:49 -07:00
anthony 2e2e550cc4 reversed funtion parameter 2011-08-19 18:41:59 -07:00
frank 32ee2dbe2c Remove baremetal specific parameters from AddHostCmd 2011-08-19 17:12:23 -07:00
frank 016700737c Bug 8966 - Oracle VM (OVM) support
OCFS2 support -- reconfigure OCFS2 nodes when delete host
2011-08-19 17:06:48 -07:00
frank 7350d12fff Bug 8966 - Oracle VM (OVM) support
OCFS2 support -- use cluster name as OCFS2 cluster name
2011-08-19 17:06:35 -07:00
frank 18f87c2108 Merge branch 'cvm' into 2.2.y
Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/listener/StoragePoolMonitor.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java
2011-08-19 16:08:35 -07:00
Edison Su eada883b5e bug 11183: put volume state into "Creating" state if it's created from snapshot.
status 11183: resolved fixed
2011-08-19 13:46:51 -07:00
Edison Su 8bbed3caea bug 11183: put volume state into "Creating" state if it's created from snapshot.
status 11183: resolved fixed
2011-08-19 13:45:35 -07:00
alena 2c1df02ba1 Removed unused imports 2011-08-18 15:02:04 -07:00
Edison Su df6bee4061 add template for simulator 2011-08-18 11:37:50 -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
Edison Su 48342ff6e2 remove unnecessary transcation 2011-08-16 10:30:52 -07:00
Edison Su 0be1510496 add template for simulator 2011-08-16 10:30:51 -07:00
Murali Reddy 0969ba8063 bug 10923: changes for snapshot command to carry primary storage pool path 2011-08-12 17:45:02 +05:30
Murali Reddy cc60989a68 bug 10923: changes for snapshot command to carry primary storage pool path 2011-08-12 17:43:18 +05:30
Nitin 5ef0c96e70 bug 11096: ExtractTemplate - For private template choose the correct sec storage host id since its not present in all the sec storage now. 2011-08-12 14:30:34 +05:30
Nitin f1d13729af bug 11096: ExtractTemplate - For private template choose the correct sec storage host id since its not present in all the sec storage now. 2011-08-12 12:21:02 +05:30
Nitin 93204ae862 bug 4957: copyTemplate: should compare template_host_ref.size to configuration.max.template.iso.size values before sending command to the backend .
status 4957: resolved fixed
2011-08-10 18:18:35 +05:30
alena 6b9603bc4c bug 10561: intermidiate checkin for FirewallRuleFeature
1) Added new apis: createFirewallRule, deleteFirewallRule, listFirewallRules
2) Modified existing apis - added boolean openFirewall parameter to createPortForwardingRule/createIpForwardingRule/createRemoteAccessVpn. If parameter is set to true, open firewall on the domR before creating an actual PF rule there
Modified backend calls appropriately.
3) Schema changes for firewall_rules table:
* startPort/endPort can be null now
* added icmp_type, icmp_code fields (can be not null only when protocol is icmp)
4) Added new manager - FirewallManagerImpl

Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
2011-08-09 15:51:56 -07:00
frank 433fe1c9da Bug 8966 - Oracle VM (OVM) support
OCFS2 support -- reconfigure OCFS2 nodes when delete host
2011-08-09 14:06:51 -07:00
Kelven Yang eb28549e6c Seperate template cleanup control to enable template preloading 2011-08-09 13:42:50 -07:00
Kelven Yang fe9ccf33b5 Seperate template cleanup control to enable template preloading 2011-08-09 13:38:27 -07:00
alena 06d007337a bug 10561: intermidiate checkin for FirewallRuleFeature
1) Added new apis: createFirewallRule, deleteFirewallRule, listFirewallRules
2) Modified existing apis - added boolean openFirewall parameter to createPortForwardingRule/createIpForwardingRule/createRemoteAccessVpn. If parameter is set to true, open firewall on the domR before creating an actual PF rule there
Modified backend calls appropriately.
3) Schema changes for firewall_rules table:
* startPort/endPort can be null now
* added icmp_type, icmp_code fields (can be not null only when protocol is icmp)
4) Added new manager - FirewallManagerImpl
2011-08-08 20:59:40 -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
frank 7e1fc2ca1a Bug 8966 - Oracle VM (OVM) support
OCFS2 support -- use cluster name as OCFS2 cluster name
2011-08-08 18:22:43 -07:00
frank e8c2fa4e8e Remove baremetal specific parameters from AddHostCmd 2011-08-08 15:01:26 -07:00
frank 6aaf3d5ae0 Merge branch 'cvm'
Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/storage/Storage.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java
2011-08-08 14:14:09 -07:00
frank c89425325b Bug 8966 - Oracle VM (OVM) support
OCFS2 support -- add files
2011-08-08 13:32:27 -07:00
frank c881bae64e Bug 8966 - Oracle VM (OVM) support
OCFS2 support -- use ComponentLocater to load OCFS2 manager
2011-08-08 13:30:15 -07:00
frank c6fba0fd42 Bug 8966 - Oracle VM (OVM) support
OCFS2 support -- prepare OCFS2 nodes
2011-08-05 17:46:29 -07:00
anthony 5fbd0a7a5f bug 9255: do NOT allow creating snapshot/snapshotpolicy against System VM volume
status 9255: resolved fixed
2011-08-04 15:32:45 -07:00
anthony 3272241440 bug 9255: do NOT allow creating snapshot/snapshotpolicy against System VM volume
status 9255: resolved fixed
2011-08-04 15:28:38 -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
Nitin 09c26e5671 bug 10775: copyTemplate - Compute checksum at source from now on because the checksum might be referring to the compressed template. Send this checksum for comparison. 2011-08-02 20:30:10 +05:30
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
Edison Su 595f9250b7 clean up public ip in secondary_storage_vm table after ssvm expunged 2011-07-29 15:30:32 -07:00
Edison Su b9ab17bbf5 clean up public ip in secondary_storage_vm table after ssvm expunged 2011-07-29 15:28:16 -07:00