apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,170 Commits 308 Branches 324 Tags
Commit Graph

317 Commits

Author SHA1 Message Date
Sheng Yang
069bc3686e CLOUDSTACK-5779: Make CitrixResource to use VirtualRoutingResource 2014-01-24 18:28:31 -08:00
Sheng Yang
2d100f1269 CLOUDSTACK-5779: Generalize calling to execute or create file for Xen 2014-01-24 18:27:55 -08:00
Hugo Trippaers
ecdee7da9a Findbugs finding: Fix incorrect comparison, <VbdType>.equalsi(<String>) will always be false and should be <VbdType>.equals(<VbdType>) 2014-01-23 15:43:50 +00:00
Jayapal
4b3784a98e CLOUDSTACK-5938 Failing add host in security group enabled zone, when CSP is not installed 2014-01-23 18:14:12 +05:30
Hugo Trippaers
c2da280347 Add a zipped version of the hyperv image that we can store in the archives on the jenkins server 2014-01-23 09:06:33 +01:00
Anthony Xu
cae19d0b5a fix build 2014-01-21 19:34:54 -08:00
Anthony Xu
b79f949e1b CLOUDSTACK-5923: CS doesn't do master switch for XS any more, CS will depend on XS HA to do master switch, XS HA needs to be enabled. 
Conflicts:
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
 2014-01-21 18:54:53 -08:00
Sheng Yang
e88cc488e5 CLOUDSTACK-5779: Move loadbalancer to use routerProxy 2014-01-20 18:48:46 -08:00
Sheng Yang
0ea1c7dfc4 CLOUDSTACK-5779: Move firewall to use routerProxy 2014-01-17 12:36:42 -08:00
Sheng Yang
ce67e24d0a CLOUDSTACK-5779: Move ipAlias to use routerProxy 2014-01-17 12:36:42 -08:00
Sheng Yang
0cdf0f6f67 CLOUDSTACK-5779: Moving bumpUpPriority, edithosts.sh, dnsmasq.sh to use routeProxy 2014-01-16 16:03:09 -08:00
Sheng Yang
b703b43d7c CLOUDSTACK-5779: Refactor mechanism for calling routerProxy in CitrixResource 2014-01-16 16:02:53 -08:00
Mike Tutkowski
e9c9887ee0 CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false 2014-01-16 12:20:54 -07:00
Mike Tutkowski
3ef560d925 CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false 2014-01-16 12:15:18 -07:00
Alex Huang
68b8891c62 Removed all reminants of the IdentityService. Created the KeysManager to move the management 
of keys out of management server
 2014-01-14 13:11:35 -08:00
Mike Tutkowski
6944bf9bba Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials 2014-01-09 22:02:43 -07:00
Mike Tutkowski
8b6e89c012 Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) 2014-01-09 15:44:02 -07:00
Sanjay Tripathi
3ad0e8fb47 CLOUDSTACK-5701: physical size is not getting updated in snapshot_store_ref table. 2014-01-06 11:36:43 +05:30
Edison Su
62bb5d8848 fix checkstyle 2013-12-19 15:05:58 -08:00
Edison Su
8caf52c6bc add xenserver 6.2.0 hotfix support, to optimize vdi copy 
add xenserver hot fix

Conflicts:

	api/src/com/cloud/vm/VirtualMachineName.java
	core/src/com/cloud/host/HostInfo.java
	core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
	deps/XenServerJava/src/com/xensource/xenapi/VDI.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
	engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
	engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
	server/src/com/cloud/configuration/Config.java
 2013-12-19 14:15:41 -08:00
Min Chen
46d1e1afb2 CLOUDSTACK-5446:KVM-Secondary Store down-Even after secondary store is 
brought back up after being down for few hours,snapshot jobs do not get
triggered with reason "there is other active snapshot tasks on the
instance to which the volume is attached".
 2013-12-13 22:04:29 -08:00
Alex Huang
be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
Anthony Xu
1ddc0b99fe put CS/XS plugin log into seperate directory 2013-12-10 01:23:46 -08:00
tuna
dc151115be AutoScaling without NetScaler 2013-12-10 10:35:55 +07:00
tuna
61e80f030a remove unused code 2013-12-09 23:33:15 +07:00
tuna
d935d3865a tuna 2013-12-09 23:33:14 +07:00
Tuna
4e914b7087 re-factor gre controller 
Signed-off-by: tuna <ng.tuna@gmail.com>
 2013-12-09 23:33:14 +07:00
