Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
From: karuturi <git@git.apache.org>
To: dev@cloudstack.apache.org
Reply-To: dev@cloudstack.apache.org
References: <git-pr-755-cloudstack@git.apache.org>
In-Reply-To: <git-pr-755-cloudstack@git.apache.org>
Subject: [GitHub] cloudstack pull request: Cloudstack:8647 LDAP Trust AD and
 Autoimp...
Content-Type: text/plain
Message-Id: <20150901040346.27EB8DF99E@git1-us-west.apache.org>
Date: Tue,  1 Sep 2015 04:03:46 +0000 (UTC)

Github user karuturi commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/755#discussion_r38383999
  
    --- Diff: plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LinkDomainToLdapCmd.java ---
    @@ -0,0 +1,114 @@
    +/*
    + * Licensed to the Apache Software Foundation (ASF) under one
    + * or more contributor license agreements.  See the NOTICE file
    + * distributed with this work for additional information
    + * regarding copyright ownership.  The ASF licenses this file
    + * to you under the Apache License, Version 2.0 (the
    + * "License"); you may not use this file except in compliance
    + * with the License.  You may obtain a copy of the License at
    + *
    + *   http://www.apache.org/licenses/LICENSE-2.0
    + *
    + * Unless required by applicable law or agreed to in writing,
    + * software distributed under the License is distributed on an
    + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
    + * KIND, either express or implied.  See the License for the
    + * specific language governing permissions and limitations
    + * under the License.
    + */
    +package org.apache.cloudstack.api.command;
    +
    +import javax.inject.Inject;
    +
    +import com.cloud.exception.InvalidParameterValueException;
    +import com.cloud.user.AccountService;
    +import com.cloud.user.User;
    +import com.cloud.user.UserAccount;
    +import org.apache.cloudstack.api.APICommand;
    +import org.apache.cloudstack.api.ApiConstants;
    +import org.apache.cloudstack.api.ApiErrorCode;
    +import org.apache.cloudstack.api.BaseCmd;
    +import org.apache.cloudstack.api.Parameter;
    +import org.apache.cloudstack.api.ServerApiException;
    +import org.apache.cloudstack.api.response.DomainResponse;
    +import org.apache.cloudstack.api.response.LinkDomainToLdapResponse;
    +import org.apache.cloudstack.ldap.LdapManager;
    +import org.apache.cloudstack.ldap.LdapUser;
    +import org.apache.cloudstack.ldap.NoLdapUserMatchingQueryException;
    +import org.apache.log4j.Logger;
    +
    +import com.cloud.user.Account;
    +
    +import java.util.UUID;
    +
    +@APICommand(name = "linkDomainToLdap", description = "link an existing cloudstack domain to group or OU in ldap", responseObject = LinkDomainToLdapResponse.class, since = "4.6.0",
    +    requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
    +public class LinkDomainToLdapCmd extends BaseCmd {
    +    public static final Logger s_logger = Logger.getLogger(LinkDomainToLdapCmd.class.getName());
    +    private static final String s_name = "linkdomaintoldapresponse";
    +
    +    @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "The id of the domain which has to be linked to LDAP.")
    +    private Long domainId;
    +
    +    @Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, required = true, description = "type of the ldap name. GROUP or OU")
    +    private String type;
    +
    +    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "name of the group or OU in LDAP")
    +    private String name;
    +
    +    @Parameter(name = ApiConstants.ADMIN, type = CommandType.STRING, required = false, description = "domain admin username in LDAP ")
    +    private String admin;
    +
    +    @Parameter(name = ApiConstants.ACCOUNT_TYPE, type = CommandType.SHORT, required = true, description = "Type of the account to auto import. Specify 0 for user, 1 for root " +
    +        "admin, and 2 for domain admin")
    +    private short accountType;
    +
    +    @Inject
    +    private LdapManager _ldapManager;
    +
    +    @Inject
    +    public AccountService _accountService;
    +
    +    @Override
    +    public void execute() throws ServerApiException {
    +        try {
    +            LinkDomainToLdapResponse response = _ldapManager.linkDomainToLdap(domainId, type, name, accountType);
    --- End diff --
    
    it is ok for the first call to succeed and the second to fail. for example if the username already exists, it will fail. I will check if tx is required.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---