Commit Graph

493 Commits

Author SHA1 Message Date
Prachi Damle
9514c9e045 CLOUDSTACK-6349: IAM - No error message presented to the user , when
invalid password is provided.

- AccountManager now works using accountId instead of accountType in
following methods too:
- isResourceDomainAdmin()
- isAdmin()
2014-04-28 11:10:50 -07:00
Nitin Mehta
1d45b75298 CLOUDSTACK-6499:
Made changes so that uploading custom certificate works for ssvm.
    1. Reboot ssvm only when private key is passed meaning the server cert is passed. This is because while uploading the server cert is the last to be uploaded. And we want to propagate the entire chain once uploading is done.
    2. Change the SecStorageSetupCommand sent to ssvm so that it also carries the root cert apart from having the chain and the server cert and key.
    3. Change ssvm agent code to be able to configure root cert to the java key store.
    4. Change ssvm configure ssl script to insert the chain certs correctly.
    5. Fix order of chain certificates for apache webserver in SSVM
    6. Remove double encoding and decoding for uploadCustomCertificate API from UI and server code respectively, so that API call without UI works fine
    7. Java 1.7 - disable using SNI since copyTemplate doesnt work for SSL.
2014-04-24 17:27:02 -07:00
Min Chen
bc525d2236 CLOUDSTACK-6428:IAM - Domain Admin - When his sub-domainId is passed to
the listVirtualMachine command, Vms from all the domains are being
listed.
2014-04-17 18:32:57 -07:00
Min Chen
5d59fc7f5a Fix RoleBasedQuerySelector to handle new listAll semantics. If
listAll=true, show all resources that caller (or impersonater) has
ListEntry access type; otherwise, show all resources that caller (or
impersonater) has UseEntry access type.
2014-04-17 18:06:07 -07:00
Prachi Damle
7819775bb8 CLOUDSTACK-6330 [Automation] createRemoteAccessVpn call fails with access permission error
- Correcting the EntityType for PublicIpAddress entity
- Adding the EntityType in the @APICommand for *IPAddrCmds
2014-04-17 17:54:57 -07:00
Prachi Damle
c387d983a3 All BaseAsyncCreateCmd commands will also be grouped into "OperateEntry" accesstype 2014-04-17 17:54:36 -07:00
Min Chen
da13165743 Change AccountManagerImpl.checkAccess to invoke SecurityChecker
interface that takes multiple controlled entities.
2014-04-17 17:53:01 -07:00
Ding Yuan
c031eb7d38 CLOUDSTACK-6242: exception handling improvements
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-04-15 08:07:15 +02:00
Marcus Sorensen
11f5bdd78d CLOUDSTACK-6191 Add support for specifying volume provisioning
type (thin, sparse, fat) in disk/compute offerings.

