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

25412 Commits

Author SHA1 Message Date
SrikanteswaraRao Talluri 63ff683b89 Merge branch '4.5' 2014-11-13 18:30:12 +05:30
Gaurav Aradhye b3faab6f42 CLOUDSTACK-7693: test_scale_vm.py - fix pep8 issues 
CLOUDSTACK-7878: Skip scale VM operation on vmware if vmware tools are not installed

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-11-13 18:28:13 +05:30
Gaurav Aradhye 46d9f8c6f5 CLOUDSTACK-7879: Skip dynamic scaling on vmware if vmware-tools are not installed 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-11-13 18:27:48 +05:30
SrikanteswaraRao Talluri 4bfb7f20c1 merging 2c08e30a49 from 4.5 
Merge branch '4.5'
 2014-11-13 18:11:49 +05:30
Chandan Purushothama 2c08e30a49 CLOUDSTACK-7894 : Fixed the script test_vm_passwdenabled.py - Test Cases failing on Simulator as Testcases try to ssh to the VMs 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-11-13 18:10:44 +05:30
SrikanteswaraRao Talluri fa4cc856aa bringing in bcf328833a from 4.5 
Merge branch '4.5'
 2014-11-13 17:58:56 +05:30
Chandan Purushothama bcf328833a CLOUDSTACK-7895 : Fixed the script test_security_groups.py - Test Cases failing on Simulator as Testcases try to ssh to the VMs 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-11-13 17:56:20 +05:30
Chandan Purushothama a02864ab8b CLOUDSTACK-7897 : Fixed the script test_reset_ssh_keypair.py - Test Cases failing on Simulator as Testcases try to ssh to the VMs 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-11-13 17:50:14 +05:30
Chandan Purushothama 765443e7d5 CLOUDSTACK-7897 : Fixed the script test_reset_ssh_keypair.py - Test Cases failing on Simulator as Testcases try to ssh to the VMs 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-11-13 17:49:22 +05:30
Rohit Yadav 5107472a01 CLOUDSTACK-6892: use lowercase noredist, as package.sh lowercases build type 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a18d067278)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-13 17:48:56 +05:30
Rohit Yadav a18d067278 CLOUDSTACK-6892: use lowercase noredist, as package.sh lowercases build type 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-13 17:48:11 +05:30
Santhosh Edukulla ef6ec7b276 Fixed few coverity issues like invalid boxing unboxing issues, resource leaks, null dereferences 2014-11-13 17:26:24 +05:30
Saksham Srivastava fc4dceaa99 CLOUDSTACK-7582: Update Storage Pool API does not update tags correctly 2014-11-13 17:01:06 +05:30
Rajani Karuturi 890f9eeb57 Merge branch '4.5' 2014-11-13 16:26:15 +05:30
Koushik Das f585dd2661 CLOUDSTACK-7902: Account creation results in exception in logs 
Event publish code was wrapped in transaction, moved it out
 2014-11-13 16:11:53 +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
Rajani Karuturi 8c9093b1df Merge branch '4.5' 
Conflicts:
	framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
	plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
	setup/db/db/schema-441to450.sql
	test/integration/component/test_escalations_instances.py
	ui/dictionary2.jsp
	ui/scripts/cloudStack.js

This closes #38
 2014-11-13 14:53:05 +05:30
Koushik Das 03e63a67e0 CLOUDSTACK-7902: Account creation results in exception in logs 
Event publish code was wrapped in transaction, moved it out
 2014-11-13 14:41:33 +05:30
Likitha Shetty b8fdda0a34 BUG-ID: CLOUDSTACK-7102. Volume migration fails with 'VM i-2-3-VM does not exist in VMware datacenter' expection. 
Look for a VM in vCenter based on both the vCenter name and CS internal name (required in case 'vm.instancename.flag' is enabled).
During Attach Volume and Volume Migration, for lookup and other operations use VM's name as obtained from vCenter instead of using the name set in the agent command.
 2014-11-13 12:58:56 +05:30
