Merge branch 'main' into veeam-check-failure-when-restoring

Author: SadiJr

.asf.yaml

@@ -56,10 +56,9 @@ github:
     - alexandremattioli
     - vishesh92
     - GaOrtiga
-    - BryanMLima
     - SadiJr
-    - JoaoJandre
     - winterhazel
+    - rp-
 
   protected_branches: ~
 

README.md

@@ -1,6 +1,6 @@
 # Apache CloudStack [![Build Status](https://github.com/apache/cloudstack/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/apache/cloudstack/actions/workflows/build.yml) [![UI Build](https://github.com/apache/cloudstack/actions/workflows/ui.yml/badge.svg)](https://github.com/apache/cloudstack/actions/workflows/ui.yml) [![License Check](https://github.com/apache/cloudstack/actions/workflows/rat.yml/badge.svg?branch=main)](https://github.com/apache/cloudstack/actions/workflows/rat.yml) [![Simulator CI](https://github.com/apache/cloudstack/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/apache/cloudstack/actions/workflows/ci.yml) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=apache_cloudstack&metric=alert_status)](https://sonarcloud.io/dashboard?id=apache_cloudstack) [![codecov](https://codecov.io/gh/apache/cloudstack/branch/main/graph/badge.svg)](https://codecov.io/gh/apache/cloudstack)
 
