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,711 Commits 304 Branches 324 Tags
Commit Graph

7703 Commits

Author SHA1 Message Date
Alena Prokharchyk
9df10718e4 Resource metadata support for S2SVpnConnection 
Conflicts:
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java
	setup/db/db/schema-421to430.sql
 2013-12-12 16:39:02 -08:00
Nitin Mehta
b084cc469a CLOUDSTACK-5283: 
Not able to list snapshots when few snapshots are in "CreatedOnPrimary" state. Dont throw an exception when snapshot doesnt have an entry in the snapshot store ref for the snapshot in Image store because that fails to list all snapshots and also it can a perfect use case when the backup flag is not turned on.
 2013-12-12 13:18:56 -08:00
Alex Huang
cf0a11e45a pull merges 2013-12-12 13:00:26 -08:00
Alex Huang
be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
Alena Prokharchyk
9a21afb50b Resource metadata support for customer gateway 
Conflicts:
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java
 2013-12-12 10:16:30 -08:00
Alena Prokharchyk
cf84733f8b Resource metadata support for Site2SiteVpnGateway 
Conflicts:
	setup/db/db/schema-421to430.sql
 2013-12-12 10:15:36 -08:00
Antonio Fornie
7833dd592c JUnit test for NetworkACLManagerImpl#applyNetworkACL 
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
 2013-12-12 15:01:51 +01:00
Kishan Kavala
fa38a7a409 Upgrade router template by accountName and domainId instead of accountId 
Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2013-12-12 18:28:30 +05:30
Min Chen
010b007ee4 CLOUDSTACK-5414: With NFS Image Store migrated to S3 an error is thrown 
in creation of Virtual Router.
 2013-12-11 14:17:43 -08:00
Jayapal
b385cb4f7a Fixed test case failures in network acl 2013-12-11 14:20:11 +05:30
Jayapal
27ee78fe0a CLOUDSTACK-5244 Fixed issue with applying acl items of acl to private gateway 2013-12-11 11:02:15 +05:30
Harikrishna Patnala
5036097659 CLOUDSTACK-5419: missing parameters in configuration table and to remove unused parameters 
Signed-off-by: Koushik Das <koushik@apache.org>
 2013-12-10 16:49:44 +05:30
Jayapal
5c12250dea CLOUDSTACK-5278 Fixed cleaning up egress default rules on VR and SRX 
1. Egress default policy rules is send to the firewall provider. It is up to the
    provider to configure the rules.
   2. The default policy rules are send for both allow and deny default policy.
   3. On network shutdown rules for delete are send.
   4. For VR and SRX, by default deny the traffic. So no default rule to deny traffic is required.
 2013-12-10 14:19:03 +05:30
tuna
d910b42339 fix bean error 2013-12-10 11:30:55 +07:00
tuna
5e23f00b1a add Apache Licensed and add check native 2013-12-10 10:37:29 +07:00
tuna
f355359b23 fix issues 2013-12-10 10:37:28 +07:00
tuna
0b0e2627d6 fix duration 2013-12-10 10:36:30 +07:00
tuna
fca6d56681 remove private changes 2013-12-10 10:36:30 +07:00
tuna
dc151115be AutoScaling without NetScaler 2013-12-10 10:35:55 +07:00
Will Stevens
c60a256ebd fixed egress rules for palo alto plugin and cleaned up extra api calls on master 
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
 2013-12-09 18:26:57 -08:00
Murali Reddy
be67f5d17a CLOUDSTACK-5428: support NetScaler to be configured exclusively for GSLB 
service and not used for LB

Fix adds a boolean flag to addNetscalerLoadBalancer api, which
will mark added NetScaler for exclusive GSLB service. A netscaler marked
as exclusive gslb service provider is not picked for any guest network's
lb provider.
 2013-12-10 06:20:58 +05:30
Nitin Mehta
e79350d256 CLOUDSTACK-3664: 
scaling up vms was not considering parameter cluster.(memory/cpu).allocated.capacity.disablethreshold. Fixed it
Also added overprovisioning factor retrieval at the cluster level for host capacity check
 2013-12-09 15:40:17 -08:00
Prachi Damle
4a9da03760 CLOUDSTACK-5426 Cannot deploy instance having multiple volumes that use different storage tags for storage pools in same cluster 
Fixing the Imports missing
 2013-12-09 15:37:15 -08:00
Prachi Damle
5618a44ed0 CLOUDSTACK-5426: Cannot deploy instance having multiple volumes that use different storage tags for storage pools in same cluster 
Changes:
- We need to reset the avoid set to its original state while calling the storage pool allocators for each volume.
- This will prevent affecting allocation of the disks due to the avoid set output of the prior disk allocations.

Conflicts:

	server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
 2013-12-09 15:37:13 -08:00
tuna
61e80f030a remove unused code 2013-12-09 23:33:15 +07:00
tuna
015ab6af8a fix rebase master 2013-12-09 23:33:14 +07:00
tuna
9f82757eb9 tuna 2013-12-09 23:33:14 +07:00
tuna
3df8b912fc add kvm support & LB service 2013-12-09 23:33:14 +07:00
tuna
d935d3865a tuna 2013-12-09 23:33:14 +07:00
Kishan Kavala
587f587621 CLOUDSTACK-5145 : Added permission checks while listing network ACLs and acl Items. Users will be able to list items that they have access to. 
Conflicts:
	api/src/com/cloud/network/vpc/NetworkACLService.java
	api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
	server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
	server/test/com/cloud/vpc/NetworkACLServiceTest.java
 2013-12-09 21:57:47 +05:30
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