fixes, sharedfs restore, restrict unsupported instances

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java

@@ -47,6 +47,13 @@ public class DeployVMCmdByAdmin extends DeployVMCmd implements AdminCmd {
             since = "4.23.0")
     private Boolean blankInstance;
 
+    // Internal flag to allow deploying instance with a given type
+    private String instanceType;
+
+    /////////////////////////////////////////////////////
+    ////////////////// Getters //////////////////////////
+    /////////////////////////////////////////////////////
+
     public Long getPodId() {
         return podId;
     }
@@ -60,6 +67,14 @@ public boolean isBlankInstance() {
         return Boolean.TRUE.equals(blankInstance);
     }
 
+    @Override
+    public String getInstanceType() {
+        if (!isBlankInstance()) {
+            return null;
+        }
+        return instanceType;
+    }
+
     /////////////////////////////////////////////////////
     ////////////////// Setters //////////////////////////
     /////////////////////////////////////////////////////
@@ -71,4 +86,8 @@ public void setClusterId(Long clusterId) {
     public void setBlankInstance(boolean blankInstance) {
         this.blankInstance = blankInstance;
     }
+
+    public void setInstanceType(String instanceType) {
+        this.instanceType = instanceType;
+    }
 }

api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java

@@ -17,6 +17,8 @@
 package org.apache.cloudstack.api.command.admin.vm;
 
 import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ResponseObject.ResponseView;
 import org.apache.cloudstack.api.command.admin.AdminCmd;
 import org.apache.cloudstack.api.command.user.vm.DestroyVMCmd;
@@ -27,4 +29,20 @@
 @APICommand(name = "destroyVirtualMachine", description = "Destroys  an Instance. Once destroyed, only the administrator can recover it.", responseObject = UserVmResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class},
         requestHasSensitiveInfo = false,
         responseHasSensitiveInfo = true)
-public class DestroyVMCmdByAdmin extends DestroyVMCmd implements AdminCmd {}
+public class DestroyVMCmdByAdmin extends DestroyVMCmd implements AdminCmd {
+
+    @Parameter( name = ApiConstants.FORCED,
+            type = CommandType.BOOLEAN,
+            description = "Force destroy the Instance",
+            since = "4.23.0")
+    Boolean forced;
+
+    @Override
+    public boolean isForced() {
+        return Boolean.TRUE.equals(forced);
+    }
+
+    public void setForced(Boolean forced) {
+        this.forced = forced;
+    }
+}

api/src/main/java/org/apache/cloudstack/api/command/user/vm/BaseDeployVMCmd.java

@@ -168,7 +168,7 @@ public abstract class BaseDeployVMCmd extends BaseAsyncCreateCustomIdCmd impleme
     @ACL
     @Parameter(name = ApiConstants.SECURITY_GROUP_IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = SecurityGroupResponse.class, description = "comma separated list of security groups id that going to be applied to the virtual machine. "
             + "Should be passed only when vm is created from a zone with Basic Network support." + " Mutually exclusive with securitygroupnames parameter")
-    private List<Long> securityGroupIdList;
+    protected List<Long> securityGroupIdList;
 
     @ACL
     @Parameter(name = ApiConstants.SECURITY_GROUP_NAMES, type = CommandType.LIST, collectionType = CommandType.STRING, entityType = SecurityGroupResponse.class, description = "comma separated list of security groups names that going to be applied to the virtual machine."
@@ -799,6 +799,10 @@ public IoDriverPolicy getIoDriverPolicy() {
         return null;
     }
 
+    public String getInstanceType() {
+        return null;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////

api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java

@@ -191,6 +191,10 @@ public void setSshKeyPairNames(List<String> sshKeyPairNames) {
         this.sshKeyPairNames = sshKeyPairNames;
     }
 
+    public void setSecurityGroupList(List<Long> securityGroupIdList) {
+        this.securityGroupIdList = securityGroupIdList;
+    }
+
     @Override
     public void execute() {
         UserVm result;

api/src/main/java/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java

@@ -90,6 +90,10 @@ public List<Long> getVolumeIds() {
         return volumeIds;
     }
 
+    public boolean isForced() {
+        return false;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////

api/src/main/java/org/apache/cloudstack/storage/sharedfs/SharedFSService.java

@@ -23,6 +23,10 @@
 import org.apache.cloudstack.api.command.user.storage.sharedfs.ChangeSharedFSServiceOfferingCmd;
 import org.apache.cloudstack.api.command.user.storage.sharedfs.CreateSharedFSCmd;
 import org.apache.cloudstack.api.command.user.storage.sharedfs.DestroySharedFSCmd;
+import org.apache.cloudstack.api.command.user.storage.sharedfs.ListSharedFSCmd;
+import org.apache.cloudstack.api.command.user.storage.sharedfs.UpdateSharedFSCmd;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.SharedFSResponse;
 
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.ManagementServerException;
@@ -31,11 +35,6 @@
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.exception.VirtualMachineMigrationException;
 
-import org.apache.cloudstack.api.command.user.storage.sharedfs.ListSharedFSCmd;
-import org.apache.cloudstack.api.command.user.storage.sharedfs.UpdateSharedFSCmd;
-import org.apache.cloudstack.api.response.SharedFSResponse;
-import org.apache.cloudstack.api.response.ListResponse;
-
 public interface SharedFSService {
 
     List<SharedFSProvider> getSharedFSProviders();
@@ -69,4 +68,10 @@ public interface SharedFSService {
     SharedFS recoverSharedFS(Long sharedFSId);
 
     void deleteSharedFS(Long sharedFSId);
+
+    SharedFS getSharedFSByUuid(String uuid);
+
+    SharedFS getSharedFSForVmId(long vmId);
+
+    SharedFS updateSharedFSPostRestore(long sharedFsId, long volumeId);
 }

engine/schema/src/main/java/org/apache/cloudstack/storage/sharedfs/dao/SharedFSDao.java

@@ -29,4 +29,6 @@ public interface SharedFSDao extends GenericDao<SharedFSVO, Long>, StateDao<Shar
     List<SharedFSVO> listSharedFSToBeDestroyed(Date date);
 
     SharedFSVO findSharedFSByNameAccountDomain(String name, Long accountId, Long domainId);
+
+    SharedFSVO findByVm(long vmId);
 }

engine/schema/src/main/java/org/apache/cloudstack/storage/sharedfs/dao/SharedFSDaoImpl.java

@@ -114,4 +114,14 @@ public SharedFSVO findSharedFSByNameAccountDomain(String name, Long accountId, L
         sc.setParameters("domainId", domainId);
         return findOneBy(sc);
     }
+
+    @Override
+    public SharedFSVO findByVm(long vmId) {
+        SearchBuilder<SharedFSVO> sb = createSearchBuilder();
+        sb.and("vmId", sb.entity().getVmId(), SearchCriteria.Op.EQ);
+        sb.done();
+        SearchCriteria<SharedFSVO> sc = sb.create();
+        sc.setParameters("vmId", vmId);
+        return findOneBy(sc);
+    }
 }