24622 Commits

Author SHA1 Message Date
Jessica Wang
354cb21109 CLOUDSTACK-7637: UI > fix a bug produced by 4.5 feature "template accross multiple zones" > fix it by including all properties to jsonObj.
(cherry picked from commit 59b0103a5325074e0e0c105a9afd2b39a5e1117b)
2014-10-13 00:05:05 -04:00
sailajamada
2116f7dbb7 Additional Guest OS support for vGPU Test Automation
(cherry picked from commit 402a3323f87cdb7ae456d1486702269463c8b32c)
2014-10-13 00:04:44 -04:00
Gaurav Aradhye
ecb662517f CLOUDSTACK-7408: Fixed - Private key of the ssh keypair was getting corrupted
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
(cherry picked from commit e921ec6ec79c50096d58264d60c15091969ff888)
2014-10-13 00:04:23 -04:00
sanjeev
285cdae773 Test script to verify vm deployment with two networks in SG enabled advanced zone
Test data to deploy new data center and execute test using the deployed zone

Signed-off-by: sanjeev <sanjeev@apache.org>

Incorporated review comments provided in RR 25097

Fixed review comments mentioned in RR25293

Conflicts:

	tools/marvin/marvin/config/test_data.py

(cherry picked from commit 9e5da759b315955cf5bc8d606f6929ac1603708f)
2014-10-13 00:04:04 -04:00
Gaurav Aradhye
d6970d4514 CLOUDSTACK-7616: Fixed test_escalations_ipaddress.py - test suite should use its own vpc offering
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
(cherry picked from commit 0b9938ce40bd269639e91bf0e7bcfb36427cdaaa)
2014-10-13 00:03:29 -04:00
Gaurav Aradhye
f22b0cf76a CLOUDSTACK-7603: Fixed test_escalations_network.py - test suite should use its own vpc offering
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
(cherry picked from commit e5efa702bbd57a1855d68ea3df5c0aee3db85dcc)
2014-10-13 00:03:18 -04:00
Ashutosh K
20a0763b04 CLOUDSTACK-7499: Adding test cases for VMLC test path
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
(cherry picked from commit 05913e3cbda1be35f3247a970d66eb74bb3b1449)
2014-10-13 00:02:44 -04:00
Anshul Gangwar
42b604dc41 CLOUDSTACK-7610,CLOUDSTACK-7611,CLOUDSTACK-7612: Fixed following bugs in AlertsSyslogAppender 1. Added sync alert. 2. Changed unrecognised alerts are send as unknown instead of null. 3. Added unit tests to cover some more scenarios.
(cherry picked from commit 4eeae5ad51ce8d35701509cde9b99cee4ecaccc7)
2014-10-13 00:02:23 -04:00
Anshul Gangwar
e43d5b1c7d CLOUDSTACK-7575: improved performance of cleanString method in StringUtils
(cherry picked from commit 7972f53c8d35b78bd27cbd2c8bb1beb763b69c00)
2014-10-13 00:02:11 -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
sailajamada
09420dd0b1 List ISO's test to verify default ISO's are listed always
(cherry picked from commit d19a78ddf707397cee89cad076224752cc94e656)
2014-10-13 00:00:59 -04:00
Gaurav Aradhye
059633d09a CLOUDSTACK-7617: Removed hard coded VM names and skipped test cases according to the hypervisor support
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
(cherry picked from commit f4ef8363093c289bea09a2c5a81a49641b601c8d)
2014-10-13 00:00:38 -04:00
vetrivelc
3fd97ca3b8 Fixed Encoding issue to message_ja_JP & message_zh_CN properties files.
Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
(cherry picked from commit 03e3a39ede5c7be485effa32b31598af3165b5f5)
2014-10-13 00:00:19 -04:00
Jessica Wang
d39c29092b CLOUDSTACK-7634: UI > Project Dropdown on top menu > not all projects are populated when there are more than 500 projects in database.
(cherry picked from commit cb60b0a1c043bd9e3c8b9812f33a1a15fc9d8322)
2014-10-12 23:59:50 -04:00
Rohit Yadav
a329a9bda9 CID-1232342: Fix DLS in createOrUpdateRecord in GloboDnsResource
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit e70f75d6caefdf27f65997b027b9bd0812ae4a12)
2014-10-12 23:59:23 -04:00
Rohit Yadav
5309aa3dd9 CID-1222206: Remove DLS from XenServer56FP1Resource
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b3946802e3a94e60a567fd4cb56f9da8f481ab95)
2014-10-12 23:59:05 -04:00
Vincent Bernat
b4a2640764 CLOUDSTACK-7633: fix "Provides" in most LSB headers
In init.d scripts, the LSB header may specify what kind of service is
provided by an init script. If spaces are used, this means the init
script is providing several boot facilities. We fix that by using an
hyphen.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 2401eb927bbda69f0376d1f34ef20631e1188540)
2014-10-12 23:58:50 -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
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
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
Rohit Yadav
a420028d67 XenServer56FP1Resource: remove unused import
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 410092bbe1b81a254a207edf724b7768fcb5a9fc)
2014-10-12 23:57:25 -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
Saksham Srivastava
cd3df842f2 CLOUDSTACK-7631: Log rotate on VR may fail as /etc/init.d/rsyslog does not anymore support reload option on debian wheezy
(cherry picked from commit 3a8c450890299ba02bcc245d962b87da0306b2e1)
2014-10-12 23:55:42 -04:00
Devdeep Singh
43a9bbf509 CLOUDSTACK-7598: When a vm deployed by cloudstack is stopped on the hypervisor
(outside cloudstack), the state of the vm is not updated in cloudstack db. The
ping task was not checking for resource (host) status by default. The power
state of the vms is returned as part of the resource status. Fixed the issue by
making sure ping task atleast tries once to get the resource status.

