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

8703 Commits

Author SHA1 Message Date
Jayapal
26ac4dd395 CLOUDSTACK-7615: Update log msg to print error msg rather than exception 
(cherry picked from commit 1d01ee3a60259b2113d14c2890306d7f2e56fbff)
 2014-10-13 00:06:40 -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
6e04f93785 CID-1192822: ids is a List<Long>, the cast to List<?> is removed 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 92858afd55a2a19cf698bbbf34c891fbf8087e9d)
 2014-10-12 23:58:17 -04:00
Rohit Yadav
4d8dfc9b7c CID-1192810: Remove useless control flow 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f74446a195d2a0fa4f1380254416a8a8538a6893)
 2014-10-12 23:58:06 -04:00
Rohit Yadav
ff42d5ad54 CID-1211005: Fix comparison, Class<?> is always instance of Class 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 59482b3eba268570885d64dc9b0527a90cabbc07)
 2014-10-12 23:57:53 -04:00
Rohit Yadav
a35521315e CID-1223274: Remove dead local storage code from VolumeApiServiceImpl 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 60e492aeb9a9ea53f6e741ec6718c618a9b27aeb)
 2014-10-12 23:57:13 -04:00
Koushik Das
1b0618d39c CLOUDSTACK-7595: Config parameters "job.expire.minutes" and "job.cancel.threshold.minutes" incorrectly getting multiplied by a factor of 60 
Removed the unnecessary multiply factor for both the config parameters. Also removed the duplicate entries from Config.java as these are not required

(cherry picked from commit a6ee4112a54043033233334c900d9bcd1cebf157)
 2014-10-12 23:43:01 -04:00
Nitin Mehta
988b9efc97 CLOUDSTACK-7588: [Vmware] Creating templates (with same names) from volumes get deleted from CS. Fix it by changing the unique name generation to the standard one used by registertemplate. Also cleaned up vmtemplatevo which had too many constructors. 
(cherry picked from commit 082aed3d33109903208014432eebbe3e69737d4e)
 2014-10-12 23:39:21 -04:00
David Nalley
ffe846673c more revert cleanup 2014-10-12 23:31:17 -04:00
David Nalley
3cac7f01bb Revert "CLOUDSTACK-6278" 
This reverts commit bc2ec23d09e28b30a9cc3cb4a7d6f52c8e718fcf.
 2014-10-12 23:19:30 -04:00
Hugo Trippaers
cf4ff03c90 CID-1191682 Fix missing break statement 2014-09-19 08:28:42 +02:00
Frank Zhang
b11e3bc60a CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-18 16:54:37 -07:00
Frank Zhang
bc2ec23d09 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-18 16:54:37 -07:00
Koushik Das
4e07dd1dc4 CLOUDSTACK-7581: Empty 'ID' parameters allowed in API calls 
Fix is to fail API calls with empty 'id' parameter value upfront rather than going ahead and failing with NPE later on
 2014-09-18 17:10:25 +05:30
Daan Hoogland
dec9133dcd CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval 
(cherry picked from commit 4d065b9a3a336d59902c266202c1094509c007d2)

Conflicts:
	plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
	plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/resource/DiscovererBase.java
 2014-09-18 12:51:10 +02:00
Rohit Yadav
bfa36c0280 CID-1233090, CID-1233089: Synchronize on session object in ApiServer 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-18 11:26:20 +02:00
Rohit Yadav
190bd38026 server: remove unused imports that failed build in last run 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-17 16:53:32 +02:00
Rohit Yadav
369b5b439b CID-1192812: Remove dead code from DataCenterJoinDaoImpl 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-17 16:29:03 +02:00
Rohit Yadav
bfd8af0751 CID-1192811: Remove dead local store from VolumeJoinDaoImpl 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-17 16:27:41 +02:00
Rohit Yadav
c27dd6293e CID-1233085: Fix potential NPE in AccountManagerImpl from VpcManagerImpl 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-17 15:56:03 +02:00
Rohit Yadav
a5004e37ad CID-1233084: Fix NPE in persisting volume in VolumeApiServiceImpl 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-17 10:39:53 +02:00
Rohit Yadav
bdee5e3734 CID-1233086: Fix potential NPE blowup in UserVmManagerImpl 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-17 10:32:23 +02:00
Anthony Xu
cb45133799 for windows guest OS, configure gateway for each nic 2014-09-16 14:33:22 -07:00
Rohit Yadav
a1e8d5eefb CID-1233087: In case of no virtual routers, fail early 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-16 17:27:32 +02:00
Rohit Yadav
fbbd2f8932 CID-1233088: In case there is no GSLB SP, throw cloud exception 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-16 17:17:11 +02:00
Anthony Xu
15a3bb318f When deploying a VM with startvm=false, the root volume is in Allocated state, the root volume is not created in primary storage yet. 
need to handle restoreVM for VM which is above status.
 2014-09-15 18:49:15 -07:00