Mike Tutkowski 8b7c1d7c5e CLOUDSTACK-7898: Add properties file in same folder as template 2014-11-12 21:03:03 -07:00
Jessica Wang 9809164654 CLOUDSTACK-7896: UI > network > Add Guest Network > when zone dropdown is empty, do not make API call to get physical networks. 2014-11-12 16:25:41 -08:00
Jessica Wang 5d094e5cab CLOUDSTACK-7896: UI > network > Add Guest Network > when zone dropdown is empty, do not make API call to get physical networks. 2014-11-12 16:24:15 -08:00
Pierre-Luc Dion 6c955a3a47 CLOUDSTACK-7887: change int to str into swiftxen 2014-11-12 19:22:13 -05:00
Pierre-Luc Dion 5306e43d56 CLOUDSTACK-7887: change int to str into swiftxen 2014-11-12 19:21:37 -05:00
Chandan Purushothama 81e03c4c31 CLOUDSTACK-7788: Fixed the script 'test_dynamic_compute_offering.py' to be run only on hardware 2014-11-12 18:36:07 -08:00
Chandan Purushothama 57f6642234 CLOUDSTACK-7787: Fixed the script 'test_lb_secondary_ip.py' to be run only on hardware 2014-11-12 18:35:33 -08:00
Chandan Purushothama 540687c392 CLOUDSTACK-7786: Fixed the script 'test_haproxy.py' to be run only on hardware 2014-11-12 18:29:50 -08:00
Chandan Purushothama 172a0b7ee0 CLOUDSTACK-7811: Fixed the script 'test_persistent_networks.py' - Test Cases failing on Simulator due to hardware resources requirement for test execution 2014-11-12 18:26:56 -08:00
Chandan Purushothama f416c82f01 CLOUDSTACK-7812: Fixed the script 'maint/test_redundant_router_network_rules.py' - Test Cases failing on Simulator due to hardware resources requirement for test execution 2014-11-12 18:26:18 -08:00
Jessica Wang 60aab6bf17 CLOUDSTACK-7892: UI > instances > detailView > execute handlers attached to event 'cloudStack.module.sharedFunctions.addExtraProperties'. 2014-11-12 15:04:10 -08:00
Jessica Wang 30026ee175 CLOUDSTACK-7892: UI > stroage > volume > detailView > execute handlers attached to event 'cloudStack.module.sharedFunctions.addExtraProperties'. 2014-11-12 14:54:19 -08:00
Jessica Wang 7e7641f0e8 CLOUDSTACK-7892: UI > Infrastructure > zones > zone > detailView > execute handlers attached to event 'cloudStack.module.sharedFunctions.addExtraProperties'. 2014-11-12 14:42:13 -08:00
Sangeetha Hariharan b12207cf25 CLOUDSTACK-7891 - Fix failure in integration.component.test_escalations_instances.TestInstances/test_15_revert_vm_to_snapshot 2014-11-12 17:11:44 -08:00
Jessica Wang 8cf1102b0a CLOUDSTACK-7892: UI > Infrastructure > zone > physical network > guest > details tab > network tab > detail view > execute handlers attached to event 'cloudStack.module.sharedFunctions.addExtraProperties'. 2014-11-12 13:47:53 -08:00
Jessica Wang aff3a261e0 CLOUDSTACK-7892: UI > network > detailView > execute handlers attached to event 'cloudStack.module.sharedFunctions.addExtraProperties'. 2014-11-12 13:32:59 -08:00
Chandan Purushothama 76ef987e7c CLOUDSTACK-7876 - Fixed the script 'test_vpc_vm_life_cycle.py' - Destruction of VM before it can be recovered needs to be prevented 2014-11-12 16:04:55 -08:00
Mike Tutkowski 2042660a68 Added a "long getUsedIops(StoragePool)" method to the PrimaryDataStoreDriver interface 2014-11-12 13:38:58 -07:00
Prachi Damle a4b92e908a CLOUDSTACK-7590 Deletion of Account is not deleting the account from the database 
Revert "CLOUDSTACK-7073: Added domainId field to the user table in order to restrict duplicated users creation on the db level"

