enable destroy for external vms. get deployvm from vmto.

Author: abh1sar

engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql

@@ -317,8 +317,7 @@ DROP PROCEDURE IF EXISTS `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`;
 CREATE PROCEDURE `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`(
     IN ext_name VARCHAR(255),
     IN detail_key VARCHAR(255),
-    IN detail_value TEXT,
-    IN display_detail TINYINT(1)
+    IN detail_value TEXT
 )
 BEGIN
     DECLARE ext_id BIGINT
@@ -331,18 +330,18 @@ BEGIN
             extension_id, name, value, display
         )
         VALUES (
-            ext_id, detail_key, detail_value, display_detail
+            ext_id, detail_key, detail_value, 1
         )
     ;END IF
 ;END;
 
 CALL `cloud`.`INSERT_EXTENSION_IF_NOT_EXISTS`('Proxmox', 'Sample extension for Proxmox written in bash', 'Proxmox/proxmox.sh');
-CALL `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`('Proxmox', 'url', '', 1);
-CALL `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`('Proxmox', 'user', '', 1);
-CALL `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`('Proxmox', 'token', '', 1);
-CALL `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`('Proxmox', 'secret', '', 0);
+CALL `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`('Proxmox', 'url', '');
+CALL `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`('Proxmox', 'user', '');
+CALL `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`('Proxmox', 'token', '');
+CALL `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`('Proxmox', 'secret', '');
 
 CALL `cloud`.`INSERT_EXTENSION_IF_NOT_EXISTS`('HyperV', 'Sample extension for HyperV written in python', 'HyperV/hyperv.py');
-CALL `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`('HyperV', 'url', '', 1);
-CALL `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`('HyperV', 'username', '', 1);
-CALL `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`('HyperV', 'password', '', 0);
+CALL `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`('HyperV', 'url', '');
+CALL `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`('HyperV', 'username', '');
+CALL `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`('HyperV', 'password', '');

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

@@ -292,7 +292,7 @@ public StartAnswer startInstance(String hostGuid, String extensionName, String e
 
         logger.debug(String.format("Executing StartCommand in the external provisioner for VM %s", vmUUID));
 
-        Object deployvm = accessDetails.get("deployvm");
+        Object deployvm = virtualMachineTO.getDetails().get("deployvm");
         boolean isDeploy = (deployvm != null && Boolean.parseBoolean((String)deployvm));
         String operation = isDeploy ? "Deploying" : "Starting";
         try {

ui/src/config/section/compute.js

@@ -465,7 +465,7 @@ export default {
           },
           popup: true,
           groupMap: (selection, values) => { return selection.map(x => { return { id: x, expunge: values.expunge } }) },
-          show: (record) => { return record.hypervisor !== 'External' && ['Running', 'Stopped', 'Error'].includes(record.state) && record.vmtype !== 'sharedfsvm' },
+          show: (record) => { return ['Running', 'Stopped', 'Error'].includes(record.state) && record.vmtype !== 'sharedfsvm' },
           component: shallowRef(defineAsyncComponent(() => import('@/views/compute/DestroyVM.vue')))
         }
       ]