apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 10:32:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
21,295 Commits 312 Branches 325 Tags
Commit Graph

304 Commits

Author SHA1 Message Date
Min Chen
a416f6c3c3 Fix API build error based on new DB schema, now only 
RoleBasedEntityAccessChecker needs to be fixed.
 2013-12-06 15:09:00 -08:00
Min Chen
c3f480e9b9 Updated db schema based on latest FS. Still need to fix old code in 
AclServiceImpl, RoleBasedEntityAccessChecker and QueryManagerImpl to
make all build.
 2013-12-04 18:44:30 -08:00
Prachi Damle
cf69731a52 Suring startup load the API permissions from commands.properties and @APICommand annotations 2013-11-25 17:01:56 -08:00
Prachi Damle
f231cec5b7 Loading api permissions from commands.properties during startup 2013-11-25 10:59:12 -08:00
Min Chen
7ed030115e Updated DB schema and DAO layer classes according to new FS. 2013-11-20 17:32:09 -08:00
Prachi Damle
e0d2423f06 Refactoring account_type for Domain_Admin and Normal_User types 2013-11-20 16:53:59 -08:00
Min Chen
ce3638bb03 Merge branch 'master' into rbac. 2013-11-04 15:49:29 -08:00
Alena Prokharchyk
2ff791b0b8 CLOUDSTACK-5025: volumes.display_volume field should be set to 1 by default. DB used to handle this, but VO was missing the default field assignment. Fixed th 
e VO and db upgrade to update all existing volumes with 1 value
 2013-11-01 22:48:11 -07:00
Darren Shepherd
c1bae7984a Revert "Commit 1460196496d73e0db25c7beb2392cfaf9d591ed7 changed db.properties" 
This reverts commit a3cec3802c4c56173c33ccc1e08af059547fe90e.
 2013-11-01 22:25:53 -07:00
Min Chen
2ef4d5200c Merge branch 'master' into rbac. 2013-10-31 17:16:33 -07:00
Edison Su
c5bec6b336 add quiescevm in createvmsnapshotcmd 2013-10-31 16:45:05 -07:00
Alena Prokharchyk
78b1ac4126 CLOUDSTACK-3868: fixed "count" param in listUsageRecords API to return the actual number of records matching the search criteria. Used to return the wrong value - the number of records per page 
Conflicts:
	server/src/com/cloud/usage/UsageServiceImpl.java
	utils/src/com/cloud/utils/db/GenericDaoBase.java
 2013-10-31 15:25:57 -07:00
Darren Shepherd
afaf6370dd Fix change that broke db.properties.override 2013-10-31 09:21:34 -07:00
Hugo Trippaers
a3cec3802c Commit 1460196496d73e0db25c7beb2392cfaf9d591ed7 changed db.properties 
loading, this also affects the database creator. This make the database
creator use the new loading completely instead of partially.
 2013-10-31 15:08:25 +01:00
Sheng Yang
3205cd42b5 CLOUDSTACK-730: Site-to-site VPN between VPC VR to VR 
Now VPN connection can be created as "passive", which would enable the ability
of remote peer initiate the connection. So it's possible for VPC VR to
establish the connection to another VPC VR of CloudStack.

Test case also included.

The test case would create 2 vpcs and using VPN to connect them.
 2013-10-30 19:30:22 -07:00
Darren Shepherd
1460196496 Centralize loading of db.properties to one place 
There is now a method DbProperites.getDbProperties() that will load the
db.properties in one place and do the proper decryption of values if needed
 2013-10-30 17:03:13 -07: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
e86b612750 ResourceDetails - added createDetail to ResourceDetailDao interface to provide generic way of creating resourceDetail DB objects 2013-10-28 12:53:53 -07:00
Alena Prokharchyk
d0090a0c24 Resource details (metadata) - added support for Storage pool details 2013-10-28 12:53:53 -07:00
Edison Su
70b2c0150d rebase to spring changes 2013-10-25 18:15:36 -07:00
Edison Su
51a8086cf6 Merge branch 'pluggable_vm_snapshot' 
Conflicts:
	client/tomcatconf/applicationContext.xml.in
	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
	engine/storage/integration-test/test/resources/storageContext.xml
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
 2013-10-25 16:47:17 -07:00
Edison Su
a6ce66e55a move a lot of code into vmsnapshot strategy 
fix compile

fix compile

add vm_snapshot_details table in db

add vmsnapshot test cases
 2013-10-25 15:09:04 -07:00
