21627 Commits

Author SHA1 Message Date
Alena Prokharchyk
bd6f706b72 CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API
Conflicts:
	engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
	engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
	plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/alert/AlertManagerImpl.java
	server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
	server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java
	usage/src/com/cloud/usage/UsageManagerImpl.java

listAlerts: introduced new parameter "name" to the alertResponse

Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
	server/src/com/cloud/alert/AlertManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java

Added new Admin API - generateAlert. Available to ROOT admin only

Conflicts:
	api/src/org/apache/cloudstack/alert/AlertService.java
	api/src/org/apache/cloudstack/api/BaseCmd.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java

listAlerts: implemented search by alert name

Conflicts:
	api/src/org/apache/cloudstack/alert/AlertService.java
	api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
	engine/schema/src/com/cloud/alert/AlertVO.java
2013-12-04 10:05:46 -08:00
Brian Federle
751d8d1966 CLOUDSTACK-2570: Fix duplicate resource name field 2013-12-04 09:50:46 -08:00
Brian Federle
2ed41270ce 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:39:52 -08:00
Brian Federle
8e06cf5593 VR UI actions: Fix incorrect response object referenced on action complete 2013-12-04 09:38:47 -08:00
Brian Federle
10cd11637a CLOUDSTACK-5266: Fix quickview not working for VR sections 2013-12-04 09:00:16 -08:00
Chris Suich
4ecf6df5f6 Fixed issue with ListView 'needsRefresh' overlays not being removed
JIRA-5368
2013-12-04 07:38:03 -08:00
Devdeep Singh
13740ac135 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 20:36:49 +05:30
Likitha Shetty
f37057a215 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:19:17 +05:30
Girish Shilamkar
dfff362c11 CLOUDSTACK-5351: Fixed a regression where shared_ntwk_vlan was not changed to shared_vlan 2013-12-04 18:54:50 +05:30
Ashutosh K
b2c8955222 CLOUDSTACK-5364: Resolving network cleanup issue in egress fw rules test cases 2013-12-04 18:41:10 +05:30
Jayapal
f2c7db9947 Corrected parsing vlan tag in JuniperSrx resource 2013-12-04 16:17:05 +05:30
Rajesh Battala
9d50b0bb68 Adding cifs support to systemvm 64bit to support Hyperv 2013-12-04 15:53:27 +05:30
Donal Lafferty
3f8741a4ec Changes for fixing the hyperv agent build on windows using mono. 2013-12-04 12:21:36 +05:30
Ashutosh K
4b5a0ca4c2 CLOUDSTACK-5230: Removing test cases' dependency on each other leading to failures 2013-12-04 11:37:22 +05:30
Gaurav Aradhye
291eafadae CLOUDSTACK-5347: Resolved issue related to snapshot state 2013-12-04 11:32:36 +05:30
Gaurav Aradhye
6b955958c6 CLOUDSTACK-5333: Code changes related to snapshots listing
Signed-off-by: Girish Shilamkar <girish@clogeny.com>
2013-12-04 11:29:50 +05:30
Bharat Kumar
e5cfe94818 CLOUDSTACK-5160 add a map to specify the custom compute parameters in the deployvm api.
Signed-off-by: Jayapal <jayapal@apache.org>
2013-12-04 11:28:45 +05:30
Gaurav Aradhye
f05063f377 CLOUDSTACK-5346: Fixed shared network cleanup issue 2013-12-04 11:25:58 +05:30
Devdeep Singh
d26b9ac00e Fix for live migration of vm. Use the host name as the migration
destination. Also mapped the vm state corrected in check vm on host
answer.
2013-12-04 10:31:02 +05:30
Devdeep Singh
5a96307fbf Changes for allowing migration of a vm on hyperv. Migration was blocked in cloudstack for hyperv.
Enabled it. Also updated the agent code to allow hyperv migration.
2013-12-04 10:29:36 +05:30
Min Chen
f420b74890 CLOUDSTACK-5355: addImageStore should not log password in clear text in
the log.
2013-12-03 16:55:26 -08:00
Brian Federle
1c4f1deaa8 CLOUDSTACK-4061: Fix wrapping text with ja ui 2013-12-03 15:45:35 -08:00
Brian Federle
c77dca2d3e CLOUDSTACK-5301: Show VPC routers on main VR page, to support upgrade feature 2013-12-03 15:36:46 -08:00
Brian Federle
b84f5791c3 Dashboard, alerts: Fix width of title 2013-12-03 15:20:38 -08:00
Nitin Mehta
03c78247cc CLOUDSTACK-3364:
change updateIsoPermissions API to accept isextractable paramter from normal user
2013-12-03 14:55:39 -08:00
Jessica Wang
2cbaf04b97 CLOUDSTACK-4738: UI > VM Wizard > deployVM API has been changed to take in one new parameter CUSTOM_PARAMETERS instead of 3 parameters CPU_NUMBER/CPU_SPEED/MEMORY. Here is corresponding UI change. 2013-12-03 13:12:46 -08:00
Brian Federle
bd1c28573e Zone wizard UI: Fix CSS for progress box at end of flow 2013-12-03 12:33:42 -08:00
Brian Federle
af3add9353 CLOUDSTACK-5114: Remove checkbox column from dialog list view 2013-12-03 12:33:09 -08:00
Brian Federle
b4dd3747f3 Dialog list view: Fix toolbar/header positioning 2013-12-03 12:33:09 -08:00
Murali Reddy
d97345f0a2 fixing copy paste error in getting alert type in alert manager 2013-12-03 16:16:10 +05:30
Girish Shilamkar
c39bc04be6 CLOUDSTACK-5337: Trimming account name (username) to 99 characters 2013-12-03 15:59:42 +05:30
lafferty
d2bf5c9d5e bug CLOUDSTACK-5339 2013-12-03 15:56:00 +05:30
Anshul Gangwar
cc86599c4d adding missing license headers for cs files 2013-12-03 15:53:39 +05:30
Anthony Xu
5a062e155c put shell scripts to a seperate directory in XS
use same scripts for both XS and XCP
2013-12-03 02:05:34 -08:00
Anshul Gangwar
30db5d648b code to install and uninstall agent as windows service 2013-12-03 12:17:56 +05:30
Rajesh Battala
1d3a4f4645 Fixed issues on HyperV Agent code for shared network VR issues 2013-12-03 12:17:32 +05:30
Rajesh Battala
4a61e928c4 Added hv kvp daemon support for 64 bit systemvm template to support system vms to run on HyperV. hv_kvp daemon is used to pass the boot args from host to the guest. 2013-12-03 12:17:09 +05:30
Rajesh Battala
4d187192b3 Fix VM stats collections in HyperV 2013-12-03 12:16:53 +05:30
Rajesh Battala
875e1ea281 Added contextMap data to all the command responses in HyperV 2013-12-03 12:14:56 +05:30
Nitin Mehta
d5e497859f CLOUDSTACK-4881:
changeServiceForVirtualMachine API should be used to scale up a stopped vm only
2013-12-02 17:27:13 -08:00
Jessica Wang
71fd0a49e3 CLOUDSTACK-4738: UI > Instances > Change Service Offering > dialog > add 3 new fields: CPU speed, CPU number, memory.
Show the 3 new fields when selected compute offerings is custom. Hide them otherwise.
2013-12-02 16:11:05 -08:00
Jayapal
cd6e6a4d3c CLOUDSTACK-1762 Fixed assigning network or broadcast ip to nic 2013-12-02 11:05:41 +05:30
Bharat Kumar
68406ba29d CLOUDSTACK-5161 enable scaling of a vm using custom offering
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-29 17:53:33 +05:30
Wei Zhou
abd4a826e9 Revert "CLOUDSTACK-5033: set origin ip address in logs if management servers is behind a reverse proxy or load balancer"
This reverts commit 5cc47f77c5d7c1c8c40c5e7cb2f7083fd2ce56cd.
2013-11-29 10:52:51 +01:00
Wei Zhou
6ab27267be CLOUDSTACK-5310: fix issue: offering display twice in dropdown when create network 2013-11-29 10:40:33 +01:00
Wei Zhou
5cc47f77c5 CLOUDSTACK-5033: set origin ip address in logs if management servers is behind a reverse proxy or load balancer 2013-11-29 10:39:04 +01:00
Hugo Trippaers
36201b9776 Fix issue with sourceCidr not being passed to the VRouter on start.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-11-29 13:20:12 +05:30
Likitha Shetty
6bda2739c8 CLOUDSTACK-5302. listHosts API response - value of cpuallocated is always 0% 2013-11-28 15:52:42 +05:30
Wei Zhou
81c07f1791 allow delete snapshot with ERROR state 2013-11-28 10:48:07 +01:00
Wei Zhou
d473d5a36a CLOUDSTACK-5293: get vm disk statistics only from DISK (not for ISO/FLOPPY) 2013-11-28 10:47:51 +01:00