This reverts commit 5a96d8ef5c.

Conflicts:
	setup/db/db/schema-440to450.sql
 2014-11-12 11:48:36 -08:00
Prachi Damle 52bc084231 CLOUDSTACK-7590 Deletion of Account is not deleting the account from the database 
Revert "CLOUDSTACK-7073: Added domainId field to the user table in order to restrict duplicated users creation on the db level"

This reverts commit 5a96d8ef5c.

Conflicts:
	setup/db/db/schema-440to450.sql
 2014-11-12 11:01:36 -08:00
Brian Federle 68745ae9b1 CLOUDSTACK-7645: UI: Fix method for extending dictionary 
Instead of mapping both dictionary JSP files to separate objects, extend
dictionary2's object onto single 'dictionary' object.

-- The previous approach was causing issues on certain dialogs, which were not
opening due to possible missing labels.
 2014-11-12 09:57:42 -08:00
Mihaela Stoica 4e820b37b0 CLOUDSTACK-7645 
[UI] Fix incorrect strings 'label.no' and 'label.added.network.offering'

Conflicts:
	ui/dictionary2.jsp
 2014-11-12 08:24:10 -08:00
Mihaela Stoica d82e556dcd CLOUDSTACK-7645: [UI] Fixed incorrect label issues caused the dictionary split 
In some cases the UI does not display the correct text, displaying 'label.xyz' instead of the localized string.
This appears to be due to the dictionary split: entries in dictionary2.jsp are not found because the dictionary has not been extended with dictionary2 as expected.

In this fix:
- Instead of extending the dictionary, we leave it as it is and change the localization function to look in the dictionary first and, if the item is not found there, then look in dictionary2.
- This way we are not depending on the extent() function to be called at the 'right' time; In turn, the localization function will be aware of both dictionaries.
- In the future, when we add another dictionary, we will have to modify this function only.
 2014-11-12 08:21:42 -08:00
Min Chen 6df38427cf CLOUDSTACK-7566:Many jobs getting stuck in pending state and cloud is unusable. 
(cherry picked from commit a2d85c8cae)

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

Conflicts:
	framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
 2014-11-12 21:28:31 +05:30
Wido den Hollander 95daa14e2a CLOUDSTACK-7583: Fix NPE caused by previous commit 2014-11-12 16:54:20 +01:00
Wido den Hollander 69ee01af9d CLOUDSTACK-3383: Fetch CPU utilization more reliable. 
This should fix that we can't gather CPU statistics on hypervisors
> Ubuntu 12.04
 2014-11-12 09:54:54 +01:00
Damodar f1361796bf CLOUDSTACK-7886: cloudstackoperations like deployvm,deleteNW are failing if CS fail to contact rabbit mq server. This is happening in case of Async API calls. 
Signed-off-by: Koushik Das <koushik@apache.org>
 2014-11-12 10:24:56 +05:30
Damodar 50a3c0b2e3 CLOUDSTACK-7886: cloudstackoperations like deployvm,deleteNW are failing if CS fail to contact rabbit mq server. This is happening in case of Async API calls. 
Signed-off-by: Koushik Das <koushik@apache.org>
 2014-11-12 10:12:15 +05:30
Mike Tutkowski 5c388a5c80 Add properties file in same folder as template 2014-11-11 17:03:08 -07:00
Gabor Apati-Nagy 46e0a25069 CLOUDSTACK-3528: [UI] Fix list calls on accounts page 
Fix List calls in the processing state forever with invalid name
provided with Account name search filter -Added error handling for
Events, Instances, Network, Projects, Storage pages where an advanced
search by an invalid account name was making the UI to show in progress
state forever.
 2014-11-11 11:31:21 -08:00
Mihaela Stoica 6ac082b9d0 CLOUDSTACK-7318: [UI] Add error handler for VM snapshot creation 
Fixes the issue where processing wheel continue to spin even after error
message is displayed during VM snapshot creation
 2014-11-11 11:28:10 -08:00