Few code improvements

Author: harikrishna-patnala

api/src/main/java/com/cloud/vm/VmDetailConstants.java

@@ -121,7 +121,7 @@ public interface VmDetailConstants {
 
     // External orchestrator related
     String MAC_ADDRESS = "mac_address";
-    String EXPUNGE_EXTERNAL_SERVER = "expunge.external.server";
+    String EXPUNGE_EXTERNAL_VM = "expunge.external.vm";
     String EXTERNAL_DETAIL_PREFIX = "External:";
     String CLOUDSTACK_VM_DETAILS = "cloudstack.vm.details";
     String CLOUDSTACK_VLAN = "cloudstack.vlan";

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -674,8 +674,7 @@ public class ApiConstants {
     public static final String NETWORK_DEVICE_PARAMETER_LIST = "networkdeviceparameterlist";
     public static final String ZONE_TOKEN = "zonetoken";
     public static final String DHCP_PROVIDER = "dhcpprovider";
-    public static final String RESULT = "success";
-    public static final String RESULT1 = "result";
+    public static final String RESULT = "result";
     public static final String RESUME = "resume";
     public static final String LUN_ID = "lunId";
     public static final String IQN = "iqn";

api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java

@@ -186,7 +186,7 @@ public class RegisterTemplateCmd extends BaseCmd implements UserCmd {
             since = "4.20")
     private String arch;
 
-    @Parameter(name = ApiConstants.EXTENSION_ID, type = CommandType.UUID, entityType = ExtensionResponse.class, description = "UUID of the extension")
+    @Parameter(name = ApiConstants.EXTENSION_ID, type = CommandType.UUID, entityType = ExtensionResponse.class, description = "UUID of the extension", since = "4.21.0")
     private Long extensionId;
 
     @Parameter(name = ApiConstants.EXTERNAL_DETAILS, type = CommandType.MAP, description = "Details in key/value pairs using format externaldetails[i].keyname=keyvalue. Example: externaldetails[0].endpoint.url=urlvalue", since = "4.21.0")

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

@@ -26,7 +26,7 @@ public class CreateConsoleEndpointResponse extends BaseResponse {
     public CreateConsoleEndpointResponse() {
     }
 
-    @SerializedName(ApiConstants.RESULT)
+    @SerializedName(ApiConstants.SUCCESS)
     @Param(description = "true if the console endpoint is generated properly")
     private Boolean result;
 

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

@@ -34,7 +34,7 @@ public class RouterHealthCheckResultResponse extends BaseResponse {
     @Param(description = "the type of the health check - basic or advanced")
     private String checkType;
 
-    @SerializedName(ApiConstants.RESULT)
+    @SerializedName(ApiConstants.SUCCESS)
     @Param(description = "result of the health check")
     private boolean result;
 

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

@@ -24,7 +24,7 @@
 
 public class UnmanageVMInstanceResponse extends BaseResponse {
 
-    @SerializedName(ApiConstants.RESULT)
+    @SerializedName(ApiConstants.SUCCESS)
     @Param(description = "result of the unmanage VM operation")
     private boolean success;
 

api/src/main/java/org/apache/cloudstack/extension/CustomActionResultResponse.java

@@ -39,7 +39,7 @@ public class CustomActionResultResponse extends BaseResponse {
     @Param(description = "Whether custom action succeed or not")
     private Boolean success;
 
-    @SerializedName(ApiConstants.RESULT1)
+    @SerializedName(ApiConstants.RESULT)
     @Param(description = "Result of the action execution")
     private Map<String, String> result;
 

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -671,7 +671,7 @@ protected void advanceExpunge(VMInstanceVO vm) throws ResourceUnavailableExcepti
         if (HypervisorType.External.equals(vm.getHypervisorType())) {
             UserVmVO userVM = _userVmDao.findById(vm.getId());
             _userVmDao.loadDetails(userVM);
-            userVM.setDetail(VmDetailConstants.EXPUNGE_EXTERNAL_SERVER, Boolean.TRUE.toString());
+            userVM.setDetail(VmDetailConstants.EXPUNGE_EXTERNAL_VM, Boolean.TRUE.toString());
             _userVmDao.saveDetails(userVM);
         }
 

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

@@ -812,7 +812,11 @@ public ExtensionResourceMap registerExtensionWithCluster(Cluster cluster, Extens
         ExtensionResourceMapVO existing =
                 extensionResourceMapDao.findByResourceIdAndType(cluster.getId(), resourceType);
         if (existing != null) {
-            throw new CloudRuntimeException("Extension already registered with this resource");
+            if (existing.getExtensionId() == extension.getId()) {
+                throw new CloudRuntimeException("Extension is already registered with this resource");
+            } else {
+                throw new CloudRuntimeException("Another extension is already registered with this resource");
+            }
         }
         ExtensionResourceMap result = Transaction.execute((TransactionCallbackWithException<ExtensionResourceMap, CloudRuntimeException>) status -> {
             ExtensionResourceMapVO extensionMap = new ExtensionResourceMapVO(extension.getId(), cluster.getId(), resourceType);

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

@@ -228,6 +228,13 @@ private String getServerProperty(String name) {
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
         super.configure(name, params);
 
+        initializeExtensionDirectories();
+        checkExtensionsDirectory();
+        createOrCheckExtensionsDataDirectory();
+        return true;
+    }
+
+    private void initializeExtensionDirectories() {
         String deploymentMode = getServerProperty(EXTENSIONS_DEPLOYMENT_MODE_NAME);
         if ("developer".equals(deploymentMode)) {
             extensionsDirectory = EXTENSIONS_DIRECTORY_DEV;
@@ -236,9 +243,6 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
             extensionsDirectory = EXTENSIONS_DIRECTORY_PROD;
             extensionsDataDirectory = EXTENSIONS_DATA_DIRECTORY_PROD;
         }
-        checkExtensionsDirectory();
-        createOrCheckExtensionsDataDirectory();
-        return true;
     }
 
     @Override