etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,905 Commits 324 Branches 325 Tags 860 MiB
Commit Graph

25905 Commits

Author SHA1 Message Date
Damodar 7b8fe0c8cd Attach volume events are not correctly shown in events. 
Signed-off-by: Koushik Das <koushik@apache.org>
 2014-12-04 19:31:03 +05:30
Ashutosh K 608b0c5a24 CLOUDSTACK-7998: test_escalations_instances.py - Correcting code related to detach volume 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-04 16:38:35 +05:30
Ashutosh K 1f7699f458 CLOUDSTACK-7998: test_escalations_instances.py - Correcting code related to detach volume 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-04 16:37:35 +05:30
Ashutosh K c2c7ee25ed CLOUDSTACK-8020: test_snapshots.py - Fixed cleanup issue 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-04 16:32:48 +05:30
Ashutosh K 0a757b0f10 CLOUDSTACK-8020: test_snapshots.py - Fixed cleanup issue 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-04 16:30:50 +05:30
Sheng Yang 3c9e14e85a CLOUDSTACK-5241: Remove Rot13 usage 2014-12-03 19:38:47 -08:00
Sheng Yang feeafa76a4 CLOUDSTACK-5241: Remove Rot13 cipher 2014-12-03 19:30:31 -08:00
Min Chen ab16011874 CLOUDSTACK-5949: remove unused vnc_password from user_vm_view view to avoid decryption bottleneck. 2014-12-03 14:48:01 -08:00
Min Chen 1716067ddd CLOUDSTACK-5949: remove unused vnc_password from user_vm_view view to avoid decryption bottleneck. 2014-12-03 14:46:47 -08:00
Rohit Yadav 518853ab43 packaging: updated hardcoded jasypt version to 1.9.2 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 43f39a1ec3)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-04 04:04:30 +05:30
Rohit Yadav 43f39a1ec3 packaging: updated hardcoded jasypt version to 1.9.2 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-04 04:02:46 +05:30
Rohit Yadav 835abe6c7c Revert "CLOUDSTACK-7566:Many jobs getting stuck in pending state and cloud is unusable." 
This reverts commit 6df38427cf.
 2014-12-04 02:38:47 +05:30
Rohit Yadav 482815d084 CLOUDSTACK-8011: Upgrade maven dependencies 
Changes;
- Upgrades maven-war plugin to 4.5 (faster war packaging)
- Upgrade spring framework to latest minor release
- Upgrade ehcache, jasypt, httpclient, httpcore and other core dependencies
- Upgrade to latest ipv6 library, fix unit test NetUtilsTest
- httpcore and httpclient are sharing same version variable
- commons-httpclient is different that httpclient, the fix gives it a separate var
- Apidocs failed to generate and get stuck with new reflections version, for now
  we will continue using 0.9.8

Newer dependencies can be listed using:
mvn versions:display-dependency-updates -Dnoredist -Dsimulator -P developer,systemvm

Testing;
- Tested using Maven 3.2.1
- Local noredist build with unit tests succeeds
- CloudStack mgmt server started, basic business layer tests work
- Observed 10-15% build time improvement using new maven-war plugin

Branch: bugfix/4.5-8011 (commits are squashed in favour of a linear history)

Pull request:
https://github.com/apache/cloudstack/pull/50

This closes #50

TravisCI build summary:
https://travis-ci.org/shapeblue/cloudstack/builds/42902172

- Build passes with unit tests
- Apidocs generates successfully
- Most integration tests pass, some fail due to timeout errors, second re-run
  passes some of them

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit fac7bfc5d5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	pom.xml
 2014-12-04 02:14:54 +05:30
