51 Commits

Author SHA1 Message Date
Wei Zhou
af2f21894c CLOUDSTACK-7983: Create Disk/Service Offering for Domain Admin 2014-12-01 13:03:37 +01:00
Wido den Hollander
4bd49df3f5 Use InetAddress for passing Remote Address instead of String 2014-11-21 12:10:35 +01:00
Anthony Xu
90fe6d8087 removed trailing space 2014-08-13 11:09:38 -07:00
Rajani Karuturi
736ff5f8e5 Fixed CLOUDSTACK-7303 [LDAP] while importing ldap users, update the user info if it already exists in cloudstack 2014-08-11 17:54:31 +05:30
Daan Hoogland
91e300eb82 Revert "CLOUDSTACK-6967 merge problem resolution"
This reverts commit 4610c76fa9178ca056ad523cdf980a7ee3533ef2.
2014-06-24 10:21:03 +02:00
Funs Kessen
4610c76fa9 CLOUDSTACK-6967 merge problem resolution 2014-06-23 15:08:51 +02:00
Min Chen
b259bccee7 CLOUDSTACK-6742: listVolumes - As regularuser , able to list Vms and
volumes of other users.
2014-05-22 18:28:00 -07:00
Min Chen
ba848087f8 Disable IAM feature from 4.4 release. 2014-05-22 18:27:08 -07:00
Sachchidanand Vaidya
bd3ec50dea Added unit tests for Juniper contrail VM Interface Model and Instance Ip Model class
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-05-04 21:46:11 +02:00
Min Chen
3314e11b70 CLOUDSTACK-6569: IAM - Regular user is able to listNetworks of another
user in the same domain , by passing account and domainId.
2014-05-02 14:58:11 -07:00
Min Chen
a9072a6612 CLOUDSTACK-6513: Optimize code by removing deprecated utility to
QueryManagerImpl as private method just used for listTemplates and
listAffinityGroups to avoid misuse by new list APIs.
2014-05-01 15:57:28 -07:00
Rajani Karuturi
f4779b4d0c Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account
Conflicts:
	api/src/com/cloud/user/AccountService.java
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java

Signed-off-by: Koushik Das <koushik@apache.org>
2014-04-29 14:49:06 +05:30
Min Chen
44ff7fea5f CLOUDSTACK-6513: IAM - Templates - When templates are listed with
templatefilter="shared" is used , we see public templates also being
included in the list. This commit reverts listTemplates behavior to 4.3
old logic without using consistent interpretation of list parameters
adopted in new IAM model.
2014-04-28 11:11:53 -07:00
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
Min Chen
da13165743 Change AccountManagerImpl.checkAccess to invoke SecurityChecker
interface that takes multiple controlled entities.
2014-04-17 17:53:01 -07:00
Min Chen
94ebc90877 Remove usage of sameOwner checkAccess invocation, and convert to
OperateEntry IAM check.
2014-04-04 16:38:29 -07:00
Prachi Damle
1f6263dead fix build for the juniper-contrail plugin 2014-03-13 13:50:36 -07:00
Min Chen
99bdc8d875 Merge branch 'master' into rbac. 2014-03-13 11:05:03 -07:00
Alena Prokharchyk
7b0c5cfcbe Removed unused methods from BaseCmd class. Moved some helper methods to AccountManagerImpl class 2014-03-07 11:33:10 -08:00
Min Chen
48e08fe676 Merge branch 'master' into rbac. 2014-03-06 14:02:20 -08:00
sbalineni
8dca59d4f9 mvn clean - cleanps up only target, dist directories; testclient.log file should be generated inside target directory
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-03-04 11:57:20 +01:00
wrodrigues
3199de69fe Fixes on Contrail and Mon InMemory plugins; adding comments about the changes.
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-14 18:37:47 +01:00
Min Chen
3b58a45e04 Merge branch 'master' into rbac. 2014-02-07 13:43:36 -08:00
Alex Huang
7f34282dfa Removed references to secondarystoragevmmanager from code that doesn't use it. 2014-02-05 01:39:15 +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
Sachchidanand Vaidya
cc98125067 These are additional fixes to make Juniper Contrail plugin work 2014-01-28 08:58:22 +00:00
Marcus Sorensen
0502d2f375 CLOUDSTACK-5697 This patchset fixes a bug with the recently merged
vxlan code. Users can set a physical network to isolation type 'vxlan',
put public traffic on that physical network, and it will still attempt
to use 'vlan' isolation on the KVM hosts. This is going to be an issue
for other isolation types as well, but I'm not familiar with them, so
I'm just fixing vxlan for now.
2014-01-27 12:11:18 -07:00
Prachi Damle
af14699c4c fixing the build _ AffinityGroup command changes 2014-01-23 18:17:43 -08:00
Min Chen
929fbabaa2 Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
sbalineni
cc2b1c4961 Contrail plugin fixes -master branch, single commit, no transaction wrappers
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-15 14:11:49 -08:00
Min Chen
6c1849f4bf Fix Spring wiring issues in starting up MS. 2014-01-14 16:20:30 -08:00
Sachchidanand Vaidya
0bff705621 Add L3VPN isolation method for contrail plugin
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-14 13:55:35 -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
Min Chen
bae498c89e Handle search of those entities without db view created using new ACL
model.
2014-01-13 21:55:56 -08:00
Murali Reddy
af657b3d71 CLOUDSTACK-5861: networks that failed to implement can not be destroyed
introduces a force option in delete network to forcifully delete a
network. This comes handy in rare cases where network fails to implenet
and network is in shutdown state, but network shutdown to rollback
implement process fails as well.

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
	server/src/com/cloud/user/DomainManagerImpl.java
2014-01-13 23:28:35 +05:30
Hugo Trippaers
50be9a447a Apply proper license header and formatting to the new contrail tests #2 2013-12-30 09:38:10 +01:00
Hugo Trippaers
4e88197459 Apply proper license header and formatting to the new contrail tests 2013-12-30 09:15:06 +01:00
Sachchidanand Vaidya
7f9683af85 Added Virtual-Network and Virtual-Machine Model unit test.
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-12-30 08:57:21 +01:00
Min Chen
729a79e85c Refactor db view based list apis to use new IAM acl search criteria. 2013-12-16 14:31:32 -08:00
Alex Huang
be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
Min Chen
11c0c263f2 QueryChecker interface and ACL search criteria to be used for query api
for entities with db views created.
2013-11-22 16:36:38 -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
Prachi Damle
e0d2423f06 Refactoring account_type for Domain_Admin and Normal_User types 2013-11-20 16:53:59 -08:00
Min Chen
91e176cb0d Fix a bug in listVm logic to use revokedIds and grantedIds. 2013-11-19 16:41:40 -08:00
Rajesh Battala
19e9849d86 Enabled the traffic lable support the hyperv hypervisor type. Modified the physical_network_traffic_types table to introduce hyperv_network lable column.
Modified associated VO's and impls classes. Modified the List/Update/Add TrafficType command api's and response classes.
Fixed the Unit tests
2013-11-08 20:21:18 +05:30
Min Chen
ce3638bb03 Merge branch 'master' into rbac. 2013-11-04 15:49:29 -08:00
Hugo Trippaers
479f404aea Fix several rat issues introduced by recent commits 2013-11-04 20:14:46 +01:00
Edison Su
143fbc37a6 fix build 2013-11-01 16:02:24 -07:00