Commit Graph

237 Commits

Author SHA1 Message Date
Min Chen 63e42d3c47 Handle scopeId=-1 properly, which indicates current caller domain or
account.
2014-02-07 15:56:03 -08:00
Min Chen 0b5b861994 Fix a bug in listParentAclGroups to handle empty parent group case. 2014-02-07 14:13:56 -08:00
Min Chen 3b58a45e04 Merge branch 'master' into rbac. 2014-02-07 13:43:36 -08:00
Anshul Gangwar 13e0f293ed CLOUDSTACK-6001: Fixed hyperv vm console not working for 3 minutes after migration. 2014-02-06 13:47:38 +05:30
Min Chen 7c0170e3e9 Hook up IAM update for updateTemplatePermission api. 2014-02-05 16:04:13 -08:00
Alex Huang 54f32a8e46 Moved the controlling logic for secondary storage vm into place 2014-02-05 01:39:17 +00:00
Alex Huang 4be3b99337 Moved the secondary storage service into its own server directory 2014-02-05 01:38:24 +00:00
Prachi Damle f84375442e Merge branch 'master' into rbac
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
	api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
	plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/template/TemplateAdapterBase.java
	setup/db/db/schema-430to440.sql
	tools/apidoc/gen_toc.py
2014-02-04 12:07:32 -08:00
Prachi Damle 022b9b8f80 Add access for domain wide createAffinityGroup 2014-02-03 18:14:56 -08:00
Prachi Damle a6d07c873c Changes to QuerySelector to list the parent group resources with recursive = true access 2014-02-03 17:49:33 -08:00
Prachi Damle 939b15169c changes to support the domain wide resources for Network 2014-02-03 17:34:03 -08:00
Prachi Damle 09eed3705d Fix for NPE in the dao 2014-01-31 12:00:26 -08:00
Hugo Trippaers 8f10dedce9 Fix findbugs findings and remove dead code 2014-01-31 09:37:16 +01:00
Hiroaki KAWAI b32b49e853 Fix mock socket client/server test.
Normally a server will bind to 0.0.0.0, which is not an
address that a client can specify to connect to.
127.0.0.1 or ::1 will do.
2014-01-30 21:11:56 +09:00
Prachi Damle d12422bf68 Add policies to domain group for CreateNetwork usecase for a domain wide shared network 2014-01-29 23:56:25 -08:00
Sanjay Tripathi dfe744c4a9 CLOUDSTACK-5900: Failed to delete template/ISO that failed to download. 2014-01-30 13:26:00 +05:30
Prachi Damle ce95f3122b add 'recursive' column to permission table 2014-01-29 23:48:13 -08:00
Min Chen 81323dce5d Add support to grant acl permission to access an individual resource. 2014-01-29 17:59:24 -08:00
Sanjay Tripathi 1c4bbecc4a CLOUDSTACK-5900: Failed to delete template/ISO that failed to download. 2014-01-29 14:07:59 +05:30
Min Chen 0063b60701 Remove ACL permission for a particular entity when it is deleted. The
hook is currently only done for deleteTemplateCmd.
2014-01-28 18:17:01 -08:00
Min Chen 72812cdf22 Grant public template permission to domain admin and normal user policy. 2014-01-28 17:41:27 -08:00
Min Chen 748dc1541c Support attaching policy to account. 2014-01-28 10:00:17 -08:00
Prachi Damle 91317dc497 Changes for createDomain - create new group AND createAccount - add account to domain group 2014-01-28 09:48:19 -08:00
Sanjay Tripathi d7ee7a7431 CLOUDSTACK-5900: Failed to delete template/ISO that failed to download. 2014-01-28 19:21:10 +05:30
Min Chen d47d4bbd20 Guard NPE due to empty policies. 2014-01-23 18:32:48 -08:00
Min Chen 344d3a37cc Add missing AclApiServiceImpl bean into spring xml. 2014-01-23 18:32:48 -08:00
Prachi Damle af14699c4c fixing the build _ AffinityGroup command changes 2014-01-23 18:17:43 -08:00
Prachi Damle 96a64b933e - Adding OperateEntry during loading of commands
- Replace ListEntry By OperateEntry
- ApiDispatcher should pass on the API name
2014-01-23 17:50:59 -08:00
Anshul Gangwar 62ef61794d Fixed check style error 2014-01-23 10:54:09 +05:30
Anshul Gangwar 6ebbec239d CLOUDSTACK-5716: fixed can't type special character in console view 2014-01-23 10:54:09 +05:30
Anshul Gangwar 3e2f7dda9e CLOUDSTACK-5702: Fixed mouse doesn't work for console 2014-01-23 10:54:08 +05:30
Anshul Gangwar 5941ac46d2 CLOUDSTACK-5344 commit for console proxy rdp for hyperv 2014-01-23 10:54:08 +05:30
Prachi Damle 39c0a302b4 Fix the isRootAdmin and isDomainAdmin to return true or false even if the permission is denied by IAM 2014-01-22 13:59:59 -08:00
Min Chen 82bdde70a2 Fix NPE during MS startup. 2014-01-17 18:14:04 -08:00
Prachi Damle b444136166 Adding the correct policyIds for the command permission loading 2014-01-17 16:55:32 -08:00
Min Chen 0ce176c0dd Add in missing resources folder for iam-server. 2014-01-17 16:16:41 -08:00
Min Chen 929fbabaa2 Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
Min Chen b725035b22 Fix NPE about accessType in RoleBasedApiAccessChecker.start. 2014-01-14 18:20:32 -08:00
Prachi Damle cc66d03f81 IAMService does not need CallingContext information 2014-01-14 16:34:47 -08:00
Min Chen 6c1849f4bf Fix Spring wiring issues in starting up MS. 2014-01-14 16:20:30 -08:00
Min Chen 6583cb3800 Add listAclGroupsByAccount to QuerySelector adapters and remove
AclProxyService interface.
2014-01-14 16:19:25 -08:00
Alex Huang 68b8891c62 Removed all reminants of the IdentityService. Created the KeysManager to move the management
of keys out of management server
2014-01-14 13:11:35 -08:00
Prachi Damle fac9f2da0f Adding messageBus events for adding and removal of an account. 2014-01-13 22:12:39 -08:00
Prachi Damle 6cd121fe7b RootAdmin and DomainAdmin access check via IAM 2014-01-10 17:06:10 -08:00
Min Chen 43f0f901dd Remove VO and DAO from cloud-engine-schema. 2014-01-10 15:57:39 -08:00
Min Chen e42a262f6c Remove old APIs and old security checker plugins. Also use QuerySelector
adapater in ACL search routine.
2014-01-10 14:54:31 -08:00
Alex Huang 5fb6edd684 Changed the package to name to org.apache.cloudstack 2014-01-09 16:12:26 -08:00
Alex Huang ae8560b195 Moved security out into its own jar. Will be adding more to it. Fixed a few white space issues brought up by checkstyle in eclipse. 2014-01-09 16:12:25 -08:00
Prachi Damle 2ee1ad16e9 Fixing unit tests for cloud-iam 2014-01-06 14:18:05 -08:00
Min Chen 7114d49c14 Some cleanup on AclApiService and remove array copy in some
implementations of IAMServiceImpl
2014-01-06 13:27:29 -08:00
Min Chen e02e19a6f1 Make AclApiServiceTest pass without changing ApiServerService signature. 2014-01-06 10:43:01 -08:00
Prachi Damle 28b81e423e Changing the access checkers to work with IAM server 2014-01-05 21:41:39 -08:00
Min Chen d374cd5a2c Add Unit Testcases for AclApiService. 2014-01-03 17:18:44 -08:00
Prachi Damle e5b4a1d869 Moved the loading of commands.properties to the IAM plugin 2014-01-02 18:39:18 -08:00
Min Chen dd8dcd9492 Implementing listAclGroup and listAclPolicy API based on iam plugin
model without using db views. AclGroupJoinVO and AclPolicyJoinVO can be
removed later.
2014-01-02 16:18:29 -08:00
Donal Lafferty 48c47101aa CLOUDSTACK-5344: Updated to allow rdp console to access hyper-v vm virtual framebuffer. 2014-01-02 13:06:10 +05:30
Min Chen d9be7bb968 Move ACL response class into iam plugin, also fix AclAPiService to
invoke IAMService method to hide internal IAM schema.
2013-12-27 17:17:54 -08:00
Prachi Damle 08122c9adb - Added basic unit test for IAMService
- Removed Event geenration annotations from IAM server
2013-12-27 16:06:06 -08:00
Min Chen 01e6f47d41 Move ACL APIs from server to plugin. Server can have its own APIs for
standalone use (compared to integration with CloudStack), which can be
done at later phase.
2013-12-27 15:09:31 -08:00
Sanjay Tripathi f6b063de79 CLOUDSTACK-4973: Specified keyboard language is not showing as default in consoleView passed during deployVM. 2013-12-27 18:17:22 +05:30
Min Chen c950651fe2 Use IAMService to implement QuerySelector adapter. 2013-12-26 19:53:49 -08:00
Min Chen e280095536 Fix build issue for cloud-plugin-iam. 2013-12-26 17:56:10 -08:00
Prachi Damle 2543fbe846 Adding new IAM service under services. There are two modules to this component:
part a) plugin - This contains all adapter implementations and components necessary to interact with CloudStack.

