apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
21,624 Commits 304 Branches 324 Tags
Commit Graph

7673 Commits

Author SHA1 Message Date
yichi.lu
f194adb2de Remove the comparison between GuestOSCategoryVO.CATEGORY_NONE and guestOSCategory.getName() to make OS category of None to be a valid option. 
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
 2013-12-09 15:48:34 +01:00
Alex Ough
100dc368c2 CLOUDSTACK-3190 2013-12-09 12:16:21 +05:30
Kelven Yang
aa72b76aec CLOUDSTACK-669: put system vm work under new vmsync model 2013-12-06 16:53:11 -08:00
Alena Prokharchyk
96eeceba8b CLOUDSTACK-5390: obey page/pageSize parameters in listNetworks call 2013-12-06 16:48:04 -08:00
Fang Wang
15338e42a8 cloudstack-4308 Add API listCapabilities for KVMSnapshotEnabled so that UI can use it for recurring snapshot. 
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
	api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
	server/src/com/cloud/server/ManagementServerImpl.java

Conflicts:
	api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
 2013-12-06 16:05:57 -08:00
Prachi Damle
5475312612 CLOUDSTACK-5399: Add option to createVolume API to specify a VM, to place the volume appropriately and attach immediately 
Changes:

    - Added 'virtualmachineid' parameter to the createVolume API to specify a VM for the volume. The Vm should be in 'Running' or 'Stopped' state.
    - This parameter is used only when createVolume API is called using snapshotid parameter
    - When this parameter is set, the volume is created from the snapshot in the pod/cluster of the VM. Also the volume is then attached to the VM in the same request
    - If attach Volume fails but create has succeeded, the API errors out but the Volume created remains available. User may attach the same volume later
    - When Vm is provided, but if no storage pool is available in the VM's pod/cluster then the volume is not created and API fails.
 2013-12-06 11:18:26 -08:00
Prachi Damle
60cca0f65e CLOUDSTACK-5140: A stopped vm cant start after disable threshold has been reached on the storage pool 
Changes:
- Do not do the stoarge capacity check for a VM having READY Volumes that are already present on the storagepool.

Conflicts:

	server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
 2013-12-06 11:18:23 -08:00
Anthony Xu
70c9781e9c 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:20:30 -08:00
Nitin Mehta
ed1f3d9ed6 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:37:01 -08:00
Nitin Mehta
98ee087d31 CLOUDSTACK-4880: 
check for host cpu capability while dynamic scaling a vm on the same host
 2013-12-05 14:31:27 -08:00
Syed Ahmed
ee7380ace2 CLOUDSTACK-5296: Add certificate chain support for netscaler 
This patch adds support for trust chains in the netscaler.

I initially planned on using the 10.1 API's "bundle" feature but during
my testing I found that was not working. So I am doing the chain linking
myself. Also NS can have only one entity of a certificate ie lets say
two different users try to add the same certificate on the netscaler
only one of them will go through. The other one says resouce already
exists even though they have different files.

This can be a problem in trust chains where the chain can be shared
between multiple accounts/certificates. So, I am using the figerprint as
an identifier of a certificate and making sure that we delete it only
when no one references it.
 2013-12-05 15:35:28 +05:30
Anthony Xu
04b48ae04e XS VMmetadata platform contains virtual platform related info, CS should save platform info in DB to migrate the VM to other Cluster 2013-12-05 01:41:14 -08:00
Alena Prokharchyk
f1973340d3 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 
Conflicts:
	server/src/com/cloud/user/AccountManagerImpl.java
 2013-12-04 11:55:27 -08:00
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
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
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
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
Nitin Mehta
03c78247cc CLOUDSTACK-3364: 
change updateIsoPermissions API to accept isextractable paramter from normal user
 2013-12-03 14:55:39 -08:00
