etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,574 Commits 330 Branches 325 Tags 854 MiB
Commit Graph

172 Commits

Author SHA1 Message Date
Kelven Yang 9ace681547 bug 11162: merge fix from 2.2.10 premium 2011-08-25 15:38:43 -07:00
frank b3478c377e Full opensource 2011-08-23 19:52:19 -07:00
Kelven Yang 4f8a52f94c Move VMware/Premium Secondary storage VM to opensource 2011-08-23 14:43:39 -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
frank 32ee2dbe2c Remove baremetal specific parameters from AddHostCmd 2011-08-19 17:12:23 -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
anthony e5e85d05e9 bug 10695: add XCP 1.0 support 
status 10695: resolved fixed

Conflicts:

	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
 2011-08-09 19:51:32 -07:00
anthony 33b3e02c17 bug 10695: add XCP 1.0 support 
status 10695: resolved fixed
 2011-08-09 19:49:12 -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 c6fba0fd42 Bug 8966 - Oracle VM (OVM) support 
OCFS2 support -- prepare OCFS2 nodes
 2011-08-05 17:46:29 -07:00
Kelven Yang d10c8e2a1d bug 10765: fix step 2 - programming VNC server to let it chose the right keyboard mapping to load into 2011-08-04 18:30:50 -07:00
Kelven Yang 19567df49b bug 10765: fix step 2 - programming VNC server to let it chose the right keyboard mapping to load into 2011-08-04 18:27:45 -07:00
anthony bba811a714 Bug 10197: 
1. don't try HA vms if host hypervisor version changes
    2. fixed a bug related to VM full sync with hosttrack enabled
 2011-08-02 17:29:16 -07:00
anthony 5f9884d97a Bug 10197: 
1. don't try HA vms if host hypervisor version changes
    2. fixed a bug related to VM full sync with hosttrack enabled
 2011-08-02 16:48:27 -07:00
anthony 055e5c82c7 bug 9997: 
put copy scripts in SetupCommand,
1. initiate returns host version,
2. if it doesn't match with DB, update DB, and reconnect the host.

status 9997: resolved fixed
 2011-07-29 10:45:11 -07:00
anthony 9f2eaca6cb Support XenServer 6.0 beta 2011-07-20 16:47:48 -07:00
anthony 811063f769 bug 10197: enable trackVmHostChange for XenServer 2011-07-19 15:53:41 -07:00
anthony 20cbe7e739 bug 10197: enable trackVmHostChange for XenServer 2011-07-19 15:52:45 -07:00
alena 18dc85c765 Pass isForRebalance parameter to processConnect method of all the listeners - some listeners don't have to be notified when connection happens as a a part of Agent Rebalance process (VirtualMachineManagerImpl listener for instance) 2011-06-27 10:37:00 -07:00
alena 826f5eedf1 bug 10447: don't notify VirtualMachineManager listener when do host rebalance - vm sync is not needed in this case. 
status 10447: resolved fixed
 2011-06-27 10:37:00 -07:00
alena 41f12eb642 Pass isForRebalance parameter to processConnect method of all the listeners - some listeners don't have to be notified when connection happens as a a part of Agent Rebalance process (VirtualMachineManagerImpl listener for instance) 2011-06-27 10:20:41 -07:00
alena 0bf34f3612 bug 10447: don't notify VirtualMachineManager listener when do host rebalance - vm sync is not needed in this case. 
status 10447: resolved fixed
 2011-06-27 10:20:40 -07:00
Kelven Yang 2a6307f272 1) Remove customer field applied to virtual machine in VMware. 2) always track VM host change in VMware regardless whether or not native HA is enabled 2011-06-16 16:22:11 -07:00
Kelven Yang 464d793754 1) Remove customer field applied to virtual machine in VMware. 2) always track VM host change in VMware regardless whether or not native HA is enabled 2011-06-15 18:37:38 -07:00
anthony e91e0b4174 bug 9997: 
put copy scripts in SetupCommand,
1. initiate returns host version,
2. if it doesn't match with DB, update DB, and reconnect the host.