(cherry picked from commit 55b4ead49594212ba55bfcf7007b0cae11bf68ba)
2014-10-12 23:55:17 -04:00
Chandan Purushothama
89736d011e CLOUDSTACK-7555 - Fixed the test_usage script - Template now belongs to the Regular Account to test TEMPLATE.CREATE Event
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
(cherry picked from commit f3252db797a6d53a1922a60b29cd6b4914de7d51)
2014-10-12 23:55:01 -04:00
Jayapal
7a4a0d7aaa CLOUDSTACK-7622: Fixed deleting network when provider is disable 2014-10-12 23:54:20 -04:00
Min Chen
3ebf49ab28 CLOUDSTACK-7628:VM Worker job should be expunged one hour after
completion instead of currently being expunged whenever cleanup task
thread is run.
(cherry picked from commit 4317a85e97643c681b98b3e58990ec2f22abedd8)
2014-10-12 23:53:56 -04:00
Jessica Wang
555b20f7ec CLOUDSTACK-7625: UI > IP Address page > EnableVPN > If createRemoteAccessVpn returns success, but the newly created remoteaccessvpn object's state is not Running, treat it as a failure.
(cherry picked from commit b592e0af345c38b5a898ec238bc4f2c8cedf6ef9)
2014-10-12 23:53:26 -04:00
Anthony Xu
d036168ecb cleaning up more conflicts 2014-10-12 23:52:53 -04:00
Anthony Xu
b4bddc61ac timeInSeconds * 1000
timeInSeconds is int type, if timeInSeconds is very big, it makes "timeInseconds * 1000" very small even 0

(cherry picked from commit f5eae55abb4591109dd22c1ba9d25f0876ebe52f)
2014-10-12 23:48:43 -04:00
sanjeev
5c2094eec1 CLOUDSTACK-6172: Adding new test case to verify this fix
Conflicts:

	test/integration/component/test_volumes.py

Signed-off-by: sanjeev <sanjeev@apache.org>