Murali Reddy
d97345f0a2 fixing copy paste error in getting alert type in alert manager 2013-12-03 16:16:10 +05:30
lafferty
d2bf5c9d5e bug CLOUDSTACK-5339 2013-12-03 15:56:00 +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
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
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
221aea5730 CLOUDSTACK-5299: set hypervisor_type of volumes from image format if not set. 2013-11-28 10:47:21 +01:00
Abhinandan Prateek
ab39b658ad added valid values for system.vm.default.hypervisor in desc 2013-11-28 09:24:32 +05:30
Alena Prokharchyk
426f564944 Resource metadata support for NetworkACLItem 
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
 2013-11-27 14:38:12 -08:00
Wei Zhou
f17f35eeb8 CLOUDSTACK-5293: fix issue when collect vm disk statistics from iso 2013-11-27 14:38:25 +01:00
wilderrodrigues
226b193488 Fix for Coverity issues CID_1116744, CID_1116718 and CID_1116682, all related to resource leak 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2013-11-27 14:20:29 +01:00
wilderrodrigues
2774b62d64 Fixing bugs from Coverity related to Dereferenced Null after check and as return value. 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2013-11-27 11:18:00 +01:00
Alena Prokharchyk
7af387c894 Resource metadata support for NetworkACLList 
Conflicts:
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java
 2013-11-26 17:12:12 -08:00
Nitin Mehta
414d415dba CLOUDSTACK-5281: 
Resource limit shouldnt be counted for resources with display flag = 0. Adding functions to resourcelimitmanager and doing it for the volumes at the moment.
 2013-11-26 16:21:45 -08:00
Alena Prokharchyk
5d974a234c Resource metadata support for VPC Private Gateway 2013-11-26 12:48:15 -08:00
Nitin Mehta
6bea532efa CLOUDSTACK-5206: Ability to control the external id of first 
class objects. Putting in the generic methods and trying it
 for objects like vm, volume. This is the first cut
 2013-11-26 09:52:17 -08:00
Wei Zhou
9be402cb06 CLOUDSTACK-2940: Allowing Replacement of realhostip.com with a customized domain for SSVM 
(cherry picked from commit e23b10319f55fe8cbb822c0c29dc64b56509c119)

    Conflicts:

        plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java
        server/src/com/cloud/storage/upload/UploadMonitorImpl.java
 2013-11-26 15:01:23 +01:00
Wei Zhou
e0fbc3f147 CLOUDSTACK-5272: return unlimit if max.account.* or max.project.* is set to negative 
(cherry picked from commit 888ddd724aabbd22d675fe2bba873971888e1a8a)
 2013-11-26 14:43:23 +01:00
Bharat Kumar
ef40e156ed CLOUDSTACK-5162 Usage details are not getting populated when using dynamic offerings. 
Signed-off-by: Koushik Das <koushik@apache.org>
 2013-11-26 14:32:30 +05:30
Nitin Mehta
a1ca4f1d56 CLOUDSTACK-5221: 
In order to keep backward compatibility, listisos should return an empty response than an error when id of a removed iso is passed.
 2013-11-25 13:47:42 -08:00
Anshul Gangwar
102331c62e CLOUDSTACK-4959: added the connection and socket timeout parameters for SMTP and sending message in new thread so that HA doesn't get blocked beacause of hang in sending email alert 2013-11-25 15:52:33 +05:30
Min Chen
6227ba6356 CLOUDSTACK-5246:Xenserver - Hourly Snapshots - Creating snapshot from 
ROOT volume fails with NullPointer Exception due to new jobs framework
merge.
 2013-11-22 10:56:27 -08:00
Alena Prokharchyk
7df7abf327 Added missing @Inject to the ipAddressManager 
Conflicts:
	server/src/com/cloud/user/AccountManagerImpl.java
 2013-11-21 14:29:39 -08:00
Alena Prokharchyk
602d4ef0cf Resource metadata - support for VPC 2013-11-21 14:29:39 -08:00
Alex Huang
433a631916 Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00
Alex Huang
170f32f171 Broke up some long strings 2013-11-21 07:25:01 -08:00
Hugo Trippaers
cf715ff491 Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01:00
Alex Huang
d620df2bdd Reformatted all of the code. 2013-11-21 06:15:26 -08:00
Alex Huang
eaa250fd3c Formatted again after all the tab expansions and eol removals 2013-11-21 04:47:01 -08:00