status 9997: resolved fixed
 2011-06-13 16:45:13 -07:00
Frank 5f5509ac00 use isHvm of template to decide to boot a HVM vm 2011-06-10 14:35:46 -07:00
anthony fd2ec19438 bug 9351: xen.max.product.version is not used, remove them 
status 9351: resolved fixed
 2011-06-07 14:45:53 -07:00
anthony f0352fc2ed bug 9351: xen.max.product.version is not used, remove them 
status 9351: resolved fixed
 2011-06-07 14:43:16 -07:00
anthony 416efeb59a bug 10152: supoort XenServer 5.6 service pack 2 
status 10152: resolved fixed
 2011-06-07 10:39:57 -07:00
Alex Huang 0dfc44582b bug 9651: Adding network tags 
Also changes in Request logging.
 2011-05-23 15:51:50 -07:00
Abhinandan Prateek d161337710 bug 6451: host username/password should be changable through API 
Password is queued, on error next password is used.
 2011-05-16 12:08:05 +05:30
Edison Su 47380dc20e fix add host 2011-05-12 15:03:15 -04:00
Edison Su 8368355b31 add cluster guid 2011-05-11 11:26:50 -04:00
Edison Su b33a180001 add kvm script is changed 2011-05-11 11:24:59 -04:00
Chiradeep Vittal 303e2a7481 Start of zonesfeature / mycloud/cloudkit 2011-05-03 10:40:17 -07:00
Murali Reddy c12ccbd06f Bug 9534 : implement CPU cap 
Introducing new boolean flag in service offering to restrict the user VM's CPU utilization to what service offering it is entitled for.
 2011-04-27 13:54:45 +05:30
nit 49bb7dba00 bug 9013: Adding hypercisor type for xs-tools.iso when inserting it into vm_template. 
status 9013: resolved fixed
 2011-04-25 17:03:57 +05:30
Abhinandan Prateek efa0417881 bug 5242: adding a host does not return useful error 
status 5242: closed fixed
 2011-04-15 17:28:46 +05:30
Frank 92155522f2 Add license header to files 2011-04-14 11:23:14 -07:00
anthony 545aa50388 bug 9282: set cluster guid if it is null 
status 9282: resolved fixed
 2011-04-04 14:33:18 -07:00
Kelven Yang 1c9196f9af add vncPassword on hypervisor back 2011-03-23 16:18:22 -07:00
Frank 6c819c1491 Merge branch 'bareMetal' 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/commands/DeployVMCmd.java
	api/src/com/cloud/offering/ServiceOffering.java
	api/src/com/cloud/vm/UserVmService.java
	client/tomcatconf/components.xml.in
	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/service/ServiceOfferingVO.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
 2011-03-08 14:18:11 -08:00
Chiradeep Vittal 8ee2e311f1 bug 8380: use instance name 2011-03-01 14:07:30 -08:00
Chiradeep Vittal ae1dc136c0 bug 8380: use instance name 2011-03-01 14:07:30 -08:00
Chiradeep Vittal 697b4f60db bug 8380: use instance name status 8380: resolved fixed 2011-03-01 14:07:30 -08:00
Edison Su 2705adb3b1 security group is per bridge 2011-02-28 12:16:40 -05:00
Frank a9728998ff Bug 8208 - bare metal provisioning 
Successfully add start entry into LinMin PXE server
 2011-02-25 18:58:07 -08:00
Frank 5035778b1a Bug 8208 - bare metal provisioning 
StartCommand cloud reach to BareMetalResrouce
 2011-02-24 19:22:34 -08:00