Submitted-by: Yoshikazu Nojima <mail@ynojima.net>
Reviewed-by: Marcus Sorensen, Mike Tutowski
2014-04-10 09:23:04 -06:00
Prachi Damle
df302bdb3e Split the Root Admin policy to allow 'ListEntry' access for listing resources for scope 'all', but 'UseEntry' access only within Account scope
Same with Domain Admin policy
2014-04-04 16:38:29 -07:00
Prachi Damle
897e0d3abe SecurityChecker can accept multiple ControlledEntity 2014-04-04 16:38:29 -07:00
Prachi Damle
6a9d6f8796 RoleBasedEntityAccessChecker should skip Project resources. IAM does not support Projects yet. 2014-03-28 18:56:30 -07:00
edison
8583b70f2a CLOUDSTACK-5828: if snapshot deletion failed, such as can't find it on secondary storage, should return succeed. 2014-03-28 16:22:49 -07:00
Prachi Damle
4e61e49143 CLOUDSTACK-6303 [Automation] [UI] Account creation hang in UI
Changes:
- Caused due to a MySql error during 'Project' account cleanup. The MySql error hits a deadlock bug in the MessageBus code that does not release the lock/decrement the counter Eventually all callers on the MessageBus end up waiting to enter
- This fixes the account cleanup MySql error.
2014-03-28 14:35:00 -07:00
Daan Hoogland
8b62b2cb92 findbugs: exclude known spiffy hacks a.k.a. false positives 2014-03-28 14:28:10 +01:00
Prachi Damle
acfdd519be IAMEntityType change in the test after merge 2014-03-19 11:00:25 -07:00
Prachi Damle
c3ee01cca1 More changes to support 'readOnly' access 2014-03-19 11:00:23 -07:00
Prachi Damle
e09f97aa63 Adding support for 'readOnly' access. AccessType.ListEntry introduced. 2014-03-19 11:00:20 -07:00
Min Chen
ae1d6a771b Remove IAMEntityType to use existing VO interface class to annotate
entityType.
2014-03-17 17:19:55 -07:00
Hugo Trippaers
4402685e11 Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01:00
Prachi Damle
d9696b26e1 After merge, fix isRootAdmin() calls to use accountId instead of type 2014-03-13 13:28:40 -07:00
Min Chen
99bdc8d875 Merge branch 'master' into rbac. 2014-03-13 11:05:03 -07:00
Min Chen
f2d4b4d60e Use IAMService to populate group-account association for system/admin
account to solve unit test failure.
2014-03-11 16:31:03 -07:00
Min Chen
b554d4ac1f Fix issues found through FindBugs. 2014-03-11 11:49:48 -07:00
Prachi Damle
1c85af3193 A production/QA Setup does not populate the admin and SYSTEM accounts during database setup. So IAM plugin needs to insert the necessary group <-> account map in the DB during startup 2014-03-10 17:30:00 -07:00
Min Chen
748c090b29 Fix unapproved licens issue. 2014-03-10 11:27:10 -07:00
John Kinsella
09c375379d CLOUDSTACK-6204: removing realhostip dependency
Moving default transport for console proxy, SSVM to http.

See
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes
for more info.

jlk ported Amogh's patch for 4.3 to master - code base is different
enough that patch has multiple issues.

Author: Amogh Vasekar <Amogh Vasekar <amogh.vasekar@citrix.com>
Signed-off-by: John Kinsella <jlk@stratosec.co> 1394398017 -0700
2014-03-09 13:46:57 -07:00
Min Chen
48e08fe676 Merge branch 'master' into rbac. 2014-03-06 14:02:20 -08:00
Min Chen
922cdc0dd1 Fix unapproved licens issue. 2014-03-05 14:31:28 -08:00
Min Chen
63e3eea790 CLOUDSTACK-5920: enable build of IAM services in pom.xml. 2014-03-05 09:40:56 -08:00
Min Chen
c28450c1cd CLOUDSTACK-5920: IAM service plugin. 2014-03-05 09:40:55 -08:00
Min Chen
adb29b2140 CLOUDSTACK-5920: IAM service server. 2014-03-05 09:40:55 -08:00
Alena Prokharchyk
5a8d165afa CLOUDSTACK-6198: use List DS for storing NicProfiles as public network can have more than one nic
Conflicts:
	engine/api/src/com/cloud/vm/VirtualMachineManager.java
	engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
	plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
2014-03-04 15:37:52 -08:00
Min Chen
056d21e14b Fix bugs found from marvin test. 2014-03-04 11:16:45 -08:00
Min Chen
61b47850f2 Bug fix identified by marvin test. 2014-03-03 17:26:16 -08:00
Min Chen
e5d722654a Rename IAMEntityType.AclGroup and AclPolicy. 2014-03-02 16:06:29 -08:00
Min Chen
7e4c3b0e92 Pass UUID for scopeId in addIAMPermissionToIAMPolicyCmd and
removeIAMPermissionFromIAMPolicyCmd.
2014-03-02 15:56:02 -08:00
Kelven Yang
dfb9f49117 Remove inner retry loop when CPVM tries to reconnect to host 2014-02-28 15:35:58 -08:00
Min Chen
9f47466fea Fix some issues in renaming iam api, also fix marvin library. 2014-02-26 17:30:34 -08:00
Prachi Damle
45a96e4e4c renaming Acl to IAM in module.properties for the plugin 2014-02-25 17:02:41 -08:00
Prachi Damle
57b687e8b6 Renaming all beans in the xml files to use IAM insteda of Acl 2014-02-25 16:58:42 -08:00
Prachi Damle
6309887800 iam/server changes: Rename Acl to IAM 2014-02-25 16:43:25 -08:00
Prachi Damle
187f9cd0a2 iam/plugin: Rename Acl to IAM everywhere 2014-02-25 16:43:23 -08:00
Prachi Damle
b2ba6c05b4 Renaming plugin packages to 'iam' instead if 'acl' 2014-02-25 16:43:20 -08:00
Min Chen
26e92af62d Rename IAM api and response package name so that they are following
convention used by ApiXmlDocWriter.
2014-02-18 16:08:06 -08:00
Hugo Trippaers
f1139848e5 Slight optimization, don't run checkstyle on container or non-java projects. 2014-02-18 12:24:11 +01:00
Min Chen
ebfe947f41 Fixed some bugs encountered in testing iam-plugin apis. 2014-02-14 15:04:29 -08:00
Min Chen
586ee74000 Clean up SecurityChecker.AccessType and modify code to use them
consistently.
2014-02-14 11:23:05 -08:00
Hugo Trippaers
97bad4f9b3 Fix checkstyle and license issues 2014-02-14 18:37:47 +01:00
Ian Southam
33c2c87287 Findbugs finding
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-14 18:37:46 +01:00
miguelaferreira
1237bf3222 Fix findbugs findings in cloudstack-service-console-proxy-rdpclient
Findings:
- 32 int shifted by an amount not in range -31..31:
	The shifts by 32 bits don't actually have any effect on the value
	(as shown by the tests)
