Commit Graph

21570 Commits

Author SHA1 Message Date
Brian Federle c00cf19662 Detail view: Allow passing error with custom action's complete fn 2013-12-06 12:34:53 -08:00
Brian Federle 9768dff666 Fix broken change password UI 2013-12-06 12:34:48 -08:00
Devdeep Singh 1a4604576a CLOUDSTACK-5339: Porting the fix for enabling vhdx virtual disk type for hyperv. 2013-12-06 18:05:50 +05:30
Anthony Xu 65642e98b7 XS VMmetadata platform contains virtual platform related info, CS should save platform info in DB to migrate the VM to other Cluster
fixed typo
2013-12-06 01:16:11 -08:00
Likitha Shetty bc86103c2b CLOUDSTACK-5216. delete volume failed due to Exception: java.lang.Exception" while destroying Vms 2013-12-06 12:00:44 +05:30
Santhosh Edukulla d21058c25e Enhanced few features under Marvin
Added few enhancements to marvin.
Added new module for Logging Facility to marvin.
Added new Init facility to marvin.
Currently, there are multiple ways we are doing logging
Removed few unwanted logging cases.
Removed few command line switch options for logging.
The new way of logging now provides consolidated logging
under one single folder timestamped under the configured
folder path.
Removed parsing configuration from deploydata center
Added parsing,start logging and deploy as part of init
Added new error handling facility to catch unknown exception from
test cases. Currently, lot of scripts are throwing unknown
exceptions, add a handler to plugin to dump them to a file

ToDO:
Will do clean up in phase2 for this patch.
Separate deployDatacenter from creating test client.
Clean up configGenerator
2013-12-06 12:05:22 +05:30
Frank.Zhang ba894cfe9a Merge branch '4.3' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.3 2013-12-05 22:29:02 -08:00
Frank.Zhang ae19fc98e1 add missing files during merging UCS 2013-12-05 22:28:20 -08:00
Likitha Shetty 6df26fe504 Since CLOUDSTACK-5336 is resolved, changing the log level to TRACE
Revert "CLOUDSTACK-5336. During regression automation management server hang with "out of memory error"."

This reverts commit c055417589.
2013-12-06 10:03:09 +05:30
Min Chen e33f8f2f44 Revert "CLOUDSTACK-4950: fix the problem to support sessions to multiple vCenter instance"
This reverts commit ed0fbcc81c.
2013-12-05 18:24:29 -08:00
Frank.Zhang 80e88dd482 fix merge error breaking compile 2013-12-05 18:04:58 -08:00
Frank.Zhang d3bff27ef9 CLOUDSTACK-5112
[Baremetal]Make IPMI retry times configurable

Conflicts:

	server/src/com/cloud/configuration/Config.java
	setup/db/db/schema-420to421.sql
2013-12-05 17:30:54 -08:00
Frank.Zhang 48a4391568 [UCS] increate ipmi command retry 2013-12-05 17:29:08 -08:00
Frank.Zhang fd5b9a2780 CLOUDSTACK-4674
[baremetal] /usr/share/cloudstack-common/scripts/util/ipmi.py script
need to recognize various ipmi version and BMC type of server
2013-12-05 17:28:20 -08:00
Frank.Zhang ef6038f1b3 commit 8edaf63c4e
Author: Frank.Zhang <frank.zhang@citrix.com>
Date:   Thu Oct 10 14:45:03 2013 -0700

    CLOUDSTACK-4850
        [UCS] using template instead of cloning profile
2013-12-05 17:25:57 -08:00
Jessica Wang 3b59dfebff UI > check in updated translation files for Siva Nata Sekhar Golla. 2013-12-05 16:48:00 -08:00
Nitin Mehta c06e69db19 CLOUDSTACK-5391:
check for host cpu capability while stop starting a vm on the same host. Also changed the FirstFitAllocator to use the same method.
2013-12-05 15:18:30 -08:00
Nitin Mehta 25e51a5716 CLOUDSTACK-4880:
check for host cpu capability while dynamic scaling a vm on the same host
2013-12-05 14:18:51 -08:00
Nitin Mehta 1cdc064c43 CLOUDSTACK-4880:
check for host cpu capability while dynamic scaling a vm on the same host
2013-12-05 14:14:31 -08:00
edison su dd34ae97fd Revert "Remove uncessary changes."
This reverts commit fcab2b776a.
2013-12-05 13:14:11 -08:00
Chris Suich 93b8511f6e Added load vs refresh context for dataProviders
CLOUDSTACK-5384
2013-12-05 11:14:20 -08:00
Frank.Zhang 59406cf225 Change security_group_agent python side in line with default
security group rules change in 4.2
2013-12-05 10:51:56 -08:00
Frank.Zhang e5e39577c0 Change security_group_agent python side in line with default
security group rules change in 4.2
2013-12-05 10:51:04 -08:00
Frank.Zhang fb1f3f0865 Add missing Baremetal security_group_agent java part
Change security_group_agent python side in line with default security
group rules change in 4.2

Conflicts:

	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
