Renames and adding path

harikrishna-patnala · harikrishna-patnala · commit 45f673553463 · 2025-03-27T17:28:13.000+05:30
diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -212,6 +212,7 @@ public class ApiConstants {
     public static final String EXTENSION = "extension";
     public static final String EXTENSIONS = "extensions";
     public static final String EXTENSION_ID = "extensionid";
+    public static final String SCRIPT = "script";
     public static final String FENCE = "fence";
     public static final String FETCH_LATEST = "fetchlatest";
     public static final String FILESYSTEM = "filesystem";
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
@@ -40,7 +40,7 @@ CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.host', 'last_mgmt_server_id', 'bigin
 
 UPDATE `cloud`.`configuration` SET value = CONCAT(value, ',External') WHERE name = 'hypervisor.list';
 
-CREATE TABLE IF NOT EXISTS `cloud`.`external_orchestrator` (
+CREATE TABLE IF NOT EXISTS `cloud`.`extension` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   `uuid` varchar(40) NOT NULL UNIQUE,
   `name` varchar(255) NOT NULL,
@@ -49,16 +49,16 @@ CREATE TABLE IF NOT EXISTS `cloud`.`external_orchestrator` (
   `created` datetime NOT NULL,
   `removed` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
-  CONSTRAINT `fk_external_orchestrator__pod_id` FOREIGN KEY (`pod_id`) REFERENCES `cloud`.`host_pod_ref`(`id`) ON DELETE CASCADE
+  CONSTRAINT `fk_extension__pod_id` FOREIGN KEY (`pod_id`) REFERENCES `cloud`.`host_pod_ref`(`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-CREATE TABLE `cloud`.`external_orchestrator_details` (
+CREATE TABLE `cloud`.`extension_details` (
   `id` bigint unsigned UNIQUE NOT NULL AUTO_INCREMENT COMMENT 'id',
-  `orchestrator_id` bigint unsigned NOT NULL COMMENT 'orchestrator the detail is related to',
+  `extension_id` bigint unsigned NOT NULL COMMENT 'extension to which the detail is related to',
   `name` varchar(255) NOT NULL COMMENT 'name of the detail',
   `value` varchar(255) NOT NULL COMMENT 'value of the detail',
   `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user',
   PRIMARY KEY (`id`),
-  CONSTRAINT `fk_orchestrator_details__orchestrator_id` FOREIGN KEY (`orchestrator_id`)
-    REFERENCES `external_orchestrator` (`id`) ON DELETE CASCADE
+  CONSTRAINT `fk_extension_details__extension_id` FOREIGN KEY (`extension_id`)
+    REFERENCES `extension` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/plugins/hypervisors/external/src/main/java/com/cloud/agent/manager/ExternalAgentManager.java b/plugins/hypervisors/external/src/main/java/com/cloud/agent/manager/ExternalAgentManager.java
@@ -23,7 +23,7 @@
 import com.cloud.hypervisor.external.provisioner.api.ListExtensionsCmd;
 import com.cloud.hypervisor.external.provisioner.api.RegisterExtensionCmd;
 import com.cloud.hypervisor.external.provisioner.api.RunCustomActionCmd;
-import com.cloud.hypervisor.external.provisioner.vo.ExternalOrchestrator;
+import com.cloud.hypervisor.external.provisioner.vo.Extension;
 import com.cloud.hypervisor.external.resource.ExternalResourceBase;
 import com.cloud.utils.component.Manager;
 
@@ -43,7 +43,7 @@ public interface ExternalAgentManager extends Manager {
 
     RunCustomActionAnswer runCustomAction(RunCustomActionCmd cmd);
 
-    ExternalOrchestrator registerExternalOrchestrator(RegisterExtensionCmd cmd);
+    Extension registerExternalOrchestrator(RegisterExtensionCmd cmd);
 
    List<ExtensionResponse> listExtensions(ListExtensionsCmd cmd);
 }
diff --git a/plugins/hypervisors/external/src/main/java/com/cloud/agent/manager/ExternalAgentManagerImpl.java b/plugins/hypervisors/external/src/main/java/com/cloud/agent/manager/ExternalAgentManagerImpl.java
@@ -43,8 +43,8 @@
 import com.cloud.hypervisor.external.provisioner.dao.ExternalOrchestratorDetailDao;
 import com.cloud.hypervisor.external.provisioner.dao.ExternalOrchestratorDetailVO;
 import com.cloud.hypervisor.external.provisioner.simpleprovisioner.SimpleExternalProvisioner;
-import com.cloud.hypervisor.external.provisioner.vo.ExternalOrchestrator;
-import com.cloud.hypervisor.external.provisioner.vo.ExternalOrchestratorVO;
+import com.cloud.hypervisor.external.provisioner.vo.Extension;
+import com.cloud.hypervisor.external.provisioner.vo.ExtensionVO;
 import com.cloud.hypervisor.external.resource.ExternalResourceBase;
 import com.cloud.org.Cluster;
 import com.cloud.resource.ResourceService;
@@ -191,12 +191,12 @@ public RunCustomActionAnswer runCustomAction(RunCustomActionCmd cmd) {
     }
 
     @Override
-    public ExternalOrchestrator registerExternalOrchestrator(RegisterExtensionCmd cmd) {
-        ExternalOrchestratorVO extension = new ExternalOrchestratorVO();
+    public Extension registerExternalOrchestrator(RegisterExtensionCmd cmd) {
+        ExtensionVO extension = new ExtensionVO();
         extension.setName(cmd.getName());
         extension.setType(cmd.getType());
         extension.setPodId(cmd.getPodId());
-        ExternalOrchestratorVO savedExtension = externalOrchestratorDao.persist(extension);
+        ExtensionVO savedExtension = externalOrchestratorDao.persist(extension);
 
         Map<String, String> externalDetails = cmd.getExternalDetails();
         List<ExternalOrchestratorDetailVO> detailsVOList = new ArrayList<>();
@@ -217,13 +217,13 @@ public List<ExtensionResponse> listExtensions(ListExtensionsCmd cmd) {
         Long id = cmd.getExtensionId();
         String name = cmd.getName();
         String keyword = cmd.getKeyword();
-        final SearchBuilder<ExternalOrchestratorVO> sb = externalOrchestratorDao.createSearchBuilder();
-        final Filter searchFilter = new Filter(ExternalOrchestratorVO.class, "id", false, cmd.getStartIndex(), cmd.getPageSizeVal());
+        final SearchBuilder<ExtensionVO> sb = externalOrchestratorDao.createSearchBuilder();
+        final Filter searchFilter = new Filter(ExtensionVO.class, "id", false, cmd.getStartIndex(), cmd.getPageSizeVal());
 
         sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
         sb.and("name", sb.entity().getName(), SearchCriteria.Op.EQ);
         sb.and("keyword", sb.entity().getName(), SearchCriteria.Op.LIKE);
-        final SearchCriteria<ExternalOrchestratorVO> sc = sb.create();
+        final SearchCriteria<ExtensionVO> sc = sb.create();
 
         if (id != null) {
             sc.setParameters("id", id);
@@ -237,19 +237,21 @@ public List<ExtensionResponse> listExtensions(ListExtensionsCmd cmd) {
             sc.setParameters("keyword",  "%" + keyword + "%");
         }
 
-        final Pair<List<ExternalOrchestratorVO>, Integer> result = externalOrchestratorDao.searchAndCount(sc, searchFilter);
+        final Pair<List<ExtensionVO>, Integer> result = externalOrchestratorDao.searchAndCount(sc, searchFilter);
         List<ExtensionResponse> responses = new ArrayList<>();
-        for (ExternalOrchestratorVO extension : result.first()) {
+        for (ExtensionVO extension : result.first()) {
             Map<String, String> details = externalOrchestratorDetailDao.listDetailsKeyPairs(extension.getId());
             ExtensionResponse response = new ExtensionResponse(extension.getName(), extension.getType(), extension.getPodId(), extension.getUuid(), details);
+            String destinationPath = String.format(SimpleExternalProvisioner.EXTENSION_SCRIPT_PATH, extension.getId());
+            response.setScriptPath(destinationPath);
             response.setObjectName(ApiConstants.EXTENSIONS);
             responses.add(response);
         }
 
         return responses;
     }
 
-    private void createRequiredResourcesForExtension(ExternalOrchestratorVO extension, RegisterExtensionCmd registerExtensionCmd) {
+    private void createRequiredResourcesForExtension(ExtensionVO extension, RegisterExtensionCmd registerExtensionCmd) {
         String clusterName = extension.getName() + "-" + extension.getId() + "-cluster";
         HostPodVO pod = podDao.findById(extension.getPodId());
         AddClusterCmd clusterCmd = new AddClusterCmd(clusterName, pod.getDataCenterId(), pod.getId(), Cluster.ClusterType.CloudManaged.toString(),
diff --git a/plugins/hypervisors/external/src/main/java/com/cloud/hypervisor/external/provisioner/api/ExtensionResponse.java b/plugins/hypervisors/external/src/main/java/com/cloud/hypervisor/external/provisioner/api/ExtensionResponse.java
@@ -17,7 +17,7 @@
 
 package com.cloud.hypervisor.external.provisioner.api;
 
-import com.cloud.hypervisor.external.provisioner.vo.ExternalOrchestrator;
+import com.cloud.hypervisor.external.provisioner.vo.Extension;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.ApiConstants;
@@ -27,7 +27,7 @@
 import java.util.Date;
 import java.util.Map;
 
-@EntityReference(value = ExternalOrchestrator.class)
+@EntityReference(value = Extension.class)
 public class ExtensionResponse extends BaseResponse {
 
     @SerializedName(ApiConstants.ID)
@@ -54,6 +54,10 @@ public class ExtensionResponse extends BaseResponse {
     @Param(description = "the details of the network")
     private Map<String, String> details;
 
+    @SerializedName(ApiConstants.SCRIPT)
+    @Param(description = "the path of the script")
+    private String script;
+
     @SerializedName(ApiConstants.CREATED)
     @Param(description = "Creation timestamp of the extension")
     private Date created;
@@ -106,6 +110,14 @@ public void setDetails(Map<String, String> details) {
         this.details = details;
     }
 
+    public String getScriptPath() {
+        return script;
+    }
+
+    public void setScriptPath(String script) {
+        this.script = script;
+    }
+
     public Date getCreated() {
         return created;
     }
diff --git a/plugins/hypervisors/external/src/main/java/com/cloud/hypervisor/external/provisioner/api/RegisterExtensionCmd.java b/plugins/hypervisors/external/src/main/java/com/cloud/hypervisor/external/provisioner/api/RegisterExtensionCmd.java
@@ -23,7 +23,7 @@
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.hypervisor.external.provisioner.vo.ExternalOrchestrator;
+import com.cloud.hypervisor.external.provisioner.vo.Extension;
 import com.cloud.user.Account;
 import com.cloud.vm.VmDetailConstants;
 import org.apache.cloudstack.api.APICommand;
@@ -103,7 +103,7 @@ public Map getDetails() {
 
     @Override
     public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
-        ExternalOrchestrator externalOrchestrator = _externalMgr.registerExternalOrchestrator(this);
+        Extension externalOrchestrator = _externalMgr.registerExternalOrchestrator(this);
         ExtensionResponse response = new ExtensionResponse(name, type, podId, externalOrchestrator.getUuid(), getExternalDetails());
         response.setResponseName(getCommandName());
         response.setObjectName(ApiConstants.EXTENSION);
diff --git a/plugins/hypervisors/external/src/main/java/com/cloud/hypervisor/external/provisioner/dao/ExternalOrchestratorDao.java b/plugins/hypervisors/external/src/main/java/com/cloud/hypervisor/external/provisioner/dao/ExternalOrchestratorDao.java
@@ -16,8 +16,8 @@
 // under the License.
 package com.cloud.hypervisor.external.provisioner.dao;
 
-import com.cloud.hypervisor.external.provisioner.vo.ExternalOrchestratorVO;
+import com.cloud.hypervisor.external.provisioner.vo.ExtensionVO;
 import com.cloud.utils.db.GenericDao;
 
-public interface ExternalOrchestratorDao extends GenericDao<ExternalOrchestratorVO, Long> {
+public interface ExternalOrchestratorDao extends GenericDao<ExtensionVO, Long> {
 }
diff --git a/plugins/hypervisors/external/src/main/java/com/cloud/hypervisor/external/provisioner/dao/ExternalOrchestratorDaoImpl.java b/plugins/hypervisors/external/src/main/java/com/cloud/hypervisor/external/provisioner/dao/ExternalOrchestratorDaoImpl.java
@@ -17,8 +17,8 @@
 
 package com.cloud.hypervisor.external.provisioner.dao;
 
-import com.cloud.hypervisor.external.provisioner.vo.ExternalOrchestratorVO;
+import com.cloud.hypervisor.external.provisioner.vo.ExtensionVO;
 import com.cloud.utils.db.GenericDaoBase;
 
-public class ExternalOrchestratorDaoImpl extends GenericDaoBase<ExternalOrchestratorVO, Long> implements ExternalOrchestratorDao {
+public class ExternalOrchestratorDaoImpl extends GenericDaoBase<ExtensionVO, Long> implements ExternalOrchestratorDao {
 }
diff --git a/plugins/hypervisors/external/src/main/java/com/cloud/hypervisor/external/provisioner/dao/ExternalOrchestratorDetailVO.java b/plugins/hypervisors/external/src/main/java/com/cloud/hypervisor/external/provisioner/dao/ExternalOrchestratorDetailVO.java
@@ -27,14 +27,14 @@
 import javax.persistence.Table;
 
 @Entity
-@Table(name = "external_orchestrator_details")
+@Table(name = "extension_details")
 public class ExternalOrchestratorDetailVO implements ResourceDetail {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     private long id;
 
-    @Column(name = "orchestrator_id", nullable = false)
+    @Column(name = "extension_id", nullable = false)
     private long resourceId;
 
     @Column(name = "name", nullable = false, length = 255)
diff --git a/plugins/hypervisors/external/src/main/java/com/cloud/hypervisor/external/provisioner/vo/Extension.java b/plugins/hypervisors/external/src/main/java/com/cloud/hypervisor/external/provisioner/vo/Extension.java
@@ -20,5 +20,5 @@
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
-public interface ExternalOrchestrator extends InternalIdentity, Identity {
+public interface Extension extends InternalIdentity, Identity {
 }
diff --git a/plugins/hypervisors/external/src/main/java/com/cloud/hypervisor/external/provisioner/vo/ExtensionVO.java b/plugins/hypervisors/external/src/main/java/com/cloud/hypervisor/external/provisioner/vo/ExtensionVO.java
@@ -32,10 +32,10 @@
 import javax.persistence.TemporalType;
 
 @Entity
-@Table(name = "external_orchestrator")
-public class ExternalOrchestratorVO implements ExternalOrchestrator {
+@Table(name = "extension")
+public class ExtensionVO implements Extension {
 
-    public ExternalOrchestratorVO() {
+    public ExtensionVO() {
         this.uuid = UUID.randomUUID().toString();
         this.created = new Date();
     }

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@`
`16`	`16`	`// under the License.`
`17`	`17`	`package com.cloud.hypervisor.external.provisioner.dao;`
`18`	`18`
`19`		`-import com.cloud.hypervisor.external.provisioner.vo.ExternalOrchestratorVO;`
	`19`	`+import com.cloud.hypervisor.external.provisioner.vo.ExtensionVO;`
`20`	`20`	`import com.cloud.utils.db.GenericDao;`
`21`	`21`
`22`		`-public interface ExternalOrchestratorDao extends GenericDao<ExternalOrchestratorVO, Long> {`
	`22`	`+public interface ExternalOrchestratorDao extends GenericDao<ExtensionVO, Long> {`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@`
`17`	`17`
`18`	`18`	`package com.cloud.hypervisor.external.provisioner.dao;`
`19`	`19`
`20`		`-import com.cloud.hypervisor.external.provisioner.vo.ExternalOrchestratorVO;`
	`20`	`+import com.cloud.hypervisor.external.provisioner.vo.ExtensionVO;`
`21`	`21`	`import com.cloud.utils.db.GenericDaoBase;`
`22`	`22`
`23`		`-public class ExternalOrchestratorDaoImpl extends GenericDaoBase<ExternalOrchestratorVO, Long> implements ExternalOrchestratorDao {`
	`23`	`+public class ExternalOrchestratorDaoImpl extends GenericDaoBase<ExtensionVO, Long> implements ExternalOrchestratorDao {`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@`
`20`	`20`	`import org.apache.cloudstack.api.Identity;`
`21`	`21`	`import org.apache.cloudstack.api.InternalIdentity;`
`22`	`22`
`23`		`-public interface ExternalOrchestrator extends InternalIdentity, Identity {`
	`23`	`+public interface Extension extends InternalIdentity, Identity {`
`24`	`24`	`}`