Alena Prokharchyk
300f626d42 Renamed ResourceDetailDaoImpl to ResourceDetailDaoBase 2013-10-25 14:21:20 -07:00
Alena Prokharchyk
0fb4d9d5a2 Made all resource details DAOs (nic_details, user_vm_details, template_details, volume_details, service_offering_details) extend from the same base class as although details are being stored in diff tables, those tables have the same structure and same accessors. 2013-10-25 10:56:19 -07:00
Bharat Kumar
e4a1ff818f CLOUDSTACK-4947 VM creation fails if the global config apply.allocation.algorithm.to.pods is set to true." 2013-10-25 15:07:00 +05:30
Sheng Yang
1528725949 CLOUDSTACK-754: Enable Remote Access VPN for VPC 
With integration smoke test case.
 2013-10-24 17:34:41 -07:00
Alena Prokharchyk
24725f8e21 ResourceDetails: 
1) Added support for Zone resource details
2) Renamed DcDetailsDao to DataCenterDetailsDao to follow the CS name convention for DataCenter related classes
 2013-10-24 15:54:49 -07:00
Alena Prokharchyk
765832a5cf CLOUDSTACK-4649: added support to removeResourceDetail to remove details for UserVm/Templates 
Conflicts:
	engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
 2013-10-24 10:34:21 -07:00
Alena Prokharchyk
2bb716efd8 ResourceMetaData (Resource details) fixes: 
* changed name for TaggedResourceType enum to ResourceObjectType as this enum is used both by ResourceMetaData and ResourceTags code
* enhanced the enum with extra fields resourceTagsSupport (boolean) and metadataSupport identifying if the resource supports tags and/or metadata.
* cleanup unused @Inject objects from the ResourceMetaDataManager
 2013-10-23 17:39:16 -07:00
Darren Shepherd
df728fcf41 Include new DAO added since spring-modularization branch 2013-10-23 11:23:52 -07:00
Darren Shepherd
e3280bdba2 Merge remote-tracking branch 'origin/spring-modularization' 
Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
 2013-10-23 11:14:42 -07:00
Darren Shepherd
205a77a5bb Merge remote-tracking branch 'origin/txn-refactor' 
Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2013-10-23 10:40:44 -07:00
Anthony Xu
e33ae74067 CLOUDSTACK-4649: 
xs 6.1/6.2 introduce the new virtual platform, so there are two virtual platforms, windows PV driver version must match virtual platforms,
this patch tracks PV driver versions in vm details and template details.

Anthony
 2013-10-22 17:54:51 -07:00
Alena Prokharchyk
d79135f4e6 CLOUDSTACK-4649: allow to update template details with addResourceDetails API 
Conflicts:
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
 2013-10-22 14:01:54 -07:00
Alena Prokharchyk
3ec14c4baf CLOUDSTACK-4649: addResourceDetail - added support for userVm resource. Now "hypervisortoolsversion" get stored in user_vm_details table, and being returned as a part of listVirtualMachines call ("details" parameter) 
Conflicts:
	api/src/org/apache/cloudstack/api/response/UserVmResponse.java
	engine/schema/src/com/cloud/vm/dao/UserVmDetailsDao.java
	engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
	server/src/com/cloud/api/query/vo/UserVmJoinVO.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
 2013-10-22 13:50:43 -07:00
dhoogland
c0c46268ac CLOUDSTACK-4328 httpclose/mode as keepAliveEnabled 2013-10-22 12:44:23 +02:00
Wei Zhou
db890bc71e fix a bug in findAllChildren of domains 2013-10-21 14:02:53 +02:00
Min Chen
ec3302afd6 CLOUDSTACK-3472: [Object_Store_Refactor] System VMs are not coming up in 
initial attempt, but they are coming up after multiple attempts.
 2013-10-17 15:59:10 -07:00
Darren Shepherd
711ad386d1 Random cleanup 2013-10-16 16:18:49 -07:00
Nitin Mehta
fc6c1ec812 CLOUDSTACK-4882: 
list Clusters/pods/zones API not accounting for reserved in the used capacity percentage.
Fix listCapacity cmd for reserved as well
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-10-16 15:02:18 -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
Min Chen
ac02987db2 Add upgrade path from 4.2.1 to 4.3.0. 2013-10-14 21:56:34 -07:00
Nitin Mehta
fa0c685bcb CLOUDSTACK-4854: 
Add support for adding network details
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-10-10 19:18:39 -07:00
Alena Prokharchyk
c4084a7c34 Fixes for resource details code: 1) Fixed the NPE happening when the resource detail couldn't be located by the key passed through API 2) Added ResourceDetails interface, made all resource details VO objects to implement it. 2013-10-10 11:13:47 -07:00
Prachi Damle
5c7db71bbb Duplicate getter-setter after merge 2013-10-10 00:47:36 -07:00
Prachi Damle
ec4fa61ae3 Tested ACL for StartVmCmd using the new RoleBasedEntityAccessChecker 2013-10-10 00:46:06 -07:00