Alena Prokharchyk
479986e52b
Fixed compilation error in StorageAllocatorTest.java
2014-03-17 09:58:44 -07:00
Hugo Trippaers
4402685e11
Update master to 4.5.0-SNAPSHOT
2014-03-14 14:55:26 +01:00
Devdeep Singh
2aff39f8c7
CLOUDSTACK-6143: Storage motion support for hyper-v. With these changes a volume on a shared
...
storage pool (SMB) and attached to a running vm can be live migrated to another shared storage
pool. Also a vm and its volumes can be live migrated to another host and storage pool respectively.
2014-03-14 16:27:58 +05:30
Min Chen
8ff94601f1
Merge branch 'rbac' to master
2014-03-13 16:42:22 -07: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
Min Chen
99bdc8d875
Merge branch 'master' into rbac.
2014-03-13 11:05:03 -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
Min Chen
48e08fe676
Merge branch 'master' into rbac.
2014-03-06 14:02:20 -08: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
Nitin Mehta
339c4f4c3f
CLOUDSTACK-6199: Action Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature.
...
For root admin - s/he should be able to see all the events despite the value of the flag.
2014-03-04 14:59:30 -08:00
Sanjay Tripathi
624139d8ef
CLOUDSTACK-6172: Volume is not retaining same uuid when migrating from one storage to another.
2014-02-26 14:42:34 +05:30
Prachi Damle
f41604fc6c
Renaming AclEntityType --> IAMEntityType
2014-02-25 16:43:17 -08:00
Hugo Trippaers
ac00ab0087
Cleanup all mysql dependencies and set all to provided.
2014-02-21 14:55:11 +01:00
Alena Prokharchyk
e0de79b170
Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command
2014-02-10 12:05:59 -08:00
Devdeep Singh
306ffa0218
CLOUDSTACK-6053: While adding a primary or secondary of type smb the password wasn't
...
encoded. This cause createStoragePool or addImageStore command to fail if special
characters were present. Updated the code to pass user, password and domain as part
of details while adding primary or secondary. Also made changes on server side to
handle it.
2014-02-10 10:29:09 +05:30
Min Chen
3b58a45e04
Merge branch 'master' into rbac.
2014-02-07 13:43:36 -08:00
Min Chen
bac2c1e5b4
CLOUDSTACK-6049: Give priority to cache stores where data object is
...
already there instead of randomly picking one in case there are multiple
cache stores in the scope.
2014-02-06 17:19:24 -08:00
Min Chen
621276715a
CLOUDSTACK-6046:CreateVolume from snapshot is failing with S3 as
...
secondary storage and zone-wide primary storage.
2014-02-06 15:36:26 -08:00
Ian Southam
cecb216caa
fixBugs finding
...
fm.equals(format) breaks equals contract
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-02-06 10:32:06 +01:00
Nitin Mehta
86cada3b3c
CLOUDSTACK-2932:
...
Allow deleting of snapshots that have errored out. Simply mark the removed column as there is no physical clean up required. It can land into error state only from allocated/Creating state
which are states before creation on primary storage works
2014-02-05 17:34:48 -08:00
Devdeep Singh
a24263fe81
CLOUDSTACK-6030: Encrypt the primary and secondary smb storage password when it is stored in the db.
2014-02-05 15:44:09 +05:30
Alex Huang
7f34282dfa
Removed references to secondarystoragevmmanager from code that doesn't use it.
2014-02-05 01:39:15 +00: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
Min Chen
9b21da65d1
CLOUDSTACK-6025:CreateTemplate from snapshot in NFS is failing , after
...
migarting to S3 datastore.
2014-02-04 11:01:51 -08:00
Daan Hoogland
ca1b340cef
findbugs make use of return of string manipulation
2014-02-04 11:21:01 +01:00
Min Chen
b35eb04de3
CLOUDSTACK-6017: NPE while creating snapshot multiple times on same Root
...
volume with S3 as secondary storage.
2014-02-03 12:16:19 -08:00
Hugo Trippaers
d56c5dfc13
Fix for a potential NPE
2014-01-31 09:37:11 +01: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
33cd1ab921
Merge branch 'master' into rbac
2014-01-22 11:23:51 -08:00
Min Chen
c0da0a884a
CLOUDSTACK-5921:S3 security key is stored in DB unencrypted
2014-01-21 14:34:32 -08:00
Min Chen
929fbabaa2
Merge branch 'master' into rbac.
2014-01-17 14:37:08 -08: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
21a44934b4
Removed a duplicate method
2014-01-10 13:36:04 -07:00
Marcus Sorensen
fc082832d3
CLOUDSTACK-5853
...
Create two storage pools, one with storage tag X, one with storage tag Y.
Create a service offering with storage tag X.
Create a disk offering with storage tag Y.
Attempt to deploy a virtual machine with a datadisk, using given offerings, it fails.
Deployment planner keeps a global object 'avoid'. It loops through each volume to
be created, asking storage allocators for matching pools, passing this avoid object.
First disk matches a pool or pools, adds ALL other pools to avoid object, then
deployment planner attaches matching pools to a list for that disk.
Second disk matches a pool, adds all other pools to avoid object, then deployment
planner says "wait, matching pool is in avoid, can't use it". Oops. In fact, at this
point ALL pools are in avoid (unless there are other pools that have both tags).
Need to remove matching pool from the avoid set during each select phase.
2014-01-10 11:55:54 -07: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
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
Mike Tutkowski
03118c2969
Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)
2014-01-09 14:44:35 -07: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
858b9b1177
CLOUDSTACK-5813: With S3 as secondary storage, snapshot taken in one
...
zone cannot be used to create volume in another zone. zoneId parameter
in createVolumeCmd is not observed.
2014-01-08 17:15:04 -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
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
5d262d7b59
CLOUDSTACK-5648:CopyTemplate and CopyISO across zones fails after NFS
...
migration to S3.
2013-12-26 12:39:39 -08:00
Likitha Shetty
e659751a8a
CLOUDSTACK-5508. Vmware - When there are multiple secondary stores, the newly added secondary store is not being selected for backing up snapshots.
...
If the snapshot being backed up is a a delta snapshot, pick the image store where the parent snapshot is stored. Otheriwse pick a random image store.
2013-12-24 17:34:19 +05:30
Alex Huang
c2baed665b
Moved the check-style.xml into the tools directory given that we're not using the project to reference the style any longer. Fixed problems with eclipse complaining about copy-dependencies
2013-12-20 17:21:34 -08:00
Edison Su
e52a4d9306
CLOUDSTACK-5572: quicevm won't save memory, as it needs pv driver installed
...
Conflicts:
engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java
2013-12-20 12:36:30 -08:00
Edison Su
62bb5d8848
fix checkstyle
2013-12-19 15:05:58 -08:00