You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Rajani Karuturi <ra...@gmail.com> on 2014/04/25 13:33:09 UTC

Review Request 20703: Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/20703/
-----------------------------------------------------------

Review request for cloudstack, Abhinandan Prateek and Ian Duffy.


Bugs: CLOUDSTACK-6509
    https://issues.apache.org/jira/browse/CLOUDSTACK-6509


Repository: cloudstack-git


Description
-------

importing multiple ldap users to the same cloudstack account fails with message account already exists.


Diffs
-----

  api/src/com/cloud/user/AccountService.java 8153a3f 
  plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java 195e932 
  plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java 0878410 
  plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java 5e724e8 
  plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapImportUsersCmdSpec.groovy a66da1f 
  server/src/com/cloud/user/AccountManagerImpl.java d367653 
  server/test/com/cloud/user/MockAccountManagerImpl.java 38cc1a84 
  ui/scripts/accountsWizard.js 6b4907c 

Diff: https://reviews.apache.org/r/20703/diff/


Testing
-------

manually tested. added unittests whereever possible.


Thanks,

Rajani Karuturi


Re: Review Request 20703: Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account

Posted by Koushik Das <ko...@citrix.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/20703/#review41694
-----------------------------------------------------------

Ship it!


Applied to 4.3.
Patch doesn't apply to master/4.4-forward, please create a new one.

- Koushik Das


On April 28, 2014, 10:23 a.m., Rajani Karuturi wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/20703/
> -----------------------------------------------------------
> 
> (Updated April 28, 2014, 10:23 a.m.)
> 
> 
> Review request for cloudstack, Abhinandan Prateek, Ian Duffy, and Koushik Das.
> 
> 
> Bugs: CLOUDSTACK-6509
>     https://issues.apache.org/jira/browse/CLOUDSTACK-6509
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> -------
> 
> importing multiple ldap users to the same cloudstack account fails with message account already exists.
> 
> 
> Diffs
> -----
> 
>   api/src/com/cloud/user/AccountService.java 8153a3f 
>   plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java 195e932 
>   plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java 0878410 
>   plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java 5e724e8 
>   plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapImportUsersCmdSpec.groovy a66da1f 
>   server/src/com/cloud/user/AccountManagerImpl.java d367653 
>   server/test/com/cloud/user/MockAccountManagerImpl.java 38cc1a84 
>   ui/scripts/accountsWizard.js 6b4907c 
> 
> Diff: https://reviews.apache.org/r/20703/diff/
> 
> 
> Testing
> -------
> 
> manually tested. added unittests whereever possible.
> 
> 
> Thanks,
> 
> Rajani Karuturi
> 
>


Re: Review Request 20703: Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account

Posted by ASF Subversion and Git Services <as...@urd.zones.apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/20703/#review41703
-----------------------------------------------------------


Commit 69e550f5ea0ea1b85adcce6366d97cffa0276e73 in cloudstack's branch refs/heads/4.4 from Rajani Karuturi
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=69e550f ]

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 <ko...@apache.org>


- ASF Subversion and Git Services


On April 29, 2014, 8:52 a.m., Rajani Karuturi wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/20703/
> -----------------------------------------------------------
> 
> (Updated April 29, 2014, 8:52 a.m.)
> 
> 
> Review request for cloudstack, Abhinandan Prateek, Ian Duffy, and Koushik Das.
> 
> 
> Bugs: CLOUDSTACK-6509
>     https://issues.apache.org/jira/browse/CLOUDSTACK-6509
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> -------
> 
> importing multiple ldap users to the same cloudstack account fails with message account already exists.
> 
> 
> Diffs
> -----
> 
>   api/src/com/cloud/user/AccountService.java 71136bf 
>   plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java cad5a50 
>   plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java 626bb8f 
>   plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java 887ad00 
>   plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapImportUsersCmdSpec.groovy a66da1f 
>   server/src/com/cloud/user/AccountManagerImpl.java 7bd46f0 
>   server/test/com/cloud/user/MockAccountManagerImpl.java 2f57abc 
>   ui/scripts/accountsWizard.js 6b4907c 
> 
> Diff: https://reviews.apache.org/r/20703/diff/
> 
> 
> Testing
> -------
> 
> manually tested. added unittests whereever possible.
> 
> 
> Thanks,
> 
> Rajani Karuturi
> 
>


