1721 Commits

Author SHA1 Message Date
Sheng Yang
2b1b4352bc Revert "CLOUDSTACK-5779: Fix missing clean up period for VR"
This reverts commit 161e7d93ca9d03e9aa7e7be9e12d1ad337de9b14.

Duplicate code, bad memory...
2014-02-14 19:40:00 -08:00
Sheng Yang
cc8eebeca5 CLOUDSTACK-5779: Fix VR commands which didn't use accessIp to VR 2014-02-14 19:20:00 -08:00
Sheng Yang
deb55acd14 CLOUDSTACK-6047: Made VR scripts name to constant string 2014-02-14 18:10:11 -08:00
Sheng Yang
6bde675f87 Remove SetupGuestNetworkAnswer
It's unnecessary and not different from Answer itself.
2014-02-14 18:10:05 -08:00
Sheng Yang
161e7d93ca CLOUDSTACK-5779: Fix missing clean up period for VR 2014-02-14 18:10:00 -08:00
Hugo Trippaers
091694ceb2 Findbugs : NP_NULL_PARAM_DEREF_NONVIRTUAL fixed 2014-02-14 18:37:45 +01:00
Jayapal
11c5574b05 CLOUDSTACK-5966 enable/disable global setting for service monitor in VR 2014-02-11 15:35:02 +05:30
Marcus Sorensen
c39ec1eb8f CLOUDSTACK-6062: nic device ids don't always correspond to
'eth' device numbers, but vpc scripts require it. Now we match
based on mac.
2014-02-07 14:59:40 -07:00
Prachi Damle
f84375442e Merge branch 'master' into rbac
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
	api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
	plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/template/TemplateAdapterBase.java
	setup/db/db/schema-430to440.sql
	tools/apidoc/gen_toc.py
2014-02-04 12:07:32 -08:00
Rajesh Battala
807dc09138 CLOUDSTACK-5561 Support of multiple public vlans on VR running in HyperV 2014-01-28 07:03:08 +05:30
Sheng Yang
069bc3686e CLOUDSTACK-5779: Make CitrixResource to use VirtualRoutingResource 2014-01-24 18:28:31 -08:00
Sheng Yang
285f23f11b CLOUDSTACK-5779: Generalize calling to execute or create file for KVM 2014-01-24 18:28:25 -08:00
Sheng Yang
2d100f1269 CLOUDSTACK-5779: Generalize calling to execute or create file for Xen 2014-01-24 18:27:55 -08:00
Prachi Damle
935c3e60fc Correcting the "security.checkers.order" to include the class name for RoleBasedEntityAccessChecker 2014-01-22 13:59:57 -08:00
Min Chen
33cd1ab921 Merge branch 'master' into rbac 2014-01-22 11:23:51 -08:00
Sheng Yang
e88cc488e5 CLOUDSTACK-5779: Move loadbalancer to use routerProxy 2014-01-20 18:48:46 -08:00
Min Chen
929fbabaa2 Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
Sheng Yang
ca81e7b465 CLOUDSTACK-5779: Clean up savepassword scripts 2014-01-17 12:36:42 -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
Saksham Srivastava
06f8c1de75 CLOUDSTACK-5692: obscure passwords when using cifs as storage 2014-01-17 14:00:24 +05:30
Sheng Yang
0cdf0f6f67 CLOUDSTACK-5779: Moving bumpUpPriority, edithosts.sh, dnsmasq.sh to use routeProxy 2014-01-16 16:03:09 -08:00
Jayapal
a41c9b9631 CLOUDSTACK-5867 Fixed service monitor command path 2014-01-16 11:29:03 +05:30
Min Chen
6c1849f4bf Fix Spring wiring issues in starting up MS. 2014-01-14 16:20:30 -08:00
Mike Tutkowski
ae35782ccd Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials 2014-01-09 21:36:34 -07:00
Alex Huang
5fb6edd684 Changed the package to name to org.apache.cloudstack 2014-01-09 16:12:26 -08:00
Alex Huang
ae8560b195 Moved security out into its own jar. Will be adding more to it. Fixed a few white space issues brought up by checkstyle in eclipse. 2014-01-09 16:12:25 -08: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
Sateesh Chodapuneedi
6ba9754201 CLOUDSTACK-5447 [Automation] Volume migration failing with NullPointerException in vmware and KVM.
Instead of injecting object of VolumeOrchestrationService into VmwareResource, we now populate the command object (MigrateVolumeCommand here) with required information. Thus we dont need volume orchestration service to query that information from resource.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-12-31 06:31:43 +05:30
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
Nitin Mehta
1c0b8db01b CLOUDSTACK-4941:
Adding the missing file
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 16:27:20 -08:00
Min Chen
afcf967d24 Revert "CLOUDSTACK-4941:"
This reverts commit 231e7c01f2415c1f25d6a2715b7469fe7fcfe771.
2013-12-18 16:01:37 -08:00
Nitin Mehta
231e7c01f2 CLOUDSTACK-4941:
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 14:58:37 -08:00
Marcus Sorensen
95364a4022 CLOUDSTACK-5531
Initial support for vhd, raw, vmdk image formats on KVM. Tested all formats with local and CLVM.
2013-12-16 14:32:51 -07:00
Alex Huang
be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
Devdeep Singh
2b1d997728 CLOUDSTACK-5248: Fixed creation of mount point when running as non root (cloud) user.
The systemvm iso file is copied only when a systemvm or router vm is to be started on
a host. The file gets copied to the secondary storage. The mount point used is the one
that has permissions for regular user to mount a share.
CLOUDSTACK-5275: The failure was because a secondary storage wasn't available when the
host was added. When a setup is done through wizard the hosts get added before the
secondary storage. CS was tying to copy yhe systemvm iso to secondary and it used to
fail if it wasn't available. Made a change to copy the iso only when a systemvm is
being started on a host.
CLOUDSTACK-5202: Made changes to clean up mount points on stop and start.

All the three are related fixes; so putting a fix in one commit.
2013-12-11 17:50:13 +05:30
Sheng Yang
e02682327d CLOUDSTACK-5453: Fix VPN connection monitoring in KVM
It's broken by:

commit 7f104b1feb489ae09b1a2060262a122deda44a8e
Author: Edison Su <sudison@gmail.com>
Date: Fri Oct 12 18:24:50 2012 -0700

    [PATCH] CLOUDSTACK-335: fix lb for vpc on kvm
2013-12-10 17:36:12 -08:00
tuna
5e23f00b1a add Apache Licensed and add check native 2013-12-10 10:37:29 +07:00
tuna
dc151115be AutoScaling without NetScaler 2013-12-10 10:35:55 +07:00
Alex Ough
88f64b2b93 Changed 'MigrateCommand' to use the global setting value of 'execute.in.sequence.hypervisor.commands'
Signed-off-by: Koushik Das <koushik@apache.org>
2013-12-06 09:41:50 +05:30
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
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
e4b22d0fca Replace all tabs, particularly the ones in the comments 2013-11-21 03:39:58 -08:00
Alex Huang
62e9273581 Removed trailing spaces 2013-11-21 03:12:05 -08:00
Wido den Hollander
1edaa36cc6 CLOUDSTACK-1302: Allow a cache mode per disk offering
Per disk offering the setting none, writeback or writethrough can be set

This allows for both safety and performance for writes.
2013-11-20 17:11:10 +01:00
Alex Huang
8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Darren Shepherd
1f7ef652cf Make com.cloud.network.vpn.RemoteAccessVpnService an extensible type 2013-11-14 15:31:33 -08:00