First draft including checks

Author: nvazquez

api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UnmanageVMInstanceCmd.java

@@ -43,7 +43,7 @@
 
 @APICommand(name = UnmanageVMInstanceCmd.API_NAME,
         description = "Unmanage a virtual machine from a given cluster.",
-        responseObject = UserVmResponse.class,
+        responseObject = UnmanageVMInstanceResponse.class,
         responseView = ResponseObject.ResponseView.Full,
         requestHasSensitiveInfo = false,
         authorized = {RoleType.Admin},
@@ -60,7 +60,7 @@ public class UnmanageVMInstanceCmd extends BaseAsyncCmd {
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
 
-    @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID,
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID,
             entityType = UserVmResponse.class, required = true,
             description = "The ID of the virtual machine to unmanage")
     private Long vmId;

api/src/main/java/org/apache/cloudstack/api/response/UnmanageVMInstanceResponse.java

@@ -35,6 +35,11 @@ public class UnmanageVMInstanceResponse extends BaseResponse {
     public UnmanageVMInstanceResponse() {
     }
 
+    public UnmanageVMInstanceResponse(boolean success, String details) {
+        this.success = success;
+        this.details = details;
+    }
+
     public boolean isSuccess() {
         return success;
     }

core/src/main/java/com/cloud/agent/api/UnmanageVMInstanceAnswer.java

@@ -0,0 +1,7 @@
+package com.cloud.agent.api;
+
+public class UnmanageVMInstanceAnswer extends Answer {
+
+    public UnmanageVMInstanceAnswer() {
+    }
+}

core/src/main/java/com/cloud/agent/api/UnmanageVMInstanceCommand.java

@@ -0,0 +1,39 @@
+// 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 com.cloud.agent.api;
+
+public class UnmanageVMInstanceCommand extends Command {
+
+    private String instanceName;
+
+    public UnmanageVMInstanceCommand() {
+    }
+
+    public String getInstanceName() {
+        return instanceName;
+    }
+
+    public void setInstanceName(String instanceName) {
+        this.instanceName = instanceName;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return false;
+    }
+}

plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java

@@ -154,6 +154,8 @@
 import com.cloud.agent.api.StoragePoolInfo;
 import com.cloud.agent.api.UnPlugNicAnswer;
 import com.cloud.agent.api.UnPlugNicCommand;
+import com.cloud.agent.api.UnmanageVMInstanceAnswer;
+import com.cloud.agent.api.UnmanageVMInstanceCommand;
 import com.cloud.agent.api.UnregisterNicCommand;
 import com.cloud.agent.api.UnregisterVMCommand;
 import com.cloud.agent.api.UpgradeSnapshotCommand;
@@ -561,6 +563,8 @@ public Answer executeRequest(Command cmd) {
                 answer = execute((UnregisterNicCommand) cmd);
             } else if (clz == GetUnmanagedInstancesCommand.class) {
                 answer = execute((GetUnmanagedInstancesCommand) cmd);
+            } else if (clz == UnmanageVMInstanceCommand.class) {
+                answer = execute((UnmanageVMInstanceCommand) cmd);
             } else {
                 answer = Answer.createUnsupportedCommandAnswer(cmd);
             }
@@ -7098,4 +7102,9 @@ private Answer execute(GetUnmanagedInstancesCommand cmd) {
         }
         return new GetUnmanagedInstancesAnswer(cmd, "", unmanagedInstances);
     }
+
+    private Answer execute(UnmanageVMInstanceCommand cmd) {
+        s_logger.info("Unmanage VMware instance " + cmd.getInstanceName());
+        return new UnmanageVMInstanceAnswer();
+    }
 }

server/src/main/java/org/apache/cloudstack/vm/UnmanageVMManagerImpl.java

@@ -25,6 +25,8 @@
 
 import javax.inject.Inject;
 
+import com.cloud.agent.api.UnmanageVMInstanceAnswer;
+import com.cloud.agent.api.UnmanageVMInstanceCommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.ResponseGenerator;
@@ -1219,9 +1221,27 @@ public List<Class<?>> getCommands() {
 
     @Override
     public UnmanageVMInstanceResponse unmanageVMInstance(UnmanageVMInstanceCmd cmd) {
-        UnmanageVMInstanceResponse response = new UnmanageVMInstanceResponse();
-        response.setSuccess(true);
-        response.setDetails("VM unmanaged successfully");
-        return response;
+        Long vmId = cmd.getVmId();
+        VMInstanceVO vmVO = vmDao.findById(vmId);
+        if (vmVO == null) {
+            return new UnmanageVMInstanceResponse(false, "Could not find VM with id = " + vmId);
+        } else if (vmVO.getState() == VirtualMachine.State.Destroyed || vmVO.getState() == VirtualMachine.State.Expunging) {
+            return new UnmanageVMInstanceResponse(false, "VM with id = " + vmVO.getUuid() + " is destroyed and cannot be unmanaged");
+        }
+        String instanceName = vmVO.getInstanceName();
+        Long hostId = vmVO.getHostId();
+
+        // Communicate with hypervisor (if needed)
+        UnmanageVMInstanceCommand command = new UnmanageVMInstanceCommand();
+        command.setInstanceName(instanceName);
+        Answer ans = agentManager.easySend(hostId, command);
+        if (!(ans instanceof UnmanageVMInstanceAnswer)) {
+            return new UnmanageVMInstanceResponse(false, "Error communicating with host " + hostId);
+        }
+        UnmanageVMInstanceAnswer answer = (UnmanageVMInstanceAnswer) ans;
+
+        //TODO:Management server release
+
+        return new UnmanageVMInstanceResponse(true, "VM " + instanceName + " unmanaged successfully");
     }
 }