Re: Review Request 20703: Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account

Posted by ASF Subversion and Git Services <as...@urd.zones.apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/20703/#review41701
-----------------------------------------------------------


Commit f4779b4d0ce9fddc80c8df91b594e3991b56af58 in cloudstack's branch refs/heads/master from Rajani Karuturi
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=f4779b4 ]

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 <ko...@apache.org>


- ASF Subversion and Git Services


On April 29, 2014, 8:52 a.m., Rajani Karuturi wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/20703/
> -----------------------------------------------------------
> 
> (Updated April 29, 2014, 8:52 a.m.)
> 
> 
> Review request for cloudstack, Abhinandan Prateek, Ian Duffy, and Koushik Das.
> 
> 
> Bugs: CLOUDSTACK-6509
>     https://issues.apache.org/jira/browse/CLOUDSTACK-6509
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> -------
> 
> importing multiple ldap users to the same cloudstack account fails with message account already exists.
> 
> 
> Diffs
> -----
> 
>   api/src/com/cloud/user/AccountService.java 71136bf 
>   plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java cad5a50 
>   plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java 626bb8f 
>   plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java 887ad00 
>   plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapImportUsersCmdSpec.groovy a66da1f 
>   server/src/com/cloud/user/AccountManagerImpl.java 7bd46f0 
>   server/test/com/cloud/user/MockAccountManagerImpl.java 2f57abc 
>   ui/scripts/accountsWizard.js 6b4907c 
> 
> Diff: https://reviews.apache.org/r/20703/diff/
> 
> 
> Testing
> -------
> 
> manually tested. added unittests whereever possible.
> 
> 
> Thanks,
> 
> Rajani Karuturi
> 
>


Re: Review Request 20703: Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account

Posted by ASF Subversion and Git Services <as...@urd.zones.apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/20703/#review41700
-----------------------------------------------------------


Commit 08ec6ebddaf5a5cddab2be8dfcebf75b91dafa92 in cloudstack's branch refs/heads/4.4-forward from Rajani Karuturi
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=08ec6eb ]

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 <ko...@apache.org>


- ASF Subversion and Git Services


On April 29, 2014, 8:52 a.m., Rajani Karuturi wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/20703/
> -----------------------------------------------------------
> 
> (Updated April 29, 2014, 8:52 a.m.)
> 
> 
> Review request for cloudstack, Abhinandan Prateek, Ian Duffy, and Koushik Das.
> 
> 
> Bugs: CLOUDSTACK-6509
>     https://issues.apache.org/jira/browse/CLOUDSTACK-6509
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> -------
> 
> importing multiple ldap users to the same cloudstack account fails with message account already exists.
> 
> 
> Diffs
> -----
> 
>   api/src/com/cloud/user/AccountService.java 71136bf 
>   plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java cad5a50 
>   plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java 626bb8f 
>   plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java 887ad00 
>   plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapImportUsersCmdSpec.groovy a66da1f 
>   server/src/com/cloud/user/AccountManagerImpl.java 7bd46f0 
>   server/test/com/cloud/user/MockAccountManagerImpl.java 2f57abc 
>   ui/scripts/accountsWizard.js 6b4907c 
> 
> Diff: https://reviews.apache.org/r/20703/diff/
> 
> 
> Testing
> -------
> 
> manually tested. added unittests whereever possible.
> 
> 
> Thanks,
> 
> Rajani Karuturi
> 
>


Re: Review Request 20703: Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account

Posted by Rajani Karuturi <ra...@gmail.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/20703/
-----------------------------------------------------------

(Updated April 29, 2014, 8:52 a.m.)


Review request for cloudstack, Abhinandan Prateek, Ian Duffy, and Koushik Das.


Changes
-------

updated a new patch for 4.4 after resolving merge conflicts


Bugs: CLOUDSTACK-6509
    https://issues.apache.org/jira/browse/CLOUDSTACK-6509


Repository: cloudstack-git


Description
-------

importing multiple ldap users to the same cloudstack account fails with message account already exists.


Diffs (updated)
-----

  api/src/com/cloud/user/AccountService.java 71136bf 
  plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java cad5a50 
  plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java 626bb8f 
  plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java 887ad00 
  plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapImportUsersCmdSpec.groovy a66da1f 
  server/src/com/cloud/user/AccountManagerImpl.java 7bd46f0 
  server/test/com/cloud/user/MockAccountManagerImpl.java 2f57abc 
  ui/scripts/accountsWizard.js 6b4907c 

