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
25,807 Commits 304 Branches 324 Tags
Commit Graph

3157 Commits

Author SHA1 Message Date
Koushik Das
ef9830d6a4 Merge branch '4.5' 
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	tools/appliance/build.sh
 2014-12-09 14:59:36 +05:30
Daan Hoogland
ad59970d37 specifying MinVRVersion as 4.5.0 for the 4.5 branch 2014-12-08 15:40:39 +01:00
Wei Zhou
fc1a09ff49 Add snapshotName parameter in CreateSnapshotCmd 2014-12-04 15:29:39 +01:00
Wei Zhou
c25d4fdea2 CLOUDSTACK-7847: Separate ListDomains cmd to use two different views 2014-12-03 12:33:57 +01:00
Wei Zhou
0407fb334f CLOUDSTACK-7847: add max.domain.* in global setting and display domain resources in listDomainsCmd response 2014-12-02 11:52:10 +01:00
Wei Zhou
af2f21894c CLOUDSTACK-7983: Create Disk/Service Offering for Domain Admin 2014-12-01 13:03:37 +01:00
Wei Zhou
0d9c38e131 Add 'View Instances' in template/iso details view 2014-12-01 12:03:47 +01:00
Pierre-Luc Dion
ed6016cf8e CreateSecondaryStagingStoreCmdTest.java: add license header 2014-11-30 23:15:15 -05:00
Laszlo Hornyak
b838436e58 cleanup around seemingly impossible cast 
- changed type parameters on details map in CreateSecondaryStagingStoreCmd - <String, String> was misleading since it can not work with a string value and it is never a string
- introducing the type parameters allowed some simplifications in getDetails()
- added unit test

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Pierre-Luc Dion <pdion891@apache.org>
 2014-11-30 23:11:14 -05:00
Min Chen
bf8dd828f5 CLOUDSTACK-7981: listVirtualMachine is too slow in case of duplicate 
resource tags due to joining user_vm_details to user_vm_view.
 2014-11-26 17:40:06 -08:00
Min Chen
4e7af26c9f CLOUDSTACK-7981: listVirtualMachine is too slow in case of duplicate 
resource tags due to joining user_vm_details to user_vm_view.
 2014-11-26 17:23:07 -08:00
Rohit Yadav
7ff31f1b22 Merge remote-tracking branch 'origin/inetaddress' 
- Tested locally against unit tests
- TravisCI build passed: https://travis-ci.org/apache/cloudstack/builds/41990351
- Manual QA passed for basic auth and saml auth using default IDP settings

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/api/ApiServlet.java
 2014-11-25 14:32:09 +05:30
Laszlo Hornyak
3577423da9 removed executable flags from java classes 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-11-23 19:49:01 +01:00
Wido den Hollander
4bd49df3f5 Use InetAddress for passing Remote Address instead of String 2014-11-21 12:10:35 +01:00
Syed
9f8d0051ed CLOUDSTACK-7952: Remove private key from SslCertResponse (listSslCerts) 
Signed-off-by: Will Stevens <wstevens@cloudops.com>
 2014-11-21 03:39:57 -05:00
Syed
8ea7902075 CLOUDSTACK-7952: Remove private key from SslCertResponse (listSslCerts) 
Signed-off-by: Will Stevens <wstevens@cloudops.com>
 2014-11-20 03:46:03 -05:00
Prachi Damle
968ca060ee CLOUDSTACK-5853 cannot deploy vm with differing service storage tag and data disk storage tag 
Changes:
- Reverting Marcus's fix since this issue has already fixed by https://issues.apache.org/jira/browse/CLOUDSTACK-5426
 2014-11-18 14:07:51 -08:00
Prachi Damle
c5399cdef0 CLOUDSTACK-5853 cannot deploy vm with differing service storage tag and data disk storage tag 
Changes:
- Reverting Marcus's fix since this issue has already fixed by https://issues.apache.org/jira/browse/CLOUDSTACK-5426
 2014-11-18 09:47:23 -08:00
Santhosh Edukulla
ef6ec7b276 Fixed few coverity issues like invalid boxing unboxing issues, resource leaks, null dereferences 2014-11-13 17:26:24 +05:30
Rajani Karuturi
890f9eeb57 Merge branch '4.5' 2014-11-13 16:26:15 +05:30
Phillip Kent
d2c087aef2 Update ListInternalLBVMsCmd.java 
Fix typo in response name string: there was an extra 's'

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>

This closes #8
 2014-11-13 16:04:27 +05:30
Harikrishna Patnala
edf1047a20 CLOUDSTACK-7706: Coverity defects 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
 2014-11-11 20:58:45 +05:30
Rohit Yadav
c401dbc8f9 CLOUDSTACK-7871: allow VM and template details update using update APIs 
Allows updating details (key/value) pair which updatse entries
invm_template_details and user_vm_details tables using updateVM and updateTemplate
APIs. This allows sys admins to update nics, controllers etc without DB hacking.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 97fa4a023e2346b3b9f56bf213ed4125c371ca6d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-10 17:53:26 +05:30
Rohit Yadav
97fa4a023e CLOUDSTACK-7871: allow VM and template details update using update APIs 
Allows updating details (key/value) pair which updatse entries
invm_template_details and user_vm_details tables using updateVM and updateTemplate
APIs. This allows sys admins to update nics, controllers etc without DB hacking.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-10 17:51:57 +05:30
Damodar
781648fb10 CLOUDSTACK-7792: Usage Events to be captured based on Volume State Machine 2014-11-10 15:19:02 +05:30
Sanjay Tripathi
a53d39c1b6 CLOUDSTACK-7835: Deleted volumes with null UUID and no removed timestamp in database still appear. 
Also removed CREATING -> DESTROY via DESTROYREQUESTED, which was causing the volume to get stuck in expunging
state.
 2014-11-04 17:57:31 +05:30