CLOUDSTACK-6172: Fixed review comments provided in RR 25771
(cherry picked from commit 2d19bcb46ad7c78b4842c1f52f552998a33f8836)
2014-10-12 23:47:05 -04:00
Rajesh Battala
f2eec470ab CLOUDSTACK-6603 [Upgrade]DB Exception while Autoscale monitoring after upgrading from 4.3 to 4.4
(cherry picked from commit c282bb3a1293fbbfdb306263ea52464862670fb3)
(cherry picked from commit fc7d0b2a333e510619f14528a72e35bbf9ed7045)
(cherry picked from commit 0c3d0cc954b7c276640a71b636f78928f55e97a2)
2014-10-12 23:46:05 -04:00
sanjeev
4076d87038 Creating custom disk does not work as expected
(cherry picked from commit 0d5a435f7669eddd44a6b62317fe26bb1d96e96c)
2014-10-12 23:45:27 -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
sanjeev
ce2fe3e5df In case of Hyper-v ssvm/cpvm reboot takes time so made changes to handle this
(cherry picked from commit 5bddebb8fc6eb85753a030f1d71fe2303969325b)
2014-10-12 23:42:40 -04:00
Prashant Kumar Mishra
b771b6ee72 CLOUDSTACK-7579 Adding a method to base.py to update storage pool
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
(cherry picked from commit 937aee34eded1a795b4eff3b7ebb59b8fbbef568)
2014-10-12 23:42:15 -04:00
Devdeep Singh
e0317eeec4 CLOUDSTACK-7494. Migration of a vm fails on Hyper-V. In an earlier commit as part of
cleaning up vmsync changes, checkvirtualmachine command was updated to return the
power state of the vm. The change was missed for Hyper-V. This caused migration to
fail on cloudstack even though it used to succeed on the hypervisor. Updated the
hyper-v agent code to return the cloudstack equivalent power state for check virtual
machine answer.

(cherry picked from commit 5350e61187d5b2f9fdc997dcc9fea34ff68148f7)
2014-10-12 23:40:37 -04:00
Min Chen
b979c6f0c7 CLOUDSTACK-7589: VM not Starting and always stuck in Stopped state after
management server restarts.

(cherry picked from commit 7cdb67dcf1ec4158ec0ab4c2fa868cc63121bbb5)
2014-10-12 23:40:07 -04:00
punith-cloudbyte
9bbcef4540 IOPS null issue CLOUDSTACK-7570
Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com>
(cherry picked from commit dd4f6bcaf3a380e52c987e4a400fce09fb180006)
2014-10-12 23:39:46 -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
Sangeetha Hariharan
8f4e8a4d79 CLOUDSTACK-7587 - Automation - Add simulator_only attribute to acl related test cases.
(cherry picked from commit 7877f3f9603b967680cf9480cb6e51845a81ddd8)
2014-10-12 23:38:53 -04:00
Gabor Apati-Nagy
4fd0799d30 CLOUDSTACK-7562: Details page for disk offerings only show details for write performance
-Fixed all related typos

Signed-off-by: Brian Federle <brian.federle@citrix.com>
(cherry picked from commit dbb70fadc0767974a7a87b4c5491ba9517ea1804)
2014-10-12 23:36:25 -04:00
Gabor Apati-Nagy
f456cda8cc CLOUDSTACK-7561: UI: After creating a new account, the "Add Account" dialog remains open
-Removed unused code that was causing javascript exception

Signed-off-by: Brian Federle <brian.federle@citrix.com>
(cherry picked from commit 30611be15abd4cd8843c10ddb2d3b131aea2cda3)
2014-10-12 23:35:30 -04:00
David Nalley
ffe846673c more revert cleanup 2014-10-12 23:31:17 -04:00
David Nalley
ac48aa8e0c cleaning up some from a revert 2014-10-12 23:30:04 -04:00
David Nalley
3cac7f01bb Revert "CLOUDSTACK-6278"
This reverts commit bc2ec23d09e28b30a9cc3cb4a7d6f52c8e718fcf.
2014-10-12 23:19:30 -04:00
Hugo Trippaers
e327716b89 Merge branch 'bugfix/CID-1114601' 2014-09-19 15:15:33 +02:00
Hugo Trippaers
4ad2734576 CID-1114601 to 1114604 Recommended practice is to test the result of
skip and read for EOF
2014-09-19 14:29:01 +02:00