Commit Graph

57 Commits

Author SHA1 Message Date
Edison Su 9aec9c605c merge to master 2013-06-19 18:16:47 -07:00
Laszlo Hornyak c88d8fb3a2 use commons-lang StringUtils
commons-lang is already a transitive dependency of the utils project, which allows removing some duplicated functionality.
This patch replaces StringUtils.join(String, Object...) with it's commons-lang counterpart.
It also replaces calls to String join(Iterable<? extends Object>, String) in cases where an array is already exist and it is only wrapped into a List.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-06-17 19:17:22 +01:00
Rajesh Battala 6d140538c5 CLOUDSTACK-3004: remove duplicate ssvm-check.sh
ssvm_check.sh remove the duplicate file from consoleproxy and include the
script from secondary storage folder while packing iso

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-15 11:21:46 +05:30
Edison Su f41c800d88 merge to master 2013-06-14 19:06:33 -07:00
Edison Su e8b0cff1c6 CLOUDSTACK-2658: timeout can't be null 2013-06-14 18:26:20 -07:00
Sanjay Tripathi 18163eaa4d CLOUDSTACK-1960: Key remapping fails to input the keys \ | . of UK Keyboard 2013-06-14 10:21:22 +05:30
Kelven Yang f38c4e9ea6 Bug CS-17825: Don't rely on XS to cleanup idle session but proactively close it from console proxy 2013-06-10 17:46:42 -07:00
Min Chen 04b5f53392 Removed unused code handling for DeleteSnapshotBackupCommand since we
don't send that command anymore.
2013-06-07 17:55:05 -07:00
Min Chen 83b080c4b3 Fix a path bug in s3ListTemplate and s3ListVolume, path should include
filename.
2013-06-07 16:48:47 -07:00
Min Chen 66e702222d Simplify various DeleteTemplateCommnad, DeleteVolumeCommand and
DeleteSnapshotBackupCommand to use one DeleteCommand, also provide
BaseImageStoreDriverImpl class for plugin to inherit to avoid code
duplication.
2013-06-06 18:00:38 -07:00
Min Chen c78f3984fe Fix a bug in copyFromS3ToNfs code about path. 2013-06-06 14:06:26 -07:00
Min Chen ef03d5a122 Move data store specific extract template/iso logic from
TemplateManager to data store driver.
2013-06-04 11:50:43 -07:00
Min Chen 8a1a51c6fc Clean up deleteSnapshot agent command, since snapshot path is already
stored in snapshot_store_ref, no need to construct path in resource
side.
2013-05-28 13:36:54 -07:00
Min Chen 27133fba7d Simplify clean up snapshots logic in secondary storage and consolidate
to use one agent command DeleteSnapshotBackupCommand for snapshot
deletion task by removing CleanupSnapshotBackupCommand.
2013-05-25 20:48:15 -07:00
Edison Su 0ed441c690 CLOUDSTACK-2637: fix upload volume 2013-05-24 19:00:52 -07:00
Min Chen 98af424053 Merge branch 'master' into object_store. 2013-05-23 18:00:15 -07:00
Min Chen 039098469a CLOUDSTACK-2584: set Format value in CopyCommand. 2013-05-22 14:33:40 -07:00
Edison Su 5af888c67a add image format in volumevo 2013-05-22 13:38:11 -07:00
Rajesh Battala 11f85c9c9e CLOUDSTACK-2398: ssvm-check.sh failed with permission error
RPCbind service is running in the 4.2 systemVMs resulting in ssvm-check
trying to write to the mountpoint. Avoid writing to the rpc_pipefs.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-22 13:58:36 +05:30
Edison Su 827a1a229b CLOUDSTACK-2584: fix create template from s3 2013-05-21 16:55:41 -07:00
Min Chen a4e6784e0b CLOUDSTACK-2578: NPE in deleting template from S3. 2013-05-21 14:43:32 -07:00
Min Chen 84607c1e53 Fix CLOUDSTACK-2537: Use mount.parent configured value to mount NFS
cache on MS to avoid permission issue.
2013-05-17 17:49:58 -07:00
Min Chen b66c484905 Fix size issue in copying template from S3 to cache storage to make
system vm up.
2013-05-15 18:54:55 -07:00
Edison Su a0c3d280b4 merge to master 2013-05-15 00:40:53 -07:00
Edison Su 879a954b98 delete snapshot at the backend 2013-05-14 21:58:07 -07:00
Edison Su 0ce01e56db set template size when creating template from snapshot 2013-05-13 16:45:03 -07:00
Edison Su a7480530f7 fix RAT 2013-05-13 16:22:46 -07:00
Min Chen 0b9e0c0f3a Override getRootDir in LocalNfsSecondaryStorageResource to make mount
successfully on MS side. Now S3 is working.
2013-05-12 17:41:44 -07:00
Min Chen fdb523d219 Remove a debug code. 2013-05-12 00:01:44 -07:00
Min Chen 1bd216fc48 Merge with latest code rebased from master 2013-05-11 21:05:54 -07:00
Nitin Mehta c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
Alex Huang 342624e0eb Merged with head 2013-05-10 16:33:57 -07:00
Alex Huang 3047929367 Merged 2013-05-10 16:21:43 -07:00
Sanjay Tripathi b6cb23cb99 CLOUDSTACK-957: Localization -- Add UK keyboard support. 2013-05-08 12:06:07 +05:30
Alex Huang e5d331ee58 Missing file and updated .gitignore 2013-05-06 16:34:40 -07:00
Alex Huang 3722d66aae Fixed up unit testing to use only an in class TestConfiguration 2013-05-06 16:34:27 -07:00
Alex Huang 074df0b415 Fixed an incorrect unit test for affinity group. Removed some useless pom.xml. 2013-05-06 16:34:26 -07:00
Alex Huang f6913b5088 Removed files that are no longer used and further separated out the files in the core project 2013-05-06 16:34:21 -07:00
Marcus Sorensen 7fa57922a4 Detail: Delete KVMHA dir contents if found when deleting templates, volumes
from Nfs Secondary storage

