2ef4d5200c
Merge branch 'master' into rbac.
2013-10-31 17:16:33 -07:00
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
6be228a438
CLOUDSTACK-4024:Provide a way to upgrade from existing NFS secondary
...
storage to S3.
2013-10-28 21:01:31 -07:00
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
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
e86b612750
ResourceDetails - added createDetail to ResourceDetailDao interface to provide generic way of creating resourceDetail DB objects
2013-10-28 12:53:53 -07:00
d0090a0c24
Resource details (metadata) - added support for Storage pool details
2013-10-28 12:53:53 -07:00
70b2c0150d
rebase to spring changes
2013-10-25 18:15:36 -07:00
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
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
300f626d42
Renamed ResourceDetailDaoImpl to ResourceDetailDaoBase
2013-10-25 14:21:20 -07:00
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
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
1528725949
CLOUDSTACK-754: Enable Remote Access VPN for VPC
...
With integration smoke test case.
2013-10-24 17:34:41 -07:00
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
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
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
df728fcf41
Include new DAO added since spring-modularization branch
2013-10-23 11:23:52 -07:00
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
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
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
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
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
c0c46268ac
CLOUDSTACK-4328 httpclose/mode as keepAliveEnabled
2013-10-22 12:44:23 +02:00
db890bc71e
fix a bug in findAllChildren of domains
2013-10-21 14:02:53 +02:00
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
711ad386d1
Random cleanup
2013-10-16 16:18:49 -07:00
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
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
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
ac02987db2
Add upgrade path from 4.2.1 to 4.3.0.
2013-10-14 21:56:34 -07:00
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
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
5c7db71bbb
Duplicate getter-setter after merge
2013-10-10 00:47:36 -07:00
ec4fa61ae3
Tested ACL for StartVmCmd using the new RoleBasedEntityAccessChecker
2013-10-10 00:46:06 -07:00
0b1aaf514f
More logic to Role based checker
2013-10-10 00:43:56 -07:00
bb7493775c
CLOUDSTACK-4707: "sourcetemplateid" field is not getting set for derived templates Template created from a volume or snapshot did not have the sourcetemplateid field set in vm_template table.
2013-10-10 12:20:40 +05:30
2b4703b6e6
Change ListVMsCmd to use new role and entity permission information.
2013-10-09 21:56:52 -07:00
9cd1a95327
Fix search criteria to support searching both specific entityType and *.
2013-10-08 14:50:46 -07:00
11fe1f527a
Add role permission for normal user role.
2013-10-08 11:08:54 -07:00
b87b9e5c64
Add Scope to acl_role_permission, remove parent_role_id from acl_role
...
table, and create PermissionScope and AclEntityType enum types.
2013-10-07 16:09:26 -07:00
6e80bb001c
CLOUDSTACK-4824:
...
Add support for adding zone details
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-07 15:48:43 -07:00
579806440b
Add permission flag to acl_entity_permission
2013-10-07 14:30:15 -07:00
385dfc230f
Schema and VO/Dao for Role Permission
2013-10-07 12:33:28 -07:00
d769a73cfc
Fix DatabaseUpgradeChecker in standalone context
...
When running DatabaseUpgradeChecker as a standalone program _dao will not
be injected. Still create an instance of VersionDaoImpl in constructor
and when DatabaseUpgradeChecker is ran in the mgmt server it will be
overwritten by the injected value.
2013-10-07 11:57:55 -07:00
ded2785bb1
Add interface method to remove account group association from
...
acl_group_account_map.
2013-10-07 11:46:40 -07:00
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
67186429e1
Spring Modularization
...
ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.
Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors.
2013-10-02 15:41:04 -07:00
8466fad6ca
CLOUDSTACK-4785:
...
Adding list details for UserVm.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-02 14:53:07 -07:00
85b5c6e353
CLOUDSTACK-4785:
...
Add support for adding user vm details and removing them.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-02 14:16:45 -07:00
Min Chen
Alena Prokharchyk
Edison Su
Bharat Kumar
Sheng Yang
Darren Shepherd
Anthony Xu
dhoogland
Wei Zhou
Nitin Mehta
Kishan Kavala
Prachi Damle
Harikrishna Patnala
Laszlo Hornyak
Darren Shepherd