Sanjay Tripathi
1d503bb853 CLOUDSTACK-7835: Deleted volumes with null UUID and no removed timestamp in database still appear. 
Also removed CREATING -> DESTROY via DESTROYREQUESTED, which was causing the volume to get stuck in expunging
state.
 2014-11-04 17:02:50 +05:30
punith-cloudbyte
09a62b8389 new managed nfs storage adapter 
Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com>
 2014-10-30 16:07:59 -06:00
Hugo Trippaers
4ebaf0a583 Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00
Min Chen
8acdd7fbf2 CLOUDSTACK-7798: requestHasSensitiveInfo and responseHasSensitiveInfo annotation are missing from some separate Admin API commands. 2014-10-27 17:00:43 -07:00
Min Chen
37b9f91e57 CLOUDSTACK-7798: requestHasSensitiveInfo and responseHasSensitiveInfo annotation are missing from some separate Admin API commands. 2014-10-27 16:49:44 -07:00
Frank Zhang
1b0a0d68f1 CLOUDSTACK-7795 
Fix multiple baremetal rct configuraitons

Conflicts:
	api/src/com/cloud/event/EventTypes.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
 2014-10-27 16:11:26 -07:00
Frank Zhang
2ae40237a4 CLOUDSTACK-7795 
Fix multiple baremetal rct configuraitons
 2014-10-27 15:14:08 -07:00
Rajesh Battala
e5d3e496ab CLOUDSTACK-7774 Description field is missing in Health policy API's 2014-10-23 14:14:14 +05:30
Anthony Xu
4a13f81485 when host is pingtimeout and CCP can not determine the host status, put the host to Alert status , no VM HA. 2014-10-22 15:14:46 -07:00
Anthony Xu
c52e14730e when host is pingtimeout and CCP can not determine the host status, put the host to Alert status , no VM HA. 2014-10-22 15:07:40 -07:00
Mike Tutkowski
1b5bb7d8c6 Invoke grantAccess and revokeAccess one time each using a SnapshotInfo (where previously a VolumeInfo was being passed in) 
Handle the case where a SnapshotInfo is passed into the grantAccess and revokeAccess methods
 2014-10-21 16:01:14 -06:00
Mike Tutkowski
b29265f159 Logic around granting and revoking access to the volume that backs the snapshot 2014-10-21 16:01:14 -06:00
Mike Tutkowski
0cea0346ae Support for back-end snapshots on primary storage 2014-10-21 16:01:14 -06:00
Daan Hoogland
1de0cb7094 restore barematel work after merge 2014-10-17 10:24:01 +02:00
Daan Hoogland
148efbb73f Merge remote-tracking branch 'origin/4.5' into merge-master 
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	setup/db/db/schema-441to450.sql
	test/integration/component/test_deploy_vgpu_vm.py
	tools/marvin/marvin/config/test_data.py
 2014-10-16 12:29:37 +02:00
Damodar
7fe3c45142 CLOUDSTACK-7729: listVMSnapshot API not returning parent id in response 2014-10-16 09:43:04 +05:30
Mike Tutkowski
e70dde09c9 Implementing snapshot-strategy support for reverting a volume to a snapshot 2014-10-14 22:04:18 -06:00
Damodar
50185b7c3a CLOUDSTACK-7648: There are new VM State Machine changes introduced which were missed to capture the usage events 2014-10-13 14:42:00 +05:30
Edison Su
1c1485e0f0 disable parallel for xenserver. Also for vmware, if full.clone is enabled and migratecommand will have the behavor of start/stop command 
(cherry picked from commit d233f39c82908f81ba90f51d7bc445cc83ef5691)
 2014-10-13 00:39:33 -04:00
Saksham Srivastava
14ace9e758 CLOUDSTACK-7663: Fix typo in response name string: there is an extra 's' 
(cherry picked from commit e7134b82f90cfa9482cd08c3cf4633c64d621117)
 2014-10-13 00:14:45 -04:00
Devdeep Singh
549840dd0d CLOUDSTACK-7495. Volume resize is only supported on kvm, vmware and xenserver. If 
the operation is tried on other hypervisors it fails but logs a stack trace. We
should just log a message that the operation isn't supported.

(cherry picked from commit ec1123aca18009ac91e571e150fcf4c98df5e482)
 2014-10-13 00:01:55 -04:00
Rohit Yadav
eb3773c27f CID-1223272: Remove DLS code, exceptions and logging handled at lower layers 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f40f16b61815580717cd8ab0f70109c65c06e7ce)
 2014-10-12 23:58:28 -04:00
Rohit Yadav
fbb9e2b210 CID-1192798: Remove unused boolean variable 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 6e06ae9e8ea879e892d6311761a6042fa78cea3f)
 2014-10-12 23:57:40 -04:00
David Nalley
ffe846673c more revert cleanup 2014-10-12 23:31:17 -04:00