base changes for checkhealthcommand handling

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

engine/components-api/src/main/java/com/cloud/hypervisor/ExternalProvisioner.java

@@ -18,6 +18,8 @@
 
 import java.util.Map;
 
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.CheckHealthCommand;
 import com.cloud.agent.api.HostVmStateReportEntry;
 import com.cloud.agent.api.PostExternalProvisioningAnswer;
 import com.cloud.agent.api.PostExternalProvisioningCommand;
@@ -65,4 +67,6 @@ public interface ExternalProvisioner extends Manager {
     RunCustomActionAnswer runCustomAction(String extensionName, RunCustomActionCommand cmd);
 
     void prepareScripts(String extensionName);
+
+    Answer checkHealth(String extensionName, CheckHealthCommand cmd);
 }

plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/simpleprovisioner/SimpleExternalProvisioner.java

@@ -39,6 +39,8 @@
 import org.apache.commons.collections.CollectionUtils;
 
 import com.cloud.agent.AgentManager;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.CheckHealthCommand;
 import com.cloud.agent.api.HostVmStateReportEntry;
 import com.cloud.agent.api.PostExternalProvisioningAnswer;
 import com.cloud.agent.api.PostExternalProvisioningCommand;
@@ -531,6 +533,16 @@ public Pair<Boolean, String> executeExternalCommand(String filename, String acti
         }
     }
 
+    @Override
+    public Answer checkHealth(String extensionName, CheckHealthCommand cmd) {
+        String extensionPath = getExtensionCheckedScriptPath(extensionName);
+        if (StringUtils.isEmpty(extensionPath)) {
+            return new Answer(cmd, false, "Extension not configured");
+        }
+        // ToDo: should we check with provisioner script?
+        return new Answer(cmd);
+    }
+
     private String prepareParameters(Map<String, String> details) throws JsonProcessingException {
         ObjectMapper objectMapper = new ObjectMapper();
         return objectMapper.writeValueAsString(details);

plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/resource/ExternalResourceBase.java

@@ -30,6 +30,7 @@
 
 import com.cloud.agent.IAgentControl;
 import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.CheckHealthCommand;
 import com.cloud.agent.api.CheckNetworkAnswer;
 import com.cloud.agent.api.CheckNetworkCommand;
 import com.cloud.agent.api.Command;
@@ -155,6 +156,8 @@ public Answer executeRequest(Command cmd) {
                 return execute((PingTestCommand) cmd);
             } else if (cmd instanceof MaintainCommand) {
                 return execute((MaintainCommand) cmd);
+            } else if (cmd instanceof CheckHealthCommand) {
+                return execute((CheckHealthCommand) cmd);
             } else if (cmd instanceof RunCustomActionCommand) {
                 return execute((RunCustomActionCommand) cmd);
             } else {
@@ -212,6 +215,10 @@ public StartAnswer execute(StartCommand cmd) {
         return externalProvisioner.startInstance(_extensionName, cmd);
     }
 
+    private Answer execute(CheckHealthCommand cmd) {
+        return externalProvisioner.checkHealth(_extensionName, cmd);
+    }
+
     @Override
     public void disconnected() {