25531 Commits

Author SHA1 Message Date
SrikanteswaraRao Talluri
0fd5475593 Merge branch '4.5'
* 4.5:
  CLOUDSTACK-7885 : Fixed the script '/maint/test_vpc_host_maintenance.py'
  CLOUDSTACK-7860: test_eip_elb.py - Move Netscler info out of the test case. Read it from config. Fix attribute error. Fix pep8 issues. Fix imports.
2014-11-14 16:49:51 +05:30
Chandan Purushothama
f92fa4257a CLOUDSTACK-7885 : Fixed the script '/maint/test_vpc_host_maintenance.py'
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-11-14 16:46:37 +05:30
Gaurav Aradhye
2bfddc55b8 CLOUDSTACK-7860: test_eip_elb.py - Move Netscler info out of the test case. Read it from config. Fix attribute error. Fix pep8 issues. Fix imports.
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-11-14 16:39:55 +05:30
Devdeep Singh
a60b729d0a Merge branch '4.5' 2014-11-14 14:14:26 +05:30
Devdeep Singh
a782495c68 CLOUDSTACK-7642. Class not found exception after upgrading from 4.3 to 4.5 on a
XenServer hypervisor setup. The resource path has changed for xenserver resources
in 4.5. On an upgraded setup the db entries in host table for the resource path
needs to be updated. Made a fix in the upgrade script.
2014-11-14 14:10:36 +05:30
Jayapal
7fd1e8e239 Merge branch '4.5' 2014-11-14 12:12:07 +05:30
Devdeep Singh
cfe5a6fcbf While adding secondary storage / is not added to secondary storage cifs url.
This causes it to fail if that path doesn't begin with '/'. It works fine
while adding primary storage. Added a check to add '/' in begining if needed.
2014-11-14 11:20:25 +05:30
Devdeep Singh
cffae8eef0 CLOUDSTACK-6924. To attach a volume if a volume needs to be moved to another storage
pool, the source and destination pools cannot be local and cluster/zone and vice versa.
Cloudstack detects it and throws a exception. However, the end user only sees an
unexpected exception and not the reason for failure. Fixed it by making sure the
reason for the failure is correctly captured and shown to the end user.
2014-11-14 11:19:19 +05:30
Damodar
7e6ec2ce82 CLOUDSTACK-7877: The NET.IPRELEASE events are not added to usage_event on IP range deletion from Physical Networks.
Signed-off-by: Jayapal <jayapal@apache.org>
2014-11-14 10:31:46 +05:30
Jessica Wang
e92f429463 CLOUDSTACK-7910: UI > Instance Wizard > declare serviceOfferingObjs before using it. 2014-11-13 16:26:09 -08:00
Jessica Wang
03505901bc CLOUDSTACK-7910: UI > Instance Wizard > declare serviceOfferingObjs before using it. 2014-11-13 16:24:41 -08:00
Brian Federle
9717bbdc51 CLOUDSTACK-7645: UI: Fix dictionary JSP include order
-Places dictionary JSP includes at top of script includes, to help solve
a potential issue where the dictionary may not always be loaded before
the UI initializes
2014-11-13 15:41:02 -08:00
Brian Federle
2ee3d4258e CLOUDSTACK-7645: UI: Fix dictionary JSP include order
-Places dictionary JSP includes at top of script includes, to help solve
a potential issue where the dictionary may not always be loaded before
the UI initializes
2014-11-13 15:25:12 -08:00
Brian Federle
8ec26fb531 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.

Conflicts:
	ui/dictionary2.jsp
2014-11-13 15:20:17 -08:00
Nitin Mehta
ade305be20 CLOUDSTACK-7909: Change the capacity_state in op_host_Capacity table only on explicit enabling/disabling of the host and remove the logic for changing it when cluster/pod/zone is enabled/disabled. Also add the logic in capacity checker thread so that previous changes finally get consistent with this new model and also its good to have it for sanity reasons. 2014-11-13 13:54:45 -08:00
Will Stevens
92d4a41a69 CLOUDSTACK-7822: Fixed SSL Cert Tests and relaxed chain validation 2014-11-13 09:55:49 -05:00
Sanjay Tripathi
057ba164f6 CLOUDSTACK-7905: Add OEL 6.5 32/64 bit guest os support. 2014-11-13 19:19:02 +05:30
Sanjay Tripathi
7f2219bcbb CLOUDSTACK-7904: EN-UK: CentOS 6.5 GUI: Key translation fails for some EN- UK keyboard keys. 2014-11-13 19:16:02 +05:30
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 2c08e30a493cb520eb478795bbc5d5d4935dd59b 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 bcf328833a84f1d490a774edb63af3e301cf0f5a 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 a18d067278f6b58914dc6a5d44b775ada6cf073e)
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