Kelven Yang 0cd0703c81 Bug 8717: Move VMwareGuru to premium 2011-02-23 16:10:21 -08:00
Kelven Yang 2f3a1ccd60 When secondary storage is not running inside SSVM, let FOSS SecondaryStorageDiscoverer be able to dynamically load premium version of the secondary storage resource 2011-02-22 15:39:22 -08:00
Kelven Yang 8695e7250c Update template and storage manager to allow hypervisor based command delegation 2011-02-18 11:37:50 -08:00
anthony 6501bcd3c4 bug 8518: replytimeout is not set 
replytimeout is set to 10 min for XenServer

status 8518: resolved fixed
 2011-02-10 18:59:42 -08:00
Alex Huang 0105c03a27 initial HA work 2011-02-04 11:51:14 -08:00
anthony 76ad02d2fa cleanup XenServer code 2011-01-28 18:47:37 -08:00
Frank e9652e67ad migrate premium to oss 2011-01-28 16:07:46 -08:00
anthony cb024e3bf2 remove prealloclun 2011-01-28 12:46:50 -08:00
Kelven Yang 4696b16d10 Normalize name convention for vmware hypervisor 2011-01-28 11:16:30 -08:00
alena 671cce23ad bug 7704: network_rate is a part of network offering now. It's optional parameter; if not specified - global config param is used. 
status 7704: resolved fixed
 2011-01-21 09:54:27 -08:00
anthony 017146f753 1 use 443 to connect xapi 
2. update Java binding to xenserver-5.6.100-1.jar
 2011-01-18 20:15:39 -08:00
anthony a1c53ae785 bug 7646:can not use the connection after join pool 
status 7646: resolved fixed
 2011-01-10 15:44:14 -08:00
Kelven Yang 4be13ee8a4 Add sanity check to allow only adding the right hypervisor hosts to the matched cluster 2011-01-04 22:10:55 -08:00
edison 920c7b3dd7 bug 7503: set hypervisor type when we create the cluster, as we already know the hypervisor type in adavnce when adding host. 
status 7503: resolved fixed
 2010-12-28 17:20:50 -08:00
anthony 2be0b45297 support xenserver 5.6 fp1 in oss 2010-12-20 14:18:10 -08:00
anthony baa6666897 create xenserver 5.6 patch file 2010-12-17 20:21:28 -08:00
anthony 7faf41e04e pass pooluuid to xen.configure 2010-12-16 18:55:40 -08:00
Kelven Yang 294332c6e0 fix issues in addExternalCluster command 2010-12-16 17:24:54 -08:00
anthony 6419e49977 add guid in cluster table 2010-12-16 16:28:56 -08:00
Kelven Yang 2719972cf6 Let discovers be able to identify itself 2010-12-15 14:15:13 -08:00
abhishek 5e61be67fd fix bugs in allocator 2010-12-13 16:42:25 -08:00
edison 712953156b fix boot from iso/attach iso/disks issue 2010-12-09 14:25:44 -08:00
Kelven Yang b285bbb683 new networking change integration 2010-12-08 18:30:30 -08:00
edison 5c73e46113 bug 7296: add kvm.public.network.device and kvm.private.network.device from UI 
status 7296: resolved fixed
 2010-12-04 20:01:10 -08:00
Kelven Yang fa9c882d8c Add VMWare hypervisor guru 2010-11-30 09:40:53 -08:00
anthony d3325de5ae 1. limit xs-tools in xenserver related java file 
2. don't populate xs-tools to template_host_ref
3. introduce a new template type PERHOST, which doesn't need to be populated to secondary storage
 2010-11-29 18:21:08 -08:00
