Commit Graph

58 Commits

Author SHA1 Message Date
Hugo Trippaers
adf6026d21 SnapshotDetailsVO doesn't have a display field even though it is required in the searchbuilder in ResourceDetailsDaoBase
java.lang.AssertionError: Searching for a field that's not there: display
    at com.cloud.utils.db.SearchBase.set(SearchBase.java:219)
    at com.cloud.utils.db.SearchBase$Interceptor.intercept(SearchBase.java:475)
2014-02-05 17:46:33 +01:00
Devdeep Singh
a24263fe81 CLOUDSTACK-6030: Encrypt the primary and secondary smb storage password when it is stored in the db. 2014-02-05 15:44:09 +05:30
Alena Prokharchyk
02bdb28d76 Resource metadata support for autoscale vm group object 2014-01-30 13:04:56 -08:00
Alena Prokharchyk
fdb25d6f5b Resource metadata support for autoscaleVmProfile CS object 2014-01-29 14:57:00 -08:00
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
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
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
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
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
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
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
Alena Prokharchyk
5d974a234c Resource metadata support for VPC Private Gateway 2013-11-26 12:48:15 -08:00
Alena Prokharchyk
c37e8b7e8c Resource metadata - fixed the bug in removeResourceDetail API - when "key" parameter was passed in, used to remove the details matching the key, for all the resources, not just the one defined by resource_id 2013-11-25 15:32:52 -08:00
Alena Prokharchyk
602d4ef0cf Resource metadata - support for VPC 2013-11-21 14:29:39 -08:00
Alex Huang
d620df2bdd Reformatted all of the code. 2013-11-21 06:15:26 -08:00
Alex Huang
224f479974 Removed trailing spaces 2013-11-21 04:08:01 -08:00
Alex Huang
e4b22d0fca Replace all tabs, particularly the ones in the comments 2013-11-21 03:39:58 -08:00
Alex Huang
8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Syed Ahmed
481af07fb1 Adding protocol parameter to loadbalancer response 2013-11-19 22:12:44 +05:30
Alena Prokharchyk
4a8e9f8b8d Resource Metadata: added implementation for Remote Access VPN 2013-11-13 14:26:16 -08:00
Alena Prokharchyk
8bd1eaa210 ResourceMetaData: added support for userIpAddress (publicIp) metadata 2013-11-08 10:48:43 -08:00
Alena Prokharchyk
591dcd1d1c ResourceDetails: added "display" field to a bunch of VOs - determines whether the detail should be returned to the regular user 2013-10-29 09:18:11 -07:00
Min Chen
6be228a438 CLOUDSTACK-4024:Provide a way to upgrade from existing NFS secondary
storage to S3.
2013-10-28 21:01:31 -07:00
Alena Prokharchyk
2cac1aaa0f Moved ResourceDao and ResourceDaoBase to cloud-engine-schema/org/apache/cloudstack (used to be mistakenly placed under com/cloud/cloud) 2013-10-28 15:03:57 -07:00
Alena Prokharchyk
5caeab782d ResourceDetails -
1) added createDetail to ResourceDetailDao interface to provide generic way of creating resourceDetail DB objects
2) added resource details support for firewall rules
2013-10-28 14:45:52 -07:00
Alena Prokharchyk
d0090a0c24 Resource details (metadata) - added support for Storage pool details 2013-10-28 12:53:53 -07:00
Darren Shepherd
f62e28c1ec New Transaction API
Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment.  The existing Transaction class was renamed
to TransactionLegacy.  All of the non-DAO code in the management server has been
updated to use the new Transaction API.
2013-10-16 09:21:00 -07:00
Kishan Kavala
81f1a0b831 CLOUDSTACK-4095 : Remove region_id from Transaction. Read from db.properties whenever required
Conflicts:
	framework/db/src/com/cloud/utils/db/GenericDaoBase.java
2013-10-16 19:28:42 +05:30
Laszlo Hornyak
bd8536739c remove txn attribute from DB
txn attribute was never actually used

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-04 10:15:39 -07:00
Alex Huang
e8cac2c5d8 Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement 2013-09-28 07:53:26 -07:00
Alex Huang
e2988902c9 Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement 2013-09-28 07:53:25 -07:00
Alex Huang
a964cf549e Continue to merge SearchCriteria2 and GenericSearchBuilder 2013-09-28 07:53:24 -07:00
Alex Huang
af8832f6bd Unified both the SearchBuilder and SearchCriteriaService 2013-09-28 07:53:24 -07:00
Edison Su
b3ac12e171 delete snapshot_store_ref if the snapshot is in error state 2013-09-25 15:51:55 -07:00
Alex Huang
435e74e914 Commit to try something on removing getZone 2013-09-06 15:40:33 -07:00
Nitin Mehta
654c90f4e5 CLOUDSTACK-4327:
Check for the all the transition states for Maintenance. Also corrected the isMaintenance function for StoragePoolVo
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-09-05 12:43:36 +05:30
Prachi Damle
ef22b42b38 CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group
Changes:
- Implict creation of the 'ExplicitDedication' Affinity group during resource dedication
- Only one group per account or per domain will be present
- ListDedicatedResources by affinityGroup
- Deployment should consider dedicated resources associated to the group only
- Deleting affinity group should release the dedicated resouces
- Releasing the dedicated resources should remove the group associated if there are no more resources.

Conflicts:

	plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java
	plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2013-09-03 20:02:38 -07:00
Prachi Damle
a06bd9fa2b CLOUDSTACK-4168 Root Admin should be able to create 'ExplicitDedication' affinity group at domain level and make it available for all accounts in the domain
Changes:
- 'ExcplicitDedication' type of group can be created/deleted by Root admin only
- Users can no longer create this type of affinity group
- RootAdmin can create this type of affinitygroup at domain level. Such a domain level group is available for all accounts in that domain for listing and for use during deployVM.
- The domain level affinitygroup should be visible to the users in that domain, domain admins and Root admin.

Conflicts:

	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
	server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
2013-09-03 20:02:34 -07:00
Min Chen
3bd2bbf59d CLOUDSTACK-3950:Set cross-zone flag in registerTemplate/registerIso in
case of region-wide secondary is enabled.
2013-08-20 14:13:49 -07:00
Mike Tutkowski
0f60b5d41c CLOUDSTACK-4331 - Enable more capacity from a managed storage device to be given to CloudStack 2013-08-14 15:02:57 -06:00
Murali Reddy
5cff9bd2e6 CLOUDSTACK-4111: Prompt "Acquire New IP - Cross Zones - YES/NO" wizard
only when there is portable IP range added at region level.

region response will now have details if portable IP service is enabled
or not. Portable IP service for a region is turned off by default. when
adming adds a portable ip range portable ip service is enabled for the
region.
2013-08-12 18:12:13 +05:30
Min Chen
2e0f11f15f CLOUDSTACK-4002: [Upgrade][2.2.16 to 4.2] After upgrade creation of
volume from a snapshot which was existing before upgrade, fails with NPE
2013-08-01 17:08:49 -07:00
Edison Su
d64c318f57 CLOUDSTACK-3510
Persist the download url in the db for volume download.
Signed off by : nitin mehta<nitin.mehta@citrix.com>

Conflicts:

	server/src/com/cloud/storage/VolumeManagerImpl.java
2013-07-29 11:50:15 -07:00