-[![Apache CloudStack](tools/logo/apache_cloudstack.png)](https://cloudstack.apache.org/)
+[![Apache CloudStack](tools/logo/acsxmas.jpg)](https://cloudstack.apache.org/)
 
 Apache CloudStack is open source software designed to deploy and manage large
 networks of virtual machines, as a highly available, highly scalable

api/src/main/java/com/cloud/network/PublicIpQuarantine.java

@@ -30,6 +30,8 @@ public interface PublicIpQuarantine extends InternalIdentity, Identity {
 
     String getRemovalReason();
 
+    Long getRemoverAccountId();
+
     Date getRemoved();
 
     Date getCreated();

api/src/main/java/com/cloud/storage/Volume.java

@@ -39,37 +39,49 @@ enum Type {
     };
 
     enum State {
-        Allocated("The volume is allocated but has not been created yet."),
-        Creating("The volume is being created.  getPoolId() should reflect the pool where it is being created."),
-        Ready("The volume is ready to be used."),
-        Migrating("The volume is migrating to other storage pool"),
-        Snapshotting("There is a snapshot created on this volume, not backed up to secondary storage yet"),
-        RevertSnapshotting("There is a snapshot created on this volume, the volume is being reverting from snapshot"),
-        Resizing("The volume is being resized"),
-        Expunging("The volume is being expunging"),
-        Expunged("The volume has been expunged, and can no longer be recovered"),
-        Destroy("The volume is destroyed, and can be recovered."),
-        Destroying("The volume is destroying, and can't be recovered."),
-        UploadOp("The volume upload operation is in progress or in short the volume is on secondary storage"),
-        Copying("Volume is copying from image store to primary, in case it's an uploaded volume"),
-        Uploaded("Volume is uploaded"),
-        NotUploaded("The volume entry is just created in DB, not yet uploaded"),
-        UploadInProgress("Volume upload is in progress"),
-        UploadError("Volume upload encountered some error"),
-        UploadAbandoned("Volume upload is abandoned since the upload was never initiated within a specified time"),
-        Attaching("The volume is attaching to a VM from Ready state."),
-        Restoring("The volume is being restored from backup.");
+        Allocated(false, "The volume is allocated but has not been created yet."),
+        Creating(true, "The volume is being created.  getPoolId() should reflect the pool where it is being created."),
+        Ready(false, "The volume is ready to be used."),
+        Migrating(true, "The volume is migrating to other storage pool"),
+        Snapshotting(true, "There is a snapshot created on this volume, not backed up to secondary storage yet"),
+        RevertSnapshotting(true, "There is a snapshot created on this volume, the volume is being reverting from snapshot"),
+        Resizing(true, "The volume is being resized"),
+        Expunging(true, "The volume is being expunging"),
+        Expunged(false, "The volume has been expunged, and can no longer be recovered"),
+        Destroy(false, "The volume is destroyed, and can be recovered."),
+        Destroying(false, "The volume is destroying, and can't be recovered."),
+        UploadOp(true, "The volume upload operation is in progress or in short the volume is on secondary storage"),
+        Copying(true, "Volume is copying from image store to primary, in case it's an uploaded volume"),
+        Uploaded(false, "Volume is uploaded"),
+        NotUploaded(true, "The volume entry is just created in DB, not yet uploaded"),
+        UploadInProgress(true, "Volume upload is in progress"),
+        UploadError(false, "Volume upload encountered some error"),
+        UploadAbandoned(false, "Volume upload is abandoned since the upload was never initiated within a specified time"),
+        Attaching(true, "The volume is attaching to a VM from Ready state."),
+        Restoring(true, "The volume is being restored from backup.");
+
+        boolean _transitional;
 
         String _description;
 
-        private State(String description) {
+        /**
+         * Volume State
+         * @param transitional true for transition/non-final state, otherwise false
+         * @param description description of the state
+         */
+        private State(boolean transitional, String description) {
+            _transitional = transitional;
             _description = description;
         }
 
         public static StateMachine2<State, Event, Volume> getStateMachine() {
             return s_fsm;
         }
 
+        public boolean isTransitional() {
+            return _transitional;
+        }
+
         public String getDescription() {
             return _description;
         }

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

@@ -16,6 +16,7 @@
 // under the License.
 package com.cloud.vm;
 
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -518,7 +519,8 @@ UserVm upgradeVirtualMachine(ScaleVMCmd cmd) throws ResourceUnavailableException
 
     UserVm importVM(final DataCenter zone, final Host host, final VirtualMachineTemplate template, final String instanceName, final String displayName, final Account owner, final String userData, final Account caller, final Boolean isDisplayVm, final String keyboard,
                     final long accountId, final long userId, final ServiceOffering serviceOffering, final String sshPublicKey,
-                    final String hostName, final HypervisorType hypervisorType, final Map<String, String> customParameters, final VirtualMachine.PowerState powerState) throws InsufficientCapacityException;
+                    final String hostName, final HypervisorType hypervisorType, final Map<String, String> customParameters,
+                    final VirtualMachine.PowerState powerState, final LinkedHashMap<String, List<NicProfile>> networkNicMap) throws InsufficientCapacityException;
 
     /**
      * Unmanage a guest VM from CloudStack

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

@@ -39,6 +39,7 @@ public interface VmDetailConstants {
     // KVM specific (internal)
     String KVM_VNC_PORT = "kvm.vnc.port";
     String KVM_VNC_ADDRESS = "kvm.vnc.address";
+    String KVM_VNC_PASSWORD = "kvm.vnc.password";
 
     // KVM specific, custom virtual GPU hardware
     String VIDEO_HARDWARE = "video.hardware";

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

@@ -212,6 +212,7 @@ public class ApiConstants {
     public static final String HOST_IDS = "hostids";
     public static final String HOST_IP = "hostip";
     public static final String HOST_NAME = "hostname";
+    public static final String HOST = "host";
     public static final String HOST_CONTROL_STATE = "hostcontrolstate";
     public static final String HOSTS_MAP = "hostsmap";
     public static final String HYPERVISOR = "hypervisor";
@@ -802,6 +803,7 @@ public class ApiConstants {
     public static final String IPSEC_PSK = "ipsecpsk";
     public static final String GUEST_IP = "guestip";
     public static final String REMOVED = "removed";
+    public static final String REMOVER_ACCOUNT_ID = "removeraccountid";
     public static final String REMOVAL_REASON = "removalreason";
     public static final String COMPLETED = "completed";
     public static final String IKE_VERSION = "ikeversion";
@@ -1064,7 +1066,9 @@ public class ApiConstants {
     public static final String SOURCE_NAT_IP = "sourcenatipaddress";
     public static final String SOURCE_NAT_IP_ID = "sourcenatipaddressid";
     public static final String HAS_RULES = "hasrules";
+    public static final String DISK_PATH = "diskpath";
     public static final String IMPORT_SOURCE = "importsource";
+    public static final String TEMP_PATH = "temppath";
     public static final String OBJECT_STORAGE = "objectstore";
 
     public static final String HEURISTIC_RULE = "heuristicrule";

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

@@ -84,7 +84,7 @@ public class ImportUnmanagedInstanceCmd extends BaseAsyncCmd {
     @Parameter(name = ApiConstants.NAME,
             type = CommandType.STRING,
             required = true,
-            description = "the hypervisor name of the instance")
+            description = "the name of the instance as it is known to the hypervisor")
     private String name;
 
     @Parameter(name = ApiConstants.DISPLAY_NAME,

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

@@ -31,13 +31,18 @@
 import org.apache.cloudstack.api.ResponseObject;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.HostResponse;
+import org.apache.cloudstack.api.response.NetworkResponse;
 import org.apache.cloudstack.api.response.StoragePoolResponse;
 import org.apache.cloudstack.api.response.UserVmResponse;
 import org.apache.cloudstack.api.response.VmwareDatacenterResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.cloudstack.vm.VmImportService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 
+import javax.inject.Inject;
+
 @APICommand(name = "importVm",
         description = "Import virtual machine from a unmanaged host into CloudStack",
         responseObject = UserVmResponse.class,
@@ -47,21 +52,72 @@
         authorized = {RoleType.Admin},
         since = "4.19.0")
 public class ImportVmCmd extends ImportUnmanagedInstanceCmd {
-
     public static final Logger LOGGER = Logger.getLogger(ImportVmCmd.class);
 
+    @Inject
+    public VmImportService vmImportService;
+
+    /////////////////////////////////////////////////////
+    //////////////// API parameters /////////////////////
+    /////////////////////////////////////////////////////
+
+
+    @Parameter(name = ApiConstants.ZONE_ID,
+            type = CommandType.UUID,
+            entityType = ZoneResponse.class,
+            required = true,
+            description = "the zone ID")
+    private Long zoneId;
+
+    @Parameter(name = ApiConstants.USERNAME,
+            type = CommandType.STRING,
+            description = "the username for the host")
+    private String username;
+
+    @Parameter(name = ApiConstants.PASSWORD,
+            type = CommandType.STRING,
+            description = "the password for the host")
+    private String password;
+
+    @Parameter(name = ApiConstants.HOST,
+            type = CommandType.STRING,
+            description = "the host name or IP address")
+    private String host;
+
     @Parameter(name = ApiConstants.HYPERVISOR,
             type = CommandType.STRING,
             required = true,
             description = "hypervisor type of the host")
     private String hypervisor;
 
+    @Parameter(name = ApiConstants.DISK_PATH,
+            type = CommandType.STRING,
+            description = "path of the disk image")
+    private String diskPath;
+
     @Parameter(name = ApiConstants.IMPORT_SOURCE,
             type = CommandType.STRING,
             required = true,
             description = "Source location for Import" )
     private String importSource;
 
+    @Parameter(name = ApiConstants.NETWORK_ID,
+            type = CommandType.UUID,
+            entityType = NetworkResponse.class,
+            description = "the network ID")
+    private Long networkId;
+
+    @Parameter(name = ApiConstants.HOST_ID, type = CommandType.UUID, entityType = HostResponse.class, description = "Host where local disk is located")
+    private Long hostId;
+
+    @Parameter(name = ApiConstants.STORAGE_ID, type = CommandType.UUID, entityType = StoragePoolResponse.class, description = "Shared storage pool where disk is located")
+    private Long storagePoolId;
+
+    @Parameter(name = ApiConstants.TEMP_PATH,
+            type = CommandType.STRING,
+            description = "Temp Path on external host for disk image copy" )
+    private String tmpPath;
+
     // Import from Vmware to KVM migration parameters
 
     @Parameter(name = ApiConstants.EXISTING_VCENTER_ID,
@@ -73,7 +129,7 @@ public class ImportVmCmd extends ImportUnmanagedInstanceCmd {
     @Parameter(name = ApiConstants.HOST_IP,
             type = BaseCmd.CommandType.STRING,
             description = "(only for importing migrated VMs from Vmware to KVM) VMware ESXi host IP/Name.")
-    private String host;
+    private String hostip;
 
     @Parameter(name = ApiConstants.VCENTER,
             type = CommandType.STRING,
@@ -88,14 +144,6 @@ public class ImportVmCmd extends ImportUnmanagedInstanceCmd {
             description = "(only for importing migrated VMs from Vmware to KVM) Name of VMware cluster.")
     private String clusterName;
 
-    @Parameter(name = ApiConstants.USERNAME, type = CommandType.STRING,
-            description = "(only for importing migrated VMs from Vmware to KVM) The Username required to connect to resource.")
-    private String username;
-
-    @Parameter(name = ApiConstants.PASSWORD, type = CommandType.STRING,
-            description = "(only for importing migrated VMs from Vmware to KVM) The password for the specified username.")
-    private String password;
-
     @Parameter(name = ApiConstants.CONVERT_INSTANCE_HOST_ID, type = CommandType.UUID, entityType = HostResponse.class,
             description = "(only for importing migrated VMs from Vmware to KVM) optional - the host to perform the virt-v2v migration from VMware to KVM.")
     private Long convertInstanceHostId;
@@ -104,30 +152,20 @@ public class ImportVmCmd extends ImportUnmanagedInstanceCmd {
             description = "(only for importing migrated VMs from Vmware to KVM) optional - the temporary storage pool to perform the virt-v2v migration from VMware to KVM.")
     private Long convertStoragePoolId;
 
-    @Override
-    public String getEventType() {
-        return EventTypes.EVENT_VM_IMPORT;
-    }
+    /////////////////////////////////////////////////////
+    /////////////////// Accessors ///////////////////////
+    /////////////////////////////////////////////////////
 
-    @Override
-    public String getEventDescription() {
-        String vmName = getName();
-        if (ObjectUtils.anyNotNull(vcenter, existingVcenterId)) {
-            String msg = StringUtils.isNotBlank(vcenter) ?
-                    String.format("external vCenter: %s - datacenter: %s", vcenter, datacenterName) :
-                    String.format("existing vCenter Datacenter with ID: %s", existingVcenterId);
-            return String.format("Importing unmanaged VM: %s from %s - VM: %s", getDisplayName(), msg, vmName);
-        }
-        return String.format("Importing unmanaged VM: %s", vmName);
+    public Long getZoneId() {
+        return zoneId;
     }
 
-
     public Long getExistingVcenterId() {
         return existingVcenterId;
     }
 
-    public String getHost() {
-        return host;
+    public String getHostIp() {
+        return hostip;
     }
 
     public String getVcenter() {
@@ -150,6 +188,10 @@ public String getPassword() {
         return password;
     }
 
+    public String getHost() {
+        return host;
+    }
+
     public Long getConvertInstanceHostId() {
         return convertInstanceHostId;
     }
@@ -162,10 +204,47 @@ public String getHypervisor() {
         return hypervisor;
     }
 
+    public String getDiskPath() {
+        return diskPath;
+    }
+
     public String getImportSource() {
         return importSource;
     }
 
+    public Long getHostId() {
+        return hostId;
+    }
+
+    public Long getStoragePoolId() {
+        return storagePoolId;
+    }
+
+    public String getTmpPath() {
+        return tmpPath;
+    }
+
+    public Long getNetworkId() {
+        return networkId;
+    }
+
+    @Override
+    public String getEventType() {
+        return EventTypes.EVENT_VM_IMPORT;
+    }
+
+    @Override
+    public String getEventDescription() {
+        String vmName = getName();
+        if (ObjectUtils.anyNotNull(vcenter, existingVcenterId)) {
+            String msg = StringUtils.isNotBlank(vcenter) ?
+                    String.format("external vCenter: %s - datacenter: %s", vcenter, datacenterName) :
+                    String.format("existing vCenter Datacenter with ID: %s", existingVcenterId);
+            return String.format("Importing unmanaged VM: %s from %s - VM: %s", getDisplayName(), msg, vmName);
+        }
+        return String.format("Importing unmanaged VM: %s", vmName);
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
@@ -176,5 +255,4 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE
         response.setResponseName(getCommandName());
         setResponseObject(response);
     }
-
 }