JoaoJandre commented on code in PR #10325:
URL: https://github.com/apache/cloudstack/pull/10325#discussion_r1946614185
##########
server/src/main/java/com/cloud/server/ManagementServerImpl.java:
##########
@@ -5493,4 +5500,24 @@ public void setLockControllerListener(final
LockControllerListener lockControlle
_lockControllerListener = lockControllerListener;
}
+ @Override
+ @DB
+ @ActionEvent(eventType = EventTypes.EVENT_MANAGEMENT_SERVER_REMOVE,
eventDescription = "removing Management Server")
+ public boolean removeManagementServer(RemoveMgmtCmd cmd) {
+ final Long id = cmd.getId();
+ ManagementServerJoinVO managementServer =
_managementServerJoinDao.findById(id);
+
+ if (managementServer == null) {
+ throw new InvalidParameterValueException(String.format("Unable to
find a Management Server with ID equal to [%s]", managementServer.getUuid()));
+ }
+
+ if (ManagementServerHost.State.Up.equals(managementServer.getState()))
{
Review Comment:
```suggestion
if
(!ManagementServerHost.State.Down.equals(managementServer.getState())) {
```
If it should only be removed in the Down state ( as said in the logging
message below ) this condition doesn't cover all cases, as we have more states
than Up and Down.
##########
api/src/main/java/org/apache/cloudstack/api/command/admin/management/RemoveMgmtCmd.java:
##########
@@ -0,0 +1,67 @@
+// 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.management;
+
+import com.cloud.event.EventTypes;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.response.ManagementServerResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.context.CallContext;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+
+@APICommand(name = "removeManagementServer", description = "Removes a
Management Server.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
authorized = RoleType.Admin)
+public class RemoveMgmtCmd extends BaseCmd {
Review Comment:
I would use the name of the class equal to the name of the API + cmd. This
is more or less the default.
```suggestion
public class RemoveManagementServerCmd extends BaseCmd {
```
##########
server/src/main/java/com/cloud/server/ManagementServerImpl.java:
##########
@@ -1011,6 +1015,8 @@ public class ManagementServerImpl extends ManagerBase
implements ManagementServe
UserDataManager userDataManager;
@Inject
StoragePoolTagsDao storagePoolTagsDao;
+ @Inject
+ protected ManagementServerJoinDao _managementServerJoinDao;
Review Comment:
```suggestion
protected ManagementServerJoinDao managementServerJoinDao;
```
The underscore at the start is a legacy naming "convention" that is not used
by the project anymore. The current convention is to use plain camelCase
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Coding+conventions
--
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: commits-unsubscr...@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