tuna
3a9c9bd717 fix white-space 2013-12-09 23:33:14 +07:00
tuna
79a7ce871e make SDN GRE work with XCP 1.6 2013-12-09 23:33:14 +07:00
Anthony Xu
04b48ae04e XS VMmetadata platform contains virtual platform related info, CS should save platform info in DB to migrate the VM to other Cluster 2013-12-05 01:41:14 -08:00
Nitin Mehta
fd195433ae fixing the test 2013-12-04 16:14:27 -08:00
Nitin Mehta
71323f15c6 CLOUDSTACK-5352: 
CPU cap calculated incorrectly for VMs on XenServer hosts. It should not be limited by the overprovisioning and should set the cap as service offering
 2013-12-04 14:59:24 -08:00
Nitin Mehta
71d547ba87 CLOUDSTACK-5352: 
CPU cap calculated incorrectly for VMs on XenServer hosts. It should not be limited by the overprovisioning and should set the cap as service offering
 2013-12-04 14:53:28 -08:00
Alena Prokharchyk
bd6f706b72 CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API 
Conflicts:
	engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
	engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
	plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/alert/AlertManagerImpl.java
	server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
	server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java
	usage/src/com/cloud/usage/UsageManagerImpl.java

listAlerts: introduced new parameter "name" to the alertResponse

Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
	server/src/com/cloud/alert/AlertManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java

Added new Admin API - generateAlert. Available to ROOT admin only

Conflicts:
	api/src/org/apache/cloudstack/alert/AlertService.java
	api/src/org/apache/cloudstack/api/BaseCmd.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java

listAlerts: implemented search by alert name

Conflicts:
	api/src/org/apache/cloudstack/alert/AlertService.java
	api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
	engine/schema/src/com/cloud/alert/AlertVO.java
 2013-12-04 10:05:46 -08:00
Anthony Xu
5a062e155c put shell scripts to a seperate directory in XS 
use same scripts for both XS and XCP
 2013-12-03 02:05:34 -08:00
Anthony Xu
84be2ab3be CLOUDSTACK-4913: Don't enable ebtables/iptables for non-security group zone 2013-11-25 16:06:48 -08:00
Alex Huang
433a631916 Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00
Hugo Trippaers
cf715ff491 Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01:00
Alex Huang
d620df2bdd Reformatted all of the code. 2013-11-21 06:15:26 -08:00
Alex Huang
224f479974 Removed trailing spaces 2013-11-21 04:08:01 -08:00
Alex Huang
8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Anthony Xu
9c739ef93d Revert "Revert "XS host free memory might change, if user manually changes dom0 memory,"" 
This reverts commit 74153e4a79a064139a6ecce48f8eb1308318beab.
 2013-11-14 11:58:55 -08:00
Anthony Xu
74153e4a79 Revert "XS host free memory might change, if user manually changes dom0 memory," 
This reverts commit a1d09ae16f08c86bfca5c4a89dec371ef6d3ee67.
 2013-11-13 15:38:42 -08:00
Anthony Xu
a1d09ae16f XS host free memory might change, if user manually changes dom0 memory, 
this patch makes CS update latest XS host free memory on host connect process.
 2013-11-13 10:59:36 -08:00
Kelven Yang
fc9adec72e CLOUDSTACK-669: Add host level side-by-side VM state report for graceful sync model migration 2013-11-12 18:32:51 -08:00
Jayapal
b464a20a52 CLOUDSTACK-4736: Monitoring services in VR 2013-11-05 23:39:33 +05:30
Harikrishna Patnala
a286dec098 CLOUDSTACK-4908: CPU socket count of host Adding cpu socket count of the host in hostresponse 
Signed-off-by: Koushik Das <koushik@apache.org>
 2013-11-05 16:12:36 +05:30
Pedro Marques
6b5fab2f5c OpenContrail network plugin 
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2013-11-01 17:46:52 +01:00
Sheng Yang
3205cd42b5 CLOUDSTACK-730: Site-to-site VPN between VPC VR to VR 
Now VPN connection can be created as "passive", which would enable the ability
of remote peer initiate the connection. So it's possible for VPC VR to
establish the connection to another VPC VR of CloudStack.

Test case also included.

The test case would create 2 vpcs and using VPN to connect them.
 2013-10-30 19:30:22 -07:00
Anthony Xu
4f8781f681 CLOUDSTACK-4976 
merge createVmFromTemplate in XSFP1 to CitrixResourceBase instead of fixing one bug in two different place.

Anthony
 2013-10-29 15:20:49 -07:00