harikrishna-patnala commented on code in PR #7446:
URL: https://github.com/apache/cloudstack/pull/7446#discussion_r1381126818
##########
engine/schema/src/main/java/org/apache/cloudstack/affinity/dao/AffinityGroupDomainMapDaoImpl.java:
##########
@@ -16,23 +16,46 @@
// under the License.
package org.apache.cloudstack.affinity.dao;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.annotation.PostConstruct;
+import com.cloud.network.dao.NetworkDomainDaoImpl;
+import com.cloud.utils.db.TransactionLegacy;
Review Comment:
reorder these imports please
##########
server/src/main/java/com/cloud/user/DomainManagerImpl.java:
##########
@@ -900,4 +912,171 @@ private void updateDomainChildren(DomainVO domain, String
updatedDomainPrefix) {
}
}
+ @Override
+ @ActionEvent(eventType = EventTypes.EVENT_DOMAIN_MOVE, eventDescription =
"moving Domain")
+ @DB
+ public Domain moveDomainAndChildrenToNewParentDomain(MoveDomainCmd cmd)
throws ResourceAllocationException {
+ Long idOfDomainToBeMoved = cmd.getDomainId();
+ Long idOfNewParentDomain = cmd.getParentDomainId();
+
Review Comment:
I think we also need to check the access permissions something like
Account caller = getCaller();
_accountMgr.checkAccess(caller, domain);
and
_accountMgr.checkAccess(caller, parentDomain);
##########
api/src/main/java/org/apache/cloudstack/api/command/admin/domain/MoveDomainCmd.java:
##########
@@ -0,0 +1,75 @@
+// 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.admin.domain;
+
+import com.cloud.domain.Domain;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.user.Account;
+import org.apache.cloudstack.acl.RoleType;
+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 java.util.Objects;
+
+@APICommand(name = "moveDomain", description = "Moves a domain and its
children to a new parent domain.", responseObject = DomainResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized
= {RoleType.Admin})
+public class MoveDomainCmd extends BaseCmd {
+
+ private static final String APINAME = "moveDomain";
+ @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID,
required = true, entityType = DomainResponse.class, description = "The ID of
the domain to be moved.")
+ private Long domainId;
+
+ @Parameter(name = ApiConstants.PARENT_DOMAIN_ID, type = CommandType.UUID,
entityType = DomainResponse.class,
+ description = "The ID of the new parent domain of the domain to be
moved. If no parent domain is specified, the ROOT domain is assumed.")
+ private Long parentDomainId;
+
+ public Long getDomainId() {
+ return domainId;
+ }
+
+ public Long getParentDomainId() {
Review Comment:
is it better to mark the parent DomainId as required field instead of
defaulting it to ROOT ? I think moving domain is an major/important action and
operator should provide exact parent ID for better confirmation.
##########
api/src/main/java/com/cloud/user/DomainService.java:
##########
@@ -18,12 +18,14 @@
import java.util.List;
+import com.cloud.exception.ResourceAllocationException;
Review Comment:
reorder these imports please
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
