apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,892 Commits 304 Branches 324 Tags
Commit Graph

154 Commits

Author SHA1 Message Date
Min Chen
ae1d6a771b Remove IAMEntityType to use existing VO interface class to annotate 
entityType.
 2014-03-17 17:19:55 -07:00
Hugo Trippaers
4402685e11 Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01:00
Alena Prokharchyk
6c23e201ad 1) More fixes for the problems found by findBugs 
2) Corrected some logging in  MidoNetPublicNetworkGuru - removed .toString method call on the objects in the log body as toString is called on the object by default when use log4j
 2014-03-13 16:05:45 -07:00
John Kinsella
09c375379d CLOUDSTACK-6204: removing realhostip dependency 
Moving default transport for console proxy, SSVM to http.

See
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes
for more info.

jlk ported Amogh's patch for 4.3 to master - code base is different
enough that patch has multiple issues.

Author: Amogh Vasekar <Amogh Vasekar <amogh.vasekar@citrix.com>
Signed-off-by: John Kinsella <jlk@stratosec.co> 1394398017 -0700
 2014-03-09 13:46:57 -07:00
Mike Tutkowski
b06e66c50a CLOUDSTACK-6170 2014-03-05 13:55:12 -07:00
Min Chen
d0ae4d9a9f CLOUDSTACK-5920:Add interface to ControlledEntity to return IAM 
entity type.
 2014-03-05 09:40:55 -08:00
Min Chen
16a9171f55 Fix trailing whitespace. 2014-01-28 14:53:18 -08:00
Min Chen
a26c81178b CLOUDSTACK-5971:Templates created from a snapshots can't be copied to 
other zones.
 2014-01-28 14:49:58 -08:00
Min Chen
3223028fd6 CLOUDSTACK-5841:Snapshots taken before migration NFS to S3 can not be 
used cross-zone.
 2014-01-08 17:43:06 -08:00
Min Chen
6f800506fd CLOUDSTACK-5653:S3 object store as Secondary Storage, the template 
created from different zone is not available for the other zones.
 2013-12-26 14:48:21 -08:00
Min Chen
df1c34bf2b CLOUDSTACK-5451:Restart MS after migrating NFS image store to S3, 
previous Ready template is not ready anymore.
 2013-12-11 14:18:06 -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
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
Min Chen
9a62239a92 CLOUDSTACK-5017: Throw CloudRuntimeException in case of template/volume 
download when ssvm is not ready so that caller can remove some leftover
entries in template_store_ref and volume_store_ref.
 2013-11-04 12:32:05 -08:00
Min Chen
6eecb0b3b5 CLOUDSTACK-5017: If SSVM is unavailable DownloadCommands will be routed 
to mgmt server.
 2013-11-01 18:07:00 -07:00
Min Chen
6be228a438 CLOUDSTACK-4024:Provide a way to upgrade from existing NFS secondary 
storage to S3.
 2013-10-28 21:01:31 -07:00
Darren Shepherd
e3280bdba2 Merge remote-tracking branch 'origin/spring-modularization' 
Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
 2013-10-23 11:14:42 -07:00
Min Chen
ec3302afd6 CLOUDSTACK-3472: [Object_Store_Refactor] System VMs are not coming up in 
initial attempt, but they are coming up after multiple attempts.
 2013-10-17 15:59:10 -07:00
Chris Suich
180cfa19e8 Refactor Storage Related Resource Code 
These changes are a joint effort between Edison and I to refactor some
of the code around snapshotting VM volumes and creating
templates/volumes from VM volume snapshots. In general, we were working
towards allowing PrimaryDataStoreDrivers to create snapshots on primary
storage and not requiring the snapshots to be transferred to secondary
storage.

High level changes:
-Added uuid to NfsTO, SwiftTO & S3TO to cut down on the requirement of
PrimaryDataStoreTO and ImageStoreTO which don't really serve much of a
purpose
-Initial work towards enable reverting VM volume from snapshots
-Added hypervisor commands for introducing and forgetting new hypervisor
objects (snapshots, templates & volumes)

Signed-off-by: Edison Su <sudison@gmail.com>
 2013-10-04 13:06:42 -07:00
Darren Shepherd
67186429e1 Spring Modularization 
ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.

Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors.
 2013-10-02 15:41:04 -07:00
Min Chen
e92d46bfd4 CLOUDSTACK-4600:Registered Cross-zone template does not populate 
template_zone_ref for later added zones.
 2013-09-03 16:39:23 -07:00
Alex Huang
abbae2aa87 Fixed the problem with offerings and templates. These two items due to a previous patch all the way back in 2.1.x versions uses the removed column incorrectly. No one fixed since then. Hence, there's a bunch of findbyidincludingremoved calls in the cloudstack code around these two items. 2013-08-26 17:31:10 -07:00
Min Chen
49dd7289c0 CLOUDSTACK-4468:template created from snapshot is destroyed once we 
restart management server.
 2013-08-26 11:58:53 -07:00