alena c5d78a726e Modified exception handing in API. Following exceptions are supported now (location - BaseCmd.java): 
* MALFORMED_PARAMETER_ERROR - when type of the request parameter is invalid (String instead of Long for id for example)
* PARAM_ERROR - when invalid parameter value is specified in api request. For example, id of non existing vm for StartVmCmd
* ACCOUNT_RESOURCE_LIMIT_ERROR - when user tries to exceed his resource limits by executing the api command.
* INSUFFICIENT_CAPACITY_ERROR - when resource fails to create/start due to insufficient capacity.
* RESOURCE_UNAVAILABLE_ERROR - when user tries to create a vm when storage is not available.
* RESOURCE_IN_USE_ERROR - when user tries to delete/modify resource while it's in use. For example, when we try to delete a network group when it contains ingress rules.
* NETWORK_RULE_CONFLICT_ERROR - when LB/PF rule to add conflicts with existing rule
* ACCOUNT_ERROR - when user is not authorized to execute operation on the resource.
* INTERNAL_ERROR
 2010-11-16 11:56:34 -08:00
edison 8ca6f1669e start2command fro secondarys storage vm and make it work for KVM 2010-11-11 17:04:10 -08:00
Alex Huang 1fe446002b stop vm is now formalized 2010-11-05 16:10:22 -07:00
edison 1c8f42a001 add hypervisor type for iso, enforcement kvm hosts in the cluster that must have the same os type 2010-11-04 21:29:24 -07:00
edison 1c7e3649d2 bug 7007: if host is added before, refused to add it 
status 7007: resolved fixed
 2010-11-04 15:03:04 -07:00
Alex Huang 0fdca8be9a changed back so everyone else can start the old way 2010-11-03 21:18:31 -07:00
Alex Huang e27bb550fe Harmony among gurus 2010-11-03 21:18:31 -07:00
edison 5c88bb936b Oops, == doesn't work... 2010-10-29 19:51:24 -07:00
edison d0c68cd4a7 add a timeout (5 minutes) to wait for KVM agent host connecting to mgt svr, during adding host->discover 2010-10-29 19:18:07 -07:00
anthony b00a9174e2 always add master first when adding host 2010-10-29 11:07:51 -07:00
Alex Huang 2bc938c3f8 checkins for problems. 2010-10-26 09:35:24 -07:00
Kris McQueen 8e086d7a21 resolving merge conflicts between 2.1.refactor and master 2010-10-12 16:28:16 -07:00
Kris McQueen 2740ba6c40 final merge of master->2.1.refactor preparing for merge back into master 2010-10-12 14:46:24 -07:00
Alex Huang ce091de3d2 more changes for refactor 2010-10-12 07:17:47 -07:00
Alex Huang 652d86956c more files checked in 2010-10-04 12:04:59 -07:00
anthony f433a4d360 bug 6363: 
1. delete local storage when delete host
    2. delete host detail when delete host
    3. allow one host in maintance mode in a cluster instead of in a pod

    status 6363: resolved fixed
 2010-10-01 10:40:08 -07:00
anthony 1f173cc8f3 bug 6359: find the existing pool master 
status 6359: resolved fixed
 2010-09-30 15:19:25 -07:00
edison 7615f569ff after rebase, fix bugs 2010-09-29 18:41:55 -07:00
edison ad1ef80459 Now we have multiple routing template and buitin templates now, refactor template download code, that can handle it. 
Basically, change the meaning of type field in template table: SYSTEM means sytem vm template, BUILIIN means buildin templates.
 2010-09-29 18:41:55 -07:00
edison abba8398b3 fix add xen-pv-iso, add cloud-guest as the xen.guest.network 2010-09-29 18:41:54 -07:00
edison 9e0f57bc0e change code for new UI 2010-09-29 18:40:52 -07:00
edison 8943cc6745 create volume 
Conflicts:

	api/src/com/cloud/vm/VmCharacteristics.java
	core/src/com/cloud/dc/ClusterVO.java
	core/src/com/cloud/server/ManagementServer.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java
 2010-09-29 18:40:51 -07:00
edison e2282ba800 don't throw exceptions when you can't add host 2010-09-29 18:40:48 -07:00
edison edb16aa117 change storage allocator policy based on hypervisor 2010-09-29 18:40:47 -07:00
edison 3aef9f408e step1 2010-09-29 18:40:47 -07:00