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

360 Commits

Author SHA1 Message Date
Mike Tutkowski
03118c2969 Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) 2014-01-09 14:44:35 -07:00
Wei Zhou
f012a2655d CLOUDSTACK-5404: Fix timezone bug in network usage 
(cherry picked from commit d5277a81e644c6db30cff12878cd3708aa28cc86)

Conflicts:

	engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java
 2014-01-09 14:07:53 +01:00
Rajani Karuturi
f741d99c80 CLOUDSTACK-5790: decrypted ldap hostname and port during upgrade as they are not encrypted now. 
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2014-01-09 15:50:53 +05:30
Min Chen
3223028fd6 CLOUDSTACK-5841:Snapshots taken before migration NFS to S3 can not be 
used cross-zone.
 2014-01-08 17:43:06 -08:00
Wei Zhou
cbe2560a78 CLOUDSTACK-5303: fix incorrect resource count (snapshot, secondary_storage) 
(cherry picked from commit 4bb85cd7f921d66eabe72d00dcde817affd48732)

Conflicts:

	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
 2014-01-08 15:38:06 +01:00
Sanjay Tripathi
c3d8e207c8 CLOUDSTACK-5314: Negative (-ve) values for primary storage and volumes are shown in the resource count table. 2014-01-07 15:07:02 +05:30
Alena Prokharchyk
b15431e574 CLOUDSTACK-5810: addSecondaryIp to vm's nic - derive the ip owner from the vm instance account, not from the caller 2014-01-06 17:09:14 -08:00
Alena Prokharchyk
647ea6e2d0 listNics API: added optional networkId parameter allowing to list nics by network id for the specific vm 2014-01-06 17:09:14 -08:00
Harikrishna Patnala
95fa931ff2 CLOUDSTACK-5515: #cpu ,cpuspeed and ram is set to NULL in usage db(usage_vm_instance table) after vm stop and start Fixed populating usage event details in usage db on vm start/upgrade/dynamic_scale 2013-12-30 12:20:33 +05:30
Min Chen
5d262d7b59 CLOUDSTACK-5648:CopyTemplate and CopyISO across zones fails after NFS 
migration to S3.
 2013-12-26 12:39:39 -08:00
Alena Prokharchyk
fbba17e68c Resource metadata support for cloudStack user 2013-12-23 14:25:07 -08:00
Alena Prokharchyk
79e64aa535 Resource metadata support for Disk Offering 2013-12-23 12:36:13 -08:00
Nitin Mehta
edc1b78d84 Revert "Revert "CLOUDSTACK-5281:"" 
This reverts commit ab37009e9015e90f39f001dbc7023ce52319dcff.
 2013-12-20 17:30:05 -08:00
Alex Huang
ab37009e90 Revert "CLOUDSTACK-5281:" 
This reverts commit 6b62a04eaf1196ebcce5e81c29c9e0f59dd4f858.
 2013-12-20 17:23:33 -08:00
Nitin Mehta
6b62a04eaf CLOUDSTACK-5281: 
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
 2013-12-20 16:58:43 -08:00
Nitin Mehta
f083f91b0b CLOUDSTACK-5281: 
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the vms at the moment.
 2013-12-20 15:33:37 -08:00
Edison Su
8caf52c6bc add xenserver 6.2.0 hotfix support, to optimize vdi copy 
add xenserver hot fix

Conflicts:

	api/src/com/cloud/vm/VirtualMachineName.java
	core/src/com/cloud/host/HostInfo.java
	core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
	deps/XenServerJava/src/com/xensource/xenapi/VDI.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
	engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
	engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
	server/src/com/cloud/configuration/Config.java
 2013-12-19 14:15:41 -08:00
edison su
a3fade86b2 Fix snapshot details dao 2013-12-19 13:35:08 -08:00
Kishan Kavala
29b90e7a5c CLOUDSTACK-5208: upgrade from 3.0.6 to 4.3 is not throwing any exception if new System VM template is not registered with proper name Commit ae231444bc885ee5e9a5d4bb3003bef651c849d6 Commented the exception. 2013-12-19 16:17:37 +05:30
Koushik Das
f2fab9d5b1 CLOUDSTACK-5458: cpu speed is not getting updated in vm_instance table after service offeirngs change 
Removed cpu, ram and cpu speed fields from the vm_instance table as these are not used
 2013-12-19 14:15:39 +05:30
Antonio Fornie
55a6df4501 Resources leaks, refactoring and testing 
Removing resource leaks from UsageSanityChecker and
refactoring it (encapsulation, removal of copy and paste, constants...)

Modularize static method for closing Statments in TransactionLegacy
and reusing this new method from other classes (Upgrade2214to30)

Create Unit and Integration Tests for UsageSanityChecker

Add DBUnit cases and integration profile for nitegration tests as
a base for future DB tests
 2013-12-18 10:55:04 +01:00
Rajani Karuturi
b54ac9a635 CLOUDSTACK-5483 : Failed to start management server when db 
encryption is enabled When db encryption is enabled, the server expects all
 secure,hidden fields in encrypted form. moved the insert statements which has
 dafault values to java and populated encrypted values if encryption is
 enabled.
 2013-12-13 17:44:24 +05:30
Jayapal
bd54ed8071 CLOUDSTACK-5417 Updating egress firewall rules CiDR on external network restart 2013-12-13 14:45:44 +05:30
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
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
e08f64e6ae Fix several Resource Leak issues related to not closed PStmts and ResultSets 
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
 2013-12-12 13:24:22 +01:00
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
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
dc151115be AutoScaling without NetScaler 2013-12-10 10:35:55 +07:00
tuna
4de09ee654 add Apache Licensed 2013-12-10 08:37:37 +07: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
tuna
7efab20300 fix staticNat after rebase 2013-12-09 23:33:15 +07:00
tuna
4d0602175c refactor ovsProvider to new resource 2013-12-09 23:33:15 +07:00
tuna
d935d3865a tuna 2013-12-09 23:33:14 +07: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
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
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
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
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
Harikrishna Patnala
b2f0a0bce2 CLOUDSTACK-4737: handling usage events for dynamic compute offering 
Signed-off-by: Koushik Das <koushik@apache.org>
 2013-11-26 17:07:30 +05:30
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