part b) server - This contains IAM interfaces that are not aware of any CloudStack entities, they are pure IAM interface that can be implemented in varied ways.
The default implementation provided just works on DB and generic Dao layer.
But these interfaces can be implemented using connectors interacting with LDAP or AD.
2013-12-26 15:17:13 -08:00
Edison Su 9947e688c4 CS-18564: create template from snapshot failed, due to the volume(the
snapshot created from) is deleted.
2013-12-20 12:45:02 -08:00
Marcus Sorensen 95364a4022 CLOUDSTACK-5531
Initial support for vhd, raw, vmdk image formats on KVM. Tested all formats with local and CLVM.
2013-12-16 14:32:51 -07:00
Alex Huang be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
Min Chen 5dccaa1832 CLOUDSTACK-5454: Delete previous template and snapshot after migrating
NFS to S3 throws Error.
2013-12-11 16:54:40 -08:00
wilderrodrigues d19688103b Fixing coverity issues related to resource leak on FileInputStream being created anonymously
Signed-off-by: Daan Hoogland <daan@onecht.net>
2013-11-27 12:51:44 +01:00
Alex Huang 433a631916 Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00
Hugo Trippaers cf715ff491 Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01: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
Hugo Trippaers c3b60fad9b Just one level higher 2013-11-12 17:35:25 +01:00
Hugo Trippaers 34b6a395ce Fix pom problems causing compilation failures. No master pom was set and this module uses maven standard directory locations 2013-11-12 17:16:57 +01:00
Devdeep Singh 1b2f1d7454 Fix the console proxy rdp client build breaking with java 6 and make it part of regular build. 2013-11-11 16:19:08 +05:30
Devdeep Singh d27c6eb9a9 Fixing build break due to console proxy rdp client. 2013-11-08 16:13:24 +05:30
Devdeep Singh 810bfa90e2 Integrating the rdp client to get build in the regular build process. 2013-11-08 14:51:04 +05:30
Devdeep Singh a98c473dca Remote Desktop Protocol(RDP) client that is suitable for including in the console VM.
The client renders RDP to a window created by Java. It is important for Hyper-V support,
because Hyper-V provides access to the consoles of VMs that it is running over RDP.
2013-11-08 13:35:11 +05:30
Darren Shepherd 891b85d516 Add missing licenses 2013-10-23 15:20:08 -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
Min Chen 25acfbad78 CLOUDSTACK-4816:provide configurable option to choose single vs
multipart upload to S3 object storage based on object size.
2013-10-17 10:28:59 -07:00
Hugo Trippaers 71dc43ebb0 Remove duplicate scripts and move the remaining items to the systemvm project 2013-10-14 08:02:35 +02:00
Min Chen f1895ea39a CLOUDSTACK-4816: Make S3 upload multipart or singlepart configurable. 2013-10-04 18:21:25 -07:00
Chris Suich 180cfa19e8 Refactor Storage Related Resource Code
These changes are a joint effort between Edison and I to refactor some
of the code around snapshotting VM volumes and creating
templates/volumes from VM volume snapshots. In general, we were working
towards allowing PrimaryDataStoreDrivers to create snapshots on primary
storage and not requiring the snapshots to be transferred to secondary
storage.