Rohit Yadav fac7bfc5d5 CLOUDSTACK-8011: Upgrade maven dependencies 
Changes;
- Upgrades maven-war plugin to 4.5 (faster war packaging)
- Upgrade spring framework to latest minor release
- Upgrade ehcache, jasypt, httpclient, httpcore and other core dependencies
- Upgrade to latest ipv6 library, fix unit test NetUtilsTest
- httpcore and httpclient are sharing same version variable
- commons-httpclient is different that httpclient, the fix gives it a separate var
- Apidocs failed to generate and get stuck with new reflections version, for now
  we will continue using 0.9.8

Newer dependencies can be listed using:
mvn versions:display-dependency-updates -Dnoredist -Dsimulator -P developer,systemvm

Testing;
- Tested using Maven 3.2.1
- Local noredist build with unit tests succeeds
- CloudStack mgmt server started, basic business layer tests work
- Observed 10-15% build time improvement using new maven-war plugin

Branch: bugfix/4.5-8011 (commits are squashed in favour of a linear history)

Pull request:
https://github.com/apache/cloudstack/pull/50

This closes #50

TravisCI build summary:
https://travis-ci.org/shapeblue/cloudstack/builds/42902172

- Build passes with unit tests
- Apidocs generates successfully
- Most integration tests pass, some fail due to timeout errors, second re-run
  passes some of them

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-04 02:12:51 +05:30
Min Chen 344d98e0bd CLOUDSTACK-7981: added back resource tag related columns to user_vm_view to support resource tag related search. 2014-12-03 09:48:07 -08:00
Min Chen 8cb11f407f CLOUDSTACK-7981: added back resource tag related columns to user_vm_view to support resource tag related search. 2014-12-03 09:33:22 -08:00
Laszlo Hornyak a81b59e2a4 Revert "some unused fields deleted" 
This reverts commit 31db58f720.
 2014-12-03 18:09:49 +01:00
Daan Hoogland 590667076d CID-1256277 use StringBuffer in loop 2014-12-03 13:32:22 +01:00
Wei Zhou c25d4fdea2 CLOUDSTACK-7847: Separate ListDomains cmd to use two different views 2014-12-03 12:33:57 +01:00
Hugo Trippaers 52803ae6b4 Fix invalid sql statements 2014-12-03 08:26:39 +01:00
Chandan Purushothama b0d74ad6fc CLOUDSTACK-7996: Fixed the script test_tags.py - Tags and Template should belong to the User Account to test the case 2014-12-02 16:48:20 -08:00
Will Stevens 3f8d0dd487 CLOUDSTACK-7959: fixed 'qemu-img convert' compat issue 2014-12-02 18:24:16 -05:00
Jessica Wang 6b4271b75c CLOUDSTACK-8005: UI > storage > volume > Resize Volume action > hide "Shrink OK" checkbox when selected disk offering's disksize is bigger than the volume's disksize. Show it otherwise. 2014-12-02 11:17:33 -08:00
Jessica Wang 54f4240e0e CLOUDSTACK-8005: UI > storage > volume > Resize Volume action > hide "Shrink OK" checkbox when selected disk offering's disksize is bigger than the volume's disksize. Show it otherwise. 2014-12-02 11:16:08 -08:00
Will Stevens 03daae571b CLOUDSTACK-7959: fixed 'qemu-img convert' compat issue 2014-12-02 12:15:16 -05:00
Hugo Trippaers a72f14ea9c Ensure the response is a proper http response. 
Tested that cloud-set-guest-password.sh still works after this change.

Reviewed-by: Daan Hoogland <daan@onecht.net>
 2014-12-02 16:36:49 +01:00
Daan Hoogland 6dd30eaf14 CID-1256273/CID-1256274/CID-1256275 leaky resources plus switch 
statement warning

reviewed by Wilder Rodrigues
 2014-12-02 16:14:34 +01:00
Gaurav Aradhye 98d75b0259 CLOUDSTACK-7991: test_security_groups.py - Move config data to test_data.py and fix pep8 issues 
Signed-off-by: Pierre-Luc Dion <pdion891@apache.org>
 2014-12-02 10:03:41 -05:00