Nitin Mehta
0a4ab3251a CLOUDSTACK-7513: listServiceOfferings API when called with VM's id also returns offerings to which it cant be upgraded. Adding the logic that when vmid is passed it looks for compatible offerngs using the storage type (local/shares), storage tags and also compute (cpu,speed, memory) in case the vm is running. 
Also changed the scaleVm API to upgrade only when the destination offering has storage tags as a subset of current offering tags.
 2014-09-15 11:02:34 -07:00
Saksham Srivastava
8c671c49b3 CLOUDSTACK-7548:removeNICFromVM should check for networkId while checking for PF rules on the nic 2014-09-15 19:15:09 +05:30
Devdeep Singh
283666b038 Password is logged in api server logs while creating a storage pool and while 
adding an image store of type SMB. Cleaning the message before logging.
 2014-09-12 14:31:17 +05:30
Frank Zhang
7a555b398f CLOUDSTACK-7523 
java.lang.NullPointerException when listing accounts
 2014-09-10 14:43:41 -07:00
Frank Zhang
e06fa18ed2 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-10 14:43:41 -07:00
Ilia Shakitko
70142c4acb Added "usageid" parameter to the "listUsageRecords" API call. Can be used only together with "type" parameter specified 
Signed-off-by: Ilia Shakitko <i.shakitko@tech.leaseweb.com>
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-10 12:19:34 +02:00
Rohit Yadav
91fd8d7cd5 CLOUDSTACK-7528: More verbose logging when sending alert fails 
When sendAlert is called on an AlertManager impl, if it fails it logs that
something was wrong but does not log the body of the issue/error. This means
we tell the user/admin that there was an issue but don't share the "issue"
with them at all as the email alert fail (or that they were not initialized).

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

Conflicts:
	server/src/com/cloud/alert/AlertManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java
 2014-09-10 11:38:47 +02:00
Anthony Xu
63ea596ba2 removed unused class 
engine/schema/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
 2014-09-09 18:31:13 -07:00
Kishan Kavala
c773754fda CLOUDSTACK-7504,CLOUDSTACK-7507: For LXC host maintenance, migrate system Vms and schedule restart of users Vms 2014-09-08 18:13:11 +05:30
Frank.Zhang
10544e287b CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-05 16:28:34 -07:00
Frank Zhang
197332464f CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-05 16:28:33 -07:00
Nitin Mehta
f9d7a12a57 CLOUDSTACK-7481: Assertion/exception in listVolumes call from UI with assert enabled 
searchForVolumesInternal() indicated some inconsistency in the use of entity().isDisplayVolume() property – used twice as “display” and “displayVolume” in search criteria. And then exception/assert happens while setting the property.
Correcting the issue.
 2014-09-05 11:35:11 -07:00
Will Stevens
b145a7d140 null deref when no project found 2014-09-05 10:06:25 -04:00
Harikrishna Patnala
5d389b1a71 CLOUDSTACK-5992: default values of configuraiton parameters in configuration table are set NULL on fresh setup Some configuration parameters have Component names different from fresh and upgrade setup 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
 2014-09-05 14:59:33 +05:30
Edison Su
ce82ab605d listhost api needs to return host_details table 2014-09-04 17:57:24 -07:00
Will Stevens
0fa0320860 CLOUDSTACK-7418 and CLOUDSTACK-7488 - Fixed LB removal if cert is associated 2014-09-04 14:11:21 -04:00
Will Stevens
cacbc80ab1 Merge branch 'origin/CLOUDSTACK-7468' 2014-09-04 14:08:07 -04:00
Will Stevens
18653f6cd6 CLOUDSTACK-7418 and CLOUDSTACK-7488 - Fixed LB removal if cert is applied 2014-09-04 13:02:12 -04:00
Kishan Kavala
6f7c4863a2 CLOUDSTACK-7473: Vm migration is not supported for LXC. When host is put in maintenance mode, stop the Vms instead of migrating 2014-09-04 20:59:19 +05:30
Fred Clift
355eb72c7d make virtual router /latest/.htaccess file be static - no longer dynamically generate it, remove code that managed the file previously 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-09-04 04:22:27 -04:00
Mike Tutkowski
1d2f3300ad Adding support for SolidFire snapshots 2014-09-03 20:09:00 -06:00
Will Stevens
5d11385c31 CLOUDSTACK-7468: Fixed the NetScaler SSL Termination behavior with Projects 
Signed-off-by: Will Stevens <wstevens@cloudops.com>
 2014-09-03 10:07:19 -04:00
Hugo Trippaers
dc3f0cbc63 Improve the handling of the findbug exclude files 2014-09-03 10:41:22 +02:00
Min Chen
47365ac4ba Fix incorrectly written unit tests. 2014-09-02 17:55:44 -07:00