Diff: https://reviews.apache.org/r/20703/diff/


Testing
-------

manually tested. added unittests whereever possible.


Thanks,

Rajani Karuturi


Re: Review Request 20703: Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account

Posted by ASF Subversion and Git Services <as...@urd.zones.apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/20703/#review41693
-----------------------------------------------------------


Commit 9303e7016b8c2d20c8bf7d86dcde738983552d4e in cloudstack's branch refs/heads/4.3 from Rajani Karuturi
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=9303e70 ]

Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account

Signed-off-by: Koushik Das <ko...@apache.org>


- ASF Subversion and Git Services


On April 28, 2014, 10:23 a.m., Rajani Karuturi wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/20703/
> -----------------------------------------------------------
> 
> (Updated April 28, 2014, 10:23 a.m.)
> 
> 
> Review request for cloudstack, Abhinandan Prateek, Ian Duffy, and Koushik Das.
> 
> 
> Bugs: CLOUDSTACK-6509
>     https://issues.apache.org/jira/browse/CLOUDSTACK-6509
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> -------
> 
> importing multiple ldap users to the same cloudstack account fails with message account already exists.
> 
> 
> Diffs
> -----
> 
>   api/src/com/cloud/user/AccountService.java 8153a3f 
>   plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java 195e932 
>   plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java 0878410 
>   plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java 5e724e8 
>   plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapImportUsersCmdSpec.groovy a66da1f 
>   server/src/com/cloud/user/AccountManagerImpl.java d367653 
>   server/test/com/cloud/user/MockAccountManagerImpl.java 38cc1a84 
>   ui/scripts/accountsWizard.js 6b4907c 
> 
> Diff: https://reviews.apache.org/r/20703/diff/
> 
> 
> Testing
> -------
> 
> manually tested. added unittests whereever possible.
> 
> 
> Thanks,
> 
> Rajani Karuturi
> 
>


Re: Review Request 20703: Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account

Posted by Rajani Karuturi <ra...@gmail.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/20703/
-----------------------------------------------------------

(Updated April 28, 2014, 10:23 a.m.)


Review request for cloudstack, Abhinandan Prateek, Ian Duffy, and Koushik Das.


Bugs: CLOUDSTACK-6509
    https://issues.apache.org/jira/browse/CLOUDSTACK-6509


Repository: cloudstack-git


Description
-------

importing multiple ldap users to the same cloudstack account fails with message account already exists.


Diffs
-----

  api/src/com/cloud/user/AccountService.java 8153a3f 
  plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java 195e932 
  plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java 0878410 
  plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java 5e724e8 
  plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapImportUsersCmdSpec.groovy a66da1f 
  server/src/com/cloud/user/AccountManagerImpl.java d367653 
  server/test/com/cloud/user/MockAccountManagerImpl.java 38cc1a84 
  ui/scripts/accountsWizard.js 6b4907c 

Diff: https://reviews.apache.org/r/20703/diff/


Testing
-------

manually tested. added unittests whereever possible.


Thanks,

Rajani Karuturi


Re: Review Request 20703: Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account

Posted by Rajani Karuturi <ra...@gmail.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/20703/
-----------------------------------------------------------

(Updated April 28, 2014, 10:17 a.m.)


Review request for cloudstack, Abhinandan Prateek, Ian Duffy, and koushik pv.


Bugs: CLOUDSTACK-6509
    https://issues.apache.org/jira/browse/CLOUDSTACK-6509


Repository: cloudstack-git


Description
-------

importing multiple ldap users to the same cloudstack account fails with message account already exists.


Diffs
-----

  api/src/com/cloud/user/AccountService.java 8153a3f 
  plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java 195e932 
  plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java 0878410 
  plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java 5e724e8 
  plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapImportUsersCmdSpec.groovy a66da1f 
  server/src/com/cloud/user/AccountManagerImpl.java d367653 
  server/test/com/cloud/user/MockAccountManagerImpl.java 38cc1a84 
  ui/scripts/accountsWizard.js 6b4907c 

Diff: https://reviews.apache.org/r/20703/diff/


Testing
-------

manually tested. added unittests whereever possible.


Thanks,

Rajani Karuturi