Gaurav Aradhye 818957de0c CLOUDSTACK-7991: test_security_groups.py - Move config data to test_data.py and fix pep8 issues 
Signed-off-by: Pierre-Luc Dion <pdion891@apache.org>
 2014-12-02 09:56:49 -05:00
Rohit Yadav f40e31e061 CLOUDSTACK-7563: Fix potential NPE in checking answer 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d42e3df9cf)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-02 16:46:09 +05:30
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
Rohit Yadav d42e3df9cf CLOUDSTACK-7563: Fix potential NPE in checking answer 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-02 16:14:29 +05:30
Chandan Purushothama 4c21172f3b CLOUDSTACK-7979 : Fixed the script 'test_security_groups.py' - Zone Network Type Information should to be passed to VirtualMachine create method 2014-12-02 15:44:22 +05:30
Gaurav Aradhye 3d279bbb19 CLOUDSTACK-7993: Code enhancement - test_egress_fw_rules.py - Removing unncessary waits 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-02 15:40:47 +05:30
Gaurav Aradhye 6a2c18a989 CLOUDSTACK-7993: Code enhancement - test_egress_fw_rules.py - Removing unncessary waits 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-02 15:36:13 +05:30
Gaurav Aradhye 2fa1b02e3c CLOUDSTACK-8001: test_add_remove_network.py - Tag invalid test case as invalid 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-02 15:33:09 +05:30
Gaurav Aradhye e6236297a1 CLOUDSTACK-8001: test_add_remove_network.py - Tag invalid test case as invalid 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-02 15:32:33 +05:30
Sheng Yang 77c88fa917 CLOUDSTACK-7999: Always override local keystore file with the entry in DB 2014-12-01 19:03:23 -08:00
Sheng Yang c987080c26 CLOUDSTACK-7999: Always override local keystore file with the entry in DB 2014-12-01 18:59:25 -08:00
Logan Barfield 3a36681b6e Fixed root disk resize on deploy for RBD. 
Signed-off-by: Wido den Hollander <wido@widodh.nl>
(cherry picked from commit 3a52a83fae)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
 2014-12-02 01:56:37 +05:30
Rohit Yadav 0d01bc625c Ho ho ho! 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-01 22:44:20 +05:30
Sebastien Goasguen 7d3b79a275 Jingle Bells, Jingle Bells 2014-12-01 10:23:45 -05:00
Hugo Trippaers ae0cb82792 Both scripts should be able to use the data-server introduced in 4.4 2014-12-01 14:56:58 +01:00
Wei Zhou bf9e1ae7e8 Deploy vm to specified host through Infrastructure -> Hosts -> <Select one> -> View Instances -> Add Instance 
(cherry picked from commit ce2b2a1fc7)
 2014-12-01 14:50:01 +01:00
Wei Zhou ce2b2a1fc7 Deploy vm to specified host through Infrastructure -> Hosts -> <Select one> -> View Instances -> Add Instance 2014-12-01 14:47:06 +01:00
Koushik Das c3515c9ff9 CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash 
Ensure that VR is re-booted when it is moved to another host out-of-band. This is necessary to re-program all network rules

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-12-01 18:49:09 +05:30
Koushik Das 513adab51b CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash 
Ensure that VR is re-booted when it is moved to another host out-of-band. This is necessary to re-program all network rules
 2014-12-01 18:09:58 +05:30
Wei Zhou 21b0ad4a62 Remove error message when start management server if JAVA_HOME is not set 
(cherry picked from commit 449d123ce7)
 2014-12-01 13:38:27 +01:00
Wei Zhou 449d123ce7 Remove error message when start management server if JAVA_HOME is not set 2014-12-01 13:25:00 +01:00
Loic Lambiel 99cb19787e CLOUDSTACK-7404: Failed to start an instance when originating template has been deleted 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit c1bf7eeeee)
 2014-12-01 13:05:12 +01:00