- possible null pointer dereference
- repeated conditional test
- field only ever set to null
	All other uses of the field were to check if it was null,
	which it was, so it was removed

Other actions:
- Upgrade jUnit to version 4
- Add PowerMock dependency

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-14 18:37:46 +01:00
Hugo Trippaers
cc6938e3a8 Findbugs : Fix several "of concern" findings. 2014-02-14 18:37:46 +01:00
Min Chen
4b75fa806a Fix a NPE bug in listAclPolicies. 2014-02-13 17:57:49 -08:00
Min Chen
5bfc75cac9 Fix test build failure. 2014-02-13 11:21:07 -08:00
Min Chen
5854c0bbeb Fix Path cannot be null error in creating ACL Policy. 2014-02-11 22:45:57 -08:00
Min Chen
97ec3f6628 Fix an AclEntityType cast bug. 2014-02-11 22:26:52 -08:00
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
Hugo Trippaers
7cb4753b3a Properly clean the target dir of the console-proxy server 2013-08-13 17:57:55 +02:00
Hugo Trippaers
e7f8c6a0a6 More logical naming and disabling the plugin as it is not used for anything 2013-08-13 17:57:55 +02:00
Edison Su
1a6b7d6714 CLOUDSTACK-4216: fix extract volume for kvm 2013-08-12 17:20:15 -07:00
Edison Su
9a89fd94fc CLOUDSTACK-4211: fix s3 on kvm 2013-08-12 17:20:09 -07:00
Sanjay Tripathi
ead3b848d5 CLOUDSTACK-2909: Fix for ; and : keys for IE and chrome. 2013-08-12 18:27:41 +05:30
Sanjay Tripathi
7c708e00d2 CLOUDSTACK-2909: Fix for EN-US keys. Keys are ' and " 2013-08-09 18:49:13 +05:30
Alex Huang
5495f10bce Revert "Reverting the range of commits that broke the build"
This reverts commit b59e3aaefc.
2013-08-08 15:02:40 -07:00
Prasanna Santhanam
b59e3aaefc Reverting the range of commits that broke the build
This reverts commits 30c33415..f6a2c817bc

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-08 14:46:56 +05:30
Alex Huang
942f282a6e Moved config into it's own package 2013-08-07 16:41:02 -07:00
Donal Lafferty
25fa21f190 Get QuickCloud working again
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-08-07 11:22:32 -07:00
Edison Su
36c7a56d12 CLOUDSTACK-4073: fix s3 on vmware
Conflicts:

	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