High level changes:
-Added uuid to NfsTO, SwiftTO & S3TO to cut down on the requirement of
PrimaryDataStoreTO and ImageStoreTO which don't really serve much of a
purpose
-Initial work towards enable reverting VM volume from snapshots
-Added hypervisor commands for introducing and forgetting new hypervisor
objects (snapshots, templates & volumes)

Signed-off-by: Edison Su <sudison@gmail.com>
2013-10-04 13:06:42 -07:00
Darren Shepherd 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
Hugo Trippaers 15a97ec412 Cleanup pom.xml in various projects to properly use managed versions and other defaults 2013-09-21 17:21:06 +08:00
Hugo Trippaers 17977b426b Forgot to add a few items to the commit to move the systemvm 2013-09-20 18:52:47 +08:00
Hugo Trippaers 6c26104282 Move the system vm to a separate maven project.
All (almost) files belonging to the systemvm aer now centralize in the systemvm directory. The code for the separate functions is still in the services directory. This will make the code easier to understand and makes it clear that the systemvm is a separate item. It alos means that it can be excluded from the build entirely by not adding the systemvm profile, this will speed up the compiles somewhat.
2013-09-20 18:31:02 +08:00
Donal Lafferty e958f22ff3 CIFS support for secondary storage is documented here: https://cwiki.apache.org/confluence/display/CLOUDSTACK/CIFS+Support
It was implemented by extending the NFS provider. Its validation was updated so that you can pass it a URL containing the
details of a CIFS share.  The code that mounts NFS shares was extended to allow it do the same for CIFS shares.  Otherwise,
the secondary storage code is left unchanged.
2013-09-11 14:23:29 +05:30
Min Chen b11a8e12e8 CLOUDSTACK-4625:Snapshots and templates should be deleted from staging
storage after create template from snapshot on S3.
2013-09-06 17:48:40 -07:00
Min Chen bf83efcf4b CLOUDSTACK-4190:[Object_store_refactor] volume should be deleted from
staging storage after successfule volume migration, specially handle
DeleteVolume command for Vmware volume structure in secondary storage.
2013-09-06 14:39:03 -07:00
Sanjay Tripathi 7bff499bd3 CLOUDSTACK-4434: EN: Ubuntu: Direct input "- _ ", "? /", "keyboard /" ,"keyboard -" keys are not working well for the US keyboard. 2013-09-05 13:05:21 +05:30
Min Chen 49dd7289c0 CLOUDSTACK-4468:template created from snapshot is destroyed once we
restart management server.
2013-08-26 11:58:53 -07:00
Wido den Hollander a5c10767d6 CLOUDSTACK-4249: Do not assume KVM snapshots are in QCOW2 format
RBD snapshots are in RAW format and are stored as such on Secondary Storage.

When creating a template from such a snapshot, honor the image format passed
down by the management server and act on that.

The old code simply assumed it always was QCOW2.
2013-08-21 17:12:30 +02:00
Edison Su 45b35aaeef CLOUDSTACK-4398: get physical size of template if the template is stored in S3 2013-08-19 17:52:28 -07:00
Min Chen c675f826e5 CLOUDSTACK-4318:[Object_Store_Refactor] Failed to delete snapshot copied
to Staging storage during snapshot creation.
2013-08-14 18:12:53 -07:00
Min Chen 67beef15c9 CLOUDSTACK-3706:[Object_Store_Refactor] Failed to create template from
stopped guest vm's root disk.
2013-08-14 13:11:06 -07:00
Kishan Kavala 21831211f6 CLOUDSTACK-4295 : TemplateTO should contain physical size along with virtual size. Usage ignores templates with size 0 2013-08-14 17:34:05 +05:30