BUG-ID: CLOUDSTACK-2173
Bugfix-for: 4.2
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1366838425 -0600
2013-04-24 15:20:25 -06:00
Kelven Yang 34f8f795e1 CLOUDSTACK-2039: Improve console access security with 128-bit AES encryption and securely-randomized key generation 2013-04-15 16:52:22 -07:00
Chiradeep Vittal 2e6c65fd34 QuickCloud: sanitize logs for normal running of agents outside systemvm 2013-04-09 14:45:27 -07:00
Chiradeep Vittal 778a59fbf6 QuickCloud: move devcloud configuration into pom profile for exec:java
Also ignore agent.properties in RAT since
a. they are trivial
b. they are modified by the java code (stripping the license)

QuickCloud: proper path for log.home

QuickCloud: proper path for secstorage.sh
2013-04-09 14:45:26 -07:00
Chiradeep Vittal 5ff8bcaa2e QuickCloud: when using SSVM, pass in the new name of the SS class (com.cloud -> org.apache.cloudstack)
QuickCloud : configuration moved to applicationContext.xml from componentContext.xml
QuickCloud: default to enabled state for devcloud zone
QuickCloud: environment.properties helps customize location of pid file
2013-04-09 14:45:26 -07:00
Chiradeep Vittal 936973aff7 QuickCloud: launch scripts for secondary storage and console proxy outside system vm
QuickCloud: remove stuff added by the daemon
2013-04-09 14:45:26 -07:00
Chiradeep Vittal c5b11df6b7 QuickCloud: option to build with componentContext tailored for quickcloud
For now it replaces ConsoleProxyManagerImpl with StaticConsoleProxyManager
Usage: mvn install -Dquickcloud

QuickCloud: rename deploy profile

QuickCloud: remove cyclic dependency introduced in nonoss build by moving SecondaryStorageDiscoverer into services
However with this fix, developers will be unable to run 'PremiumSecondaryStorageResource' (for VMWare installations) using mvn exec:java.
Instead they will have to use the exploded archive from systemvm.zip
2013-04-09 14:45:26 -07:00
Chiradeep Vittal 21b4635948 QuickCloud: also look for consoleproxy.properties using PropertiesUtil.
When executed with mvn exec:java, the path 'conf' is not on the classpath
2013-04-09 14:45:26 -07:00
Chiradeep Vittal 16790446e5 QuickCloud: start console proxy service from mvn exec:java 2013-04-09 14:45:25 -07:00
Chiradeep Vittal e7983b25cc QuickCloud: Enable secondary storage daemon to run outside the system vm 2013-04-09 14:45:25 -07:00
Hugo Trippaers 4a7d392f18 Summary: Small changes to the maven phases.
Moved the copy of the systemvm to the package phase as the systemiso is
made during this phase. So in the original config the old systemvm.zip
would be copied to the server.

Add a cleanup to the console-proxy to clean the dist dir during the
clean phase.
2013-04-03 14:55:50 +02:00
Kelven Yang fb94b72213 CLOUDSTACK-1568,CLOUDSTACK-1664: Fix ActionEvent interception and optimize @DB lookup with caching 2013-03-18 18:07:52 -07:00