2013-08-05 20:23:01 -07:00
Alex Huang
66cca4d9ac Fixed up the pom.xml to use dependencies specified in cloudstack pom 2013-08-02 13:51:47 -07:00
Chip Childers
8225374138 Updating pom.xml version numbers for release 4.3.0-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-08-01 10:35:00 -04:00
Sanjay Tripathi
6ec2bb1518 CLOUDSTACK-2909: patch to fix TAB in US keyboard. 2013-07-30 18:02:27 +05:30
Sanjay Tripathi
33122478c3 CLOUDSTACK-1961: Common issues found in English OS with EN-US standard Keyboard. 2013-07-30 18:02:18 +05:30
Min Chen
42da3efbc3 CLOUDSTACK-3862: Remove S3/Swift-backed Secondary Storage Code. 2013-07-29 14:31:33 -07:00
Edison Su
86d919eee2 CLOUDSTACK-2481: the wait is in seconds in copycommand 2013-07-25 10:32:14 -07:00
Edison Su
80ac885e22 CLOUDSTACK-2304: fix migrate volume for vmware 2013-07-24 19:06:42 -07:00
Min Chen
44cae46014 CLOUDSTACK-3741: generate template.properties so that KVM processor will
not fail with FileNotFound.
2013-07-24 17:51:28 -07:00
Min Chen
7799f6482f CLOUDSTACK-3741: a typo in adding .qcow2 extension. 2013-07-24 14:53:00 -07:00
Min Chen
df452ba13a CLOUDSTACK-3741:Object_Store_Refactor - [KVM] Creation of Template from
Snapshot Fails.
2013-07-24 09:49:28 -07:00
Edison Su
d22bea6031 CLOUDSTACK-2630: fix delta snashpt 2013-07-24 09:48:59 -07:00
Edison Su
be3883b678 fix create template from snapshot if it's swift 2013-07-24 09:48:07 -07:00
Min Chen
f8b5a4159b CLOUDSTACK-3419: [Object_Store_Refactor] Uploaded volume is being
deleted while attaching it to guest VM.
2013-07-20 12:16:55 -07:00
Edison Su
bf32776f9f be able to upload template into swift 2013-07-16 18:07:06 -07:00
Min Chen
9f019ec7c3 CLOUDSTACK-2497: Object_Store_Refactor - Snapshots - Not able to delete
snapshots.
2013-07-16 14:42:29 -07:00
Edison Su
8f4575e877 CLOUDSTACK-3400: add swift support 2013-07-13 02:07:15 -07:00
Edison Su
0c1ae20e77 add inital swift support
Conflicts:

	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/test/com/cloud/resource/MockResourceManagerImpl.java