2013-12-05 10:50:25 -08:00
Likitha Shetty c055417589 CLOUDSTACK-5336. During regression automation management server hang with "out of memory error".
Adding logs to help debug OOM error.
2013-12-05 19:34:42 +05:30
Ashutosh K 0c64eda53f CLOUDSTACK-5381: Corrected code related custom host name (vm.instancename) 2013-12-05 16:27:02 +05:30
Anthony Xu cebc42f0dc after XS host reboot, all SG rules are gone, need to check if SG rules frame is there when program rules for VM, if not , create the SG rule frame 2013-12-05 02:12:58 -08:00
Anthony Xu 0847ccfe97 XS VMmetadata platform contains virtual platform related info, CS should save platform info in DB to migrate the VM to other Cluster
Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	server/src/com/cloud/template/TemplateManagerImpl.java
2013-12-05 01:17:56 -08:00
Rajesh Battala 26020fc078 added support to run hyperv agent on 0.0.0.0 and startuprouting command will discover the ip details and send in response 2013-12-05 14:46:44 +05:30
Gaurav Aradhye 60c180086e CLOUDSTACK-5377: Fixed test case dependency issue in snapshots test cases 2013-12-05 13:50:31 +05:30
Rajesh Battala ba73b2939a CLOUDSTACK-5312 added hyperv support in seeding the systemvm template script 2013-12-05 12:05:25 +05:30
Rajesh Battala 5d9ed55d99 Modified savepassword.sh path in Hyperv Resource according to the new template 2013-12-05 11:10:57 +05:30
Jessica Wang ea700ed631 CLOUDSTACK-999: HyperV - UI > Infrastructure > zone detail > physical network > Guest > Details tab > add HyperV Traffic Label field. 2013-12-04 16:28:47 -08:00
Nitin Mehta 86af80b0f5 fixing the test 2013-12-04 16:12:42 -08:00
Jessica Wang 3ed7831d87 CLOUDSTACK-5139: UI > zone wizard > secondary storage step > providers dropdown - hardcode options instead of get them from listStorageProviders&type=image since not all of returned values are handled by UI (e.g. "NetApp" is not handled by UI). 2013-12-04 15:01:38 -08:00
Jessica Wang 019316b002 CLOUDSTACK-5139: UI > Infrastructure > Secondary Storage > Add Secondary Storage > providers dropdown - hardcode options instead of get them from listStorageProviders&type=image since not all of returned values are handled by UI (e.g. "NetApp" is not handled by UI). 2013-12-04 14:54:31 -08:00
Nitin Mehta fee41bad41 CLOUDSTACK-5352:
CPU cap calculated incorrectly for VMs on XenServer hosts. It should not be limited by the overprovisioning and should set the cap as service offering
2013-12-04 14:48:41 -08:00
Jessica Wang 19e855e5dc CLOUDSTACK-5200: UI > Infrastructure > Sockets > listView > fix a bug that Hosts and Sockets displayed wrong number. 2013-12-04 14:10:56 -08:00
Nitin Mehta e85334ff51 CLOUDSTACK-5352:
CPU cap calculated incorrectly for VMs on XenServer hosts. It should not be limited by the overprovisioning and should set the cap as service offering
2013-12-04 14:10:28 -08:00
Frank.Zhang 6fa79efa95 Merge branch '4.3' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.3 2013-12-04 11:42:16 -08:00
Frank Zhang d4b068d2d8 CloudStack CLOUDSTACK-4224
UCS:UI: Delete UCS returns unknown API
2013-12-04 11:40:40 -08:00
Alena Prokharchyk 06d2e768b6 CLOUDSTACK-5152: when deployVm with SG, verify that vm and sg belong to the same account. Do this verification even when the call is done by the ROOT admin 2013-12-04 11:37:24 -08:00
Nitin Mehta ee82870aa2 CLOUDSTACK-5349:
Volume create usage event and resource count werent getting registered. Check its type rather than it is UserVm since the code is coming from VirtualMachineManager.
2013-12-04 10:53:42 -08:00
Brian Federle dd3a511c66 CLOUDSTACK-2570: Fix duplicate resource name field 2013-12-04 09:50:30 -08:00
Brian Federle d34efd2dcb Detail view: Fix error on refresh from async action
Fixes error on detail view actions when list view subsection has a custom ID
2013-12-04 09:40:16 -08:00
Brian Federle c1457fa1a4 VR UI actions: Fix incorrect response object referenced on action complete 2013-12-04 09:40:15 -08:00
Brian Federle 59c3006ff1 CLOUDSTACK-5266: Fix quickview not working for VR sections 2013-12-04 08:59:59 -08:00
Chris Suich a00f1887c4 Fixed issue with ListView 'needsRefresh' overlays not being removed
JIRA-5368
2013-12-04 07:42:00 -08:00
Likitha Shetty 2794a9398f CLOUDSTACK-5172. Detaching VM volume is not allowed if there are VM snapshots because any changes to the disk layout will break the semantics of VM-based snapshot 2013-12-04 20:17:58 +05:30
Devdeep Singh 3744deab14 CLOUDSTACK-5178: DeployVm from ISO fails. Fixed the creation of root
volume and made sure the iso is attached when a vm is deployed.
2013-12-04 19:59:40 +05:30