changes

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

Author: shwstppr

api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java

@@ -19,12 +19,14 @@
 import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.stream.Collectors;
 
 import com.cloud.agent.api.LogLevel;
 import com.cloud.network.element.NetworkElement;
 import com.cloud.template.VirtualMachineTemplate.BootloaderType;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.Type;
+import com.cloud.vm.VmDetailConstants;
 
 public class VirtualMachineTO {
     private long id;
@@ -455,4 +457,16 @@ public void setMetadataProductName(String metadataProductName) {
     public String toString() {
         return String.format("VM {id: \"%s\", name: \"%s\", uuid: \"%s\", type: \"%s\"}", id, name, uuid, type);
     }
+
+    public Map<String, String> getExternalDetails() {
+        if (details == null) {
+            return new HashMap<>();
+        }
+        return details.entrySet().stream()
+                .filter(entry -> entry.getKey().startsWith(VmDetailConstants.EXTERNAL_DETAIL_PREFIX))
+                .collect(Collectors.toMap(
+                        entry -> entry.getKey().substring(VmDetailConstants.EXTERNAL_DETAIL_PREFIX.length()),
+                        Map.Entry::getValue
+                ));
+    }
 }

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

@@ -17,6 +17,8 @@
 
 package org.apache.cloudstack.api.response;
 
+import java.util.List;
+
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
 
@@ -33,25 +35,24 @@ public class ExtensionCustomActionParameterResponse extends BaseResponse {
     @Param(description = "Type of the parameter")
     private String type;
 
+    @SerializedName(ApiConstants.FORMAT)
+    @Param(description = "Format for value of the parameter. Available for specific types")
+    private String format;
+
+    @SerializedName(ApiConstants.OPTIONS)
+    @Param(description = "Options for value of the parameter")
+    private List<Object> options;
+
     @SerializedName(ApiConstants.REQUIRED)
     @Param(description = "Whether the parameter is required or not")
     private Boolean required;
 
-    public ExtensionCustomActionParameterResponse(String name, String type, boolean required) {
-        this.name = name;
-        this.type = type;
-        this.required = required;
-    }
-
-    public void setName(String name) {
+    public ExtensionCustomActionParameterResponse(String name, String type, String format, List<Object> options,
+                  boolean required) {
         this.name = name;
-    }
-
-    public void setType(String type) {
         this.type = type;
-    }
-
-    public void setRequired(Boolean required) {
+        this.format = format;
+        this.options = options;
         this.required = required;
     }
 }

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

@@ -51,6 +51,10 @@ public class ExtensionResponse extends BaseResponse {
     @Param(description = "The path of the entry point fo the extension")
     private String entryPoint;
 
+    @SerializedName(ApiConstants.IS_USER_DEFINED)
+    @Param(description = "True if the extension is added by admin")
+    private Boolean userDefined;
+
     @SerializedName(ApiConstants.DETAILS)
     @Param(description = "The details of the extension")
     private Map<String, String> details;
@@ -102,6 +106,10 @@ public void setEntryPoint(String entryPoint) {
         this.entryPoint = entryPoint;
     }
 
+    public void setUserDefined(Boolean userDefined) {
+        this.userDefined = userDefined;
+    }
+
     public void setDetails(Map<String, String> details) {
         this.details = details;
     }

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

@@ -30,5 +30,6 @@ enum Type {
     String getDescription();
     Type getType();
     String getRelativeEntryPoint();
+    boolean isUserDefined();
     Date getCreated();
 }