2013-07-13 02:07:03 -07:00
Wei Zhou
521dcbdcc0 CLOUDSTACK-1475: fix RegisterISO error after Update SSL Certificate 2013-07-11 16:08:26 +02:00
Sanjay Tripathi
8bd1d27315 CLOUDSTACK-1960: Fix for UK Keyboard - Bar symbol i.e. "|". 2013-07-11 10:41:45 +05:30
Edison Su
9aec9c605c merge to master 2013-06-19 18:16:47 -07:00
Laszlo Hornyak
c88d8fb3a2 use commons-lang StringUtils
commons-lang is already a transitive dependency of the utils project, which allows removing some duplicated functionality.
This patch replaces StringUtils.join(String, Object...) with it's commons-lang counterpart.
It also replaces calls to String join(Iterable<? extends Object>, String) in cases where an array is already exist and it is only wrapped into a List.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-06-17 19:17:22 +01:00
Rajesh Battala
6d140538c5 CLOUDSTACK-3004: remove duplicate ssvm-check.sh
ssvm_check.sh remove the duplicate file from consoleproxy and include the
script from secondary storage folder while packing iso

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-15 11:21:46 +05:30
Edison Su
f41c800d88 merge to master 2013-06-14 19:06:33 -07:00
Edison Su
e8b0cff1c6 CLOUDSTACK-2658: timeout can't be null 2013-06-14 18:26:20 -07:00
Sanjay Tripathi
18163eaa4d CLOUDSTACK-1960: Key remapping fails to input the keys \ | . of UK Keyboard 2013-06-14 10:21:22 +05:30
Kelven Yang
f38c4e9ea6 Bug CS-17825: Don't rely on XS to cleanup idle session but proactively close it from console proxy 2013-06-10 17:46:42 -07:00
Min Chen
04b5f53392 Removed unused code handling for DeleteSnapshotBackupCommand since we
don't send that command anymore.
2013-06-07 17:55:05 -07:00
Min Chen
83b080c4b3 Fix a path bug in s3ListTemplate and s3ListVolume, path should include
filename.
2013-06-07 16:48:47 -07:00
Min Chen
66e702222d Simplify various DeleteTemplateCommnad, DeleteVolumeCommand and
DeleteSnapshotBackupCommand to use one DeleteCommand, also provide
BaseImageStoreDriverImpl class for plugin to inherit to avoid code
duplication.
2013-06-06 18:00:38 -07:00
Min Chen
c78f3984fe Fix a bug in copyFromS3ToNfs code about path. 2013-06-06 14:06:26 -07:00
Min Chen
ef03d5a122 Move data store specific extract template/iso logic from
TemplateManager to data store driver.
2013-06-04 11:50:43 -07:00
Min Chen
8a1a51c6fc Clean up deleteSnapshot agent command, since snapshot path is already
stored in snapshot_store_ref, no need to construct path in resource
side.
2013-05-28 13:36:54 -07:00
Min Chen
27133fba7d Simplify clean up snapshots logic in secondary storage and consolidate
to use one agent command DeleteSnapshotBackupCommand for snapshot
deletion task by removing CleanupSnapshotBackupCommand.
2013-05-25 20:48:15 -07:00
Edison Su
0ed441c690 CLOUDSTACK-2637: fix upload volume 2013-05-24 19:00:52 -07:00
Min Chen
98af424053 Merge branch 'master' into object_store. 2013-05-23 18:00:15 -07:00
Min Chen
039098469a CLOUDSTACK-2584: set Format value in CopyCommand. 2013-05-22 14:33:40 -07:00
Edison Su
5af888c67a add image format in volumevo 2013-05-22 13:38:11 -07:00
Rajesh Battala
11f85c9c9e CLOUDSTACK-2398: ssvm-check.sh failed with permission error
RPCbind service is running in the 4.2 systemVMs resulting in ssvm-check
trying to write to the mountpoint. Avoid writing to the rpc_pipefs.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-22 13:58:36 +05:30
Edison Su
827a1a229b CLOUDSTACK-2584: fix create template from s3 2013-05-21 16:55:41 -07:00
Min Chen
a4e6784e0b CLOUDSTACK-2578: NPE in deleting template from S3. 2013-05-21 14:43:32 -07:00
Min Chen
84607c1e53 Fix CLOUDSTACK-2537: Use mount.parent configured value to mount NFS
cache on MS to avoid permission issue.
2013-05-17 17:49:58 -07:00
Min Chen
b66c484905 Fix size issue in copying template from S3 to cache storage to make
system vm up.
2013-05-15 18:54:55 -07:00
Edison Su
a0c3d280b4 merge to master 2013-05-15 00:40:53 -07:00
Edison Su
879a954b98 delete snapshot at the backend 2013-05-14 21:58:07 -07:00
Edison Su
0ce01e56db set template size when creating template from snapshot 2013-05-13 16:45:03 -07:00
Edison Su
a7480530f7 fix RAT 2013-05-13 16:22:46 -07:00
Min Chen
0b9e0c0f3a Override getRootDir in LocalNfsSecondaryStorageResource to make mount
successfully on MS side. Now S3 is working.
2013-05-12 17:41:44 -07:00
Min Chen
fdb523d219 Remove a debug code. 2013-05-12 00:01:44 -07:00
Min Chen
1bd216fc48 Merge with latest code rebased from master 2013-05-11 21:05:54 -07:00
Nitin Mehta
c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
Alex Huang
342624e0eb Merged with head 2013-05-10 16:33:57 -07:00
Alex Huang
3047929367 Merged 2013-05-10 16:21:43 -07:00
Sanjay Tripathi
b6cb23cb99 CLOUDSTACK-957: Localization -- Add UK keyboard support. 2013-05-08 12:06:07 +05:30
Alex Huang
e5d331ee58 Missing file and updated .gitignore 2013-05-06 16:34:40 -07:00
Alex Huang
3722d66aae Fixed up unit testing to use only an in class TestConfiguration 2013-05-06 16:34:27 -07:00
Alex Huang
074df0b415 Fixed an incorrect unit test for affinity group. Removed some useless pom.xml. 2013-05-06 16:34:26 -07:00
Alex Huang
f6913b5088 Removed files that are no longer used and further separated out the files in the core project 2013-05-06 16:34:21 -07:00
Marcus Sorensen
7fa57922a4 Detail: Delete KVMHA dir contents if found when deleting templates, volumes
from Nfs Secondary storage