Min Chen
0fdaef8e3d CLOUDSTACK-4455:object_store - Template sync results in private 
templates being synced to all the secondary stores.
 2013-08-22 16:02:47 -07:00
Min Chen
c4f41f4a53 CLOUDSTACK-4395:[Object_store_refactor] Default template is not 
available for use to deploy vm in case of multi zone environment.
 2013-08-19 17:37:33 -07:00
Min Chen
3937a7b5a5 CLOUDSTACK-4400:[object_store_refactor] Three entries for one template 
in template_store_ref when MS was restarting during template download.
 2013-08-19 15:01:57 -07:00
Min Chen
5d3bc5339e CLOUDSTACK-4399:[Templates] template entries are deleted from 
template_store_ref when downloadTemplate times out.
 2013-08-19 11:27:16 -07:00
Min Chen
ba4a05eed1 CLOUDSTACK-4287: Template sync should remove template_store_ref entry 
for corrupted template.
 2013-08-15 14:56:49 -07:00
Min Chen
c675f826e5 CLOUDSTACK-4318:[Object_Store_Refactor] Failed to delete snapshot copied 
to Staging storage during snapshot creation.
 2013-08-14 18:12:53 -07:00
Min Chen
67beef15c9 CLOUDSTACK-3706:[Object_Store_Refactor] Failed to create template from 
stopped guest vm's root disk.
 2013-08-14 13:11:06 -07:00
Nitin Mehta
efa861cd5c CLOUDSTACK-4287 
Builtin template Ready Status is No even after the Status is downlaod complete. The reason was that template sync updates only the template download state but not the state. Fixing that. Ideally we should change the state through state machine only.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-08-14 18:43:47 +05:30
Kishan Kavala
21831211f6 CLOUDSTACK-4295 : TemplateTO should contain physical size along with virtual size. Usage ignores templates with size 0 2013-08-14 17:34:05 +05:30
Alex Huang
5495f10bce Revert "Reverting the range of commits that broke the build" 
This reverts commit b59e3aaefced03d40d5b4b63c421c69743bcd387.
 2013-08-08 15:02:40 -07:00
Prasanna Santhanam
b59e3aaefc Reverting the range of commits that broke the build 
This reverts commits 30c33415..f6a2c817bc

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-08-08 14:46:56 +05:30
Alex Huang
942f282a6e Moved config into it's own package 2013-08-07 16:41:02 -07:00
Min Chen
a8990cffd4 CLOUDSTACK-4003: We should not delete a READY data object from object 
store ref table in case of any operation failure related to this data
object.
 2013-08-06 15:04:57 -07:00
Chip Childers
8225374138 Updating pom.xml version numbers for release 4.3.0-SNAPSHOT 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-08-01 10:35:00 -04:00
Edison Su
ae534388c0 CLOUDSTACK-3852: fix upload volume 
Conflicts:

	plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
	server/src/com/cloud/template/TemplateManagerImpl.java
 2013-07-29 11:50:16 -07:00
Alex Huang
c2752ba93c Removed mysql as any dependency 2013-07-26 20:35:48 -07:00
Alex Huang
3f7c558de5 Removed all the extra mockito, inject, and junit dependencies. Changed any test/resource to test/resources and rely on the master pom to tell us where the resources are instead of each individual project 2013-07-26 16:34:08 -07:00
Min Chen
0fb3286cb1 CLOUDSTACK-3513:[Automation] Failed to copy iso and template between 
zones. Failed to pass generated copy url to DownloadCommand.
 2013-07-22 16:17:56 -07:00
Min Chen
e1c17bd853 CLOUDSTACK-3513: add debug message to diagnose copyIso issue on 
automation setup where DownloadCommand is never sent.
 2013-07-18 16:08:29 -07:00
Min Chen
cb2a84241b CLOUDSTACK-3513: [Automation] Failed to copy iso and template between 
zones.
 2013-07-17 17:31:50 -07:00
Edison Su
0c1ae20e77 add inital swift support 
Conflicts:

	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/test/com/cloud/resource/MockResourceManagerImpl.java
 2013-07-13 02:07:03 -07:00
Sanjay Tripathi
08669f5de2 CLOUDSTACK-3462: NumberFormatException with TemplateService while performing template synchronization. 2013-07-11 14:16:57 +05:30
Min Chen
d425fa76f7 CLOUDSTACK-3335:[Object_Store_Refactor][Automation]CopyTemplate failed 
with Unexpected exception.
 2013-07-02 18:01:47 -07:00