fix enable-disable

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

Author: shwstppr

framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java

@@ -506,7 +506,7 @@ public Extension updateExtension(UpdateExtensionCmd cmd) {
             }
         }
         final boolean updateNeededFinal = updateNeeded;
-        return Transaction.execute((TransactionCallbackWithException<ExtensionVO, CloudRuntimeException>) status -> {
+        ExtensionVO result = Transaction.execute((TransactionCallbackWithException<ExtensionVO, CloudRuntimeException>) status -> {
             if (updateNeededFinal && !extensionDao.update(id, extensionVO)) {
                 throw new CloudRuntimeException(String.format("Failed to updated the extension: %s",
                         extensionVO.getName()));
@@ -523,6 +523,10 @@ public Extension updateExtension(UpdateExtensionCmd cmd) {
             }
             return extensionVO;
         });
+        if (StringUtils.isNotBlank(stateStr) && Extension.State.Enabled.equals(result.getState())) {
+            prepareExtensionEntryPointAcrossServers(result);
+        }
+        return result;
     }
 
     @Override

plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalServerPlanner.java

@@ -24,6 +24,7 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import org.apache.cloudstack.extension.Extension;
 import org.apache.cloudstack.extension.ExtensionResourceMap;
 import org.apache.cloudstack.framework.extensions.dao.ExtensionDao;
 import org.apache.cloudstack.framework.extensions.dao.ExtensionResourceMapDao;
@@ -76,10 +77,15 @@ public DeployDestination plan(VirtualMachineProfile vmProfile, DeploymentPlan pl
         Long extensionId = template.getExtensionId();
         final ExtensionVO extensionVO = extensionDao.findById(extensionId);
         if (extensionVO == null) {
-            logger.error("Extension associated with {} cannot be found during deployment external instance {}",
+            logger.error("Extension associated with {} cannot be found during deployment of external instance {}",
                     template, vmProfile.getInstanceName());
             return null;
         }
+        if (!Extension.State.Enabled.equals(extensionVO.getState())) {
+            logger.error("{} is not in enabled state therefore planning can not be done for deployment of external instance {}",
+                    extensionVO, vmProfile.getInstanceName());
+            return null;
+        }
 
         String haVmTag = (String)vmProfile.getParameter(VirtualMachineProfile.Param.HaTag);
 

ui/public/locales/en.json

@@ -823,6 +823,7 @@
 "label.directdownload": "Direct download",
 "label.direction": "Direction",
 "label.disable.autoscale.vmgroup": "Disable AutoScaling Group",
+"label.disable.extension": "Disable Extension",
 "label.disable.host": "Disable host",
 "label.disable.network.offering": "Disable Network offering",
 "label.disable.provider": "Disable provider",
@@ -935,6 +936,7 @@
 "label.elastic": "Elastic",
 "label.email": "Email",
 "label.enable.autoscale.vmgroup": "Enable AutoScaling Group",
+"label.enable.extension": "Enable Extension",
 "label.enable.host": "Enable Host",
 "label.enable.network.offering": "Enable Network offering",
 "label.enable.oauth": "Enable OAuth Login",
@@ -2972,13 +2974,15 @@
 "message.confirm.delete.traffic.type": "Please confirm that you would like to delete traffic type.",
 "message.confirm.destroy.router": "All services provided by this virtual router will be interrupted. Please confirm that you want to stop this router. Please confirm that you would like to destroy this router.",
 "message.confirm.disable.autoscale.vmgroup": "Please confirm that you want to disable this autoscaling group.",
+"message.confirm.disable.extension": "Please confirm that you want to disable this extension.",
 "message.confirm.disable.host": "Please confirm that you want to disable the host.",
 "message.confirm.disable.network.offering": "Are you sure you want to disable this Network offering?",
 "message.confirm.disable.provider": "Please confirm that you would like to disable this provider.",
 "message.confirm.disable.storage": "Please confirm that you want to disable the storage pool.",
 "message.confirm.disable.vpc.offering": "Are you sure you want to disable this VPC offering?",
 "message.confirm.disable.webhook": "Please confirm that you want to disable this webhook.",
 "message.confirm.enable.autoscale.vmgroup": "Please confirm that you want to enable this autoscaling group.",
+"message.confirm.enable.extension": "Please confirm that you want to enable this extension.",
 "message.confirm.enable.host": "Please confirm that you want to enable the host.",
 "message.confirm.enable.network.offering": "Are you sure you want to enable this Network offering?",
 "message.confirm.enable.provider": "Please confirm that you would like to enable this provider.",

ui/src/config/section/extension.js

@@ -84,6 +84,30 @@ export default {
           popup: true,
           component: shallowRef(defineAsyncComponent(() => import('@/views/extension/RegisterExtension.vue')))
         },
+        {
+          api: 'updateExtension',
+          icon: 'play-circle-outlined',
+          label: 'label.enable.extension',
+          message: 'message.confirm.enable.extension',
+          dataView: true,
+          groupAction: true,
+          popup: true,
+          defaultArgs: { state: 'Enabled' },
+          groupMap: (selection) => { return selection.map(x => { return { id: x } }) },
+          show: (record) => { return ['Disabled'].includes(record.state) }
+        },
+        {
+          api: 'updateExtension',
+          icon: 'pause-circle-outlined',
+          label: 'label.disable.extension',
+          message: 'message.confirm.disable.extension',
+          dataView: true,
+          groupAction: true,
+          popup: true,
+          defaultArgs: { state: 'Disabled' },
+          groupMap: (selection) => { return selection.map(x => { return { id: x } }) },
+          show: (record) => { return ['Enabled'].includes(record.state) }
+        },
         {
           api: 'deleteExtension',
           icon: 'delete-outlined',

ui/src/views/extension/AddCustomAction.vue

@@ -161,7 +161,9 @@ export default {
   methods: {
     initForm () {
       this.formRef = ref()
-      this.form = reactive({})
+      this.form = reactive({
+        enabled: true
+      })
       this.rules = reactive({
         extensionid: [{ required: true, message: `${this.$t('message.error.select')}` }],
         name: [{ required: true, message: `${this.$t('message.error.name')}` }]