BUG-ID: CLOUDSTACK-2173
Bugfix-for: 4.2
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1366838425 -0600
2013-04-24 15:20:25 -06:00
Kelven Yang
34f8f795e1 CLOUDSTACK-2039: Improve console access security with 128-bit AES encryption and securely-randomized key generation 2013-04-15 16:52:22 -07:00
Chiradeep Vittal
2e6c65fd34 QuickCloud: sanitize logs for normal running of agents outside systemvm 2013-04-09 14:45:27 -07:00
Chiradeep Vittal
778a59fbf6 QuickCloud: move devcloud configuration into pom profile for exec:java
Also ignore agent.properties in RAT since
a. they are trivial
b. they are modified by the java code (stripping the license)

QuickCloud: proper path for log.home

QuickCloud: proper path for secstorage.sh
2013-04-09 14:45:26 -07:00
Chiradeep Vittal
5ff8bcaa2e QuickCloud: when using SSVM, pass in the new name of the SS class (com.cloud -> org.apache.cloudstack)
QuickCloud : configuration moved to applicationContext.xml from componentContext.xml
QuickCloud: default to enabled state for devcloud zone
QuickCloud: environment.properties helps customize location of pid file
2013-04-09 14:45:26 -07:00
Chiradeep Vittal
936973aff7 QuickCloud: launch scripts for secondary storage and console proxy outside system vm
QuickCloud: remove stuff added by the daemon
2013-04-09 14:45:26 -07:00
Chiradeep Vittal
c5b11df6b7 QuickCloud: option to build with componentContext tailored for quickcloud
For now it replaces ConsoleProxyManagerImpl with StaticConsoleProxyManager
Usage: mvn install -Dquickcloud

QuickCloud: rename deploy profile

QuickCloud: remove cyclic dependency introduced in nonoss build by moving SecondaryStorageDiscoverer into services
However with this fix, developers will be unable to run 'PremiumSecondaryStorageResource' (for VMWare installations) using mvn exec:java.
Instead they will have to use the exploded archive from systemvm.zip
2013-04-09 14:45:26 -07:00
Chiradeep Vittal
21b4635948 QuickCloud: also look for consoleproxy.properties using PropertiesUtil.
When executed with mvn exec:java, the path 'conf' is not on the classpath
2013-04-09 14:45:26 -07:00
Chiradeep Vittal
16790446e5 QuickCloud: start console proxy service from mvn exec:java 2013-04-09 14:45:25 -07:00
Chiradeep Vittal
e7983b25cc QuickCloud: Enable secondary storage daemon to run outside the system vm 2013-04-09 14:45:25 -07:00
Hugo Trippaers
4a7d392f18 Summary: Small changes to the maven phases.
Moved the copy of the systemvm to the package phase as the systemiso is
made during this phase. So in the original config the old systemvm.zip
would be copied to the server.

Add a cleanup to the console-proxy to clean the dist dir during the
clean phase.
2013-04-03 14:55:50 +02:00
Kelven Yang
fb94b72213 CLOUDSTACK-1568,CLOUDSTACK-1664: Fix ActionEvent interception and optimize @DB lookup with caching 2013-03-18 18:07:52 -07:00
Kelven Yang
bf15eb0c7f CLOUDSTACK-1655: A regression in ConsoleProxy caused by deprecating old URL form 2013-03-12 17:30:30 -07:00
Kelven Yang
37bab18c68 Disable acceptence of old-fashion URL form for console access 2013-03-07 18:39:48 -08:00
Kelven Yang
3f2b771e07 CLOUDSTACK-1173: fix the regression caused by life-cycle management changes 2013-03-05 19:03:30 -05:00
Alex Huang
b176654b19 CLOUDSTACK-1273: Fixed the problem with the paths on the systemvm 2013-02-20 12:37:34 -08:00
Rohit Yadav
80d58b6c73 CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:56 +05:30
Rohit Yadav
9fd09a7f5f console-proxy: Fix broken build system due to console-proxy moves
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-13 12:56:40 +05:30
Alex Huang
4869f0cacf Moved console-proxy into services 2013-02-12 16:00:14 -08:00