Merge latest from main

Author: sudo87

.asf.yaml

@@ -59,6 +59,7 @@ github:
     - nicoschmdt
     - abh1sar
     - sudo87
+    - rosi-shapeblue
 
   protected_branches: ~
 

.github/workflows/ci.yml

@@ -237,7 +237,7 @@ jobs:
 
       - name: Install Python dependencies
         run: |
-          python3 -m pip install --user --upgrade urllib3 lxml paramiko nose texttable ipmisim pyopenssl pycrypto mock flask netaddr pylint pycodestyle six astroid
+          python3 -m pip install --user --upgrade urllib3 lxml paramiko nose texttable ipmisim pyopenssl pycrypto mock flask netaddr pylint pycodestyle six astroid pynose
 
       - name: Install jacoco dependencies
         run: |

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

@@ -17,6 +17,7 @@
 package com.cloud.storage;
 
 import java.util.Date;
+import java.util.List;
 
 import org.apache.cloudstack.api.InternalIdentity;
 
@@ -25,6 +26,8 @@ public static enum Status {
         UNKNOWN, DOWNLOAD_ERROR, NOT_DOWNLOADED, DOWNLOAD_IN_PROGRESS, DOWNLOADED, ABANDONED, UPLOADED, NOT_UPLOADED, UPLOAD_ERROR, UPLOAD_IN_PROGRESS, CREATING, CREATED, BYPASSED
     }
 
+    List<Status> PENDING_DOWNLOAD_STATES = List.of(Status.NOT_DOWNLOADED, Status.DOWNLOAD_IN_PROGRESS);
+
     String getInstallPath();
 
     long getTemplateId();

api/src/main/java/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java

@@ -17,6 +17,7 @@
 package org.apache.cloudstack.api.command.user.iso;
 
 
+import com.cloud.dc.DataCenter;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
@@ -101,7 +102,15 @@ public long getEntityOwnerId() {
 
     @Override
     public String getEventDescription() {
-        return "extracting ISO: " + getId() + " from zone: " + getZoneId();
+        String isoId = this._uuidMgr.getUuid(VirtualMachineTemplate.class, getId());
+        String baseDescription = String.format("Extracting ISO: %s", isoId);
+
+        Long zoneId = getZoneId();
+        if (zoneId == null) {
+            return baseDescription;
+        }
+
+        return String.format("%s from zone: %s", baseDescription, this._uuidMgr.getUuid(DataCenter.class, zoneId));
     }
 
     @Override

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

@@ -101,7 +101,15 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-     return "extracting template: " + this._uuidMgr.getUuid(VirtualMachineTemplate.class, getId()) + ((getZoneId() != null) ? " from zone: " + this._uuidMgr.getUuid(DataCenter.class, getZoneId()) : "");
+        String templateId = this._uuidMgr.getUuid(VirtualMachineTemplate.class, getId());
+        String baseDescription = String.format("Extracting template: %s", templateId);
+
+        Long zoneId = getZoneId();
+        if (zoneId == null) {
+            return baseDescription;
+        }
+
+        return String.format("%s from zone: %s", baseDescription, this._uuidMgr.getUuid(DataCenter.class, zoneId));
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java

@@ -17,6 +17,7 @@
 package org.apache.cloudstack.api.command.user.volume;
 
 
+import com.cloud.dc.DataCenter;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.api.ACL;
 import org.apache.cloudstack.api.APICommand;
@@ -114,12 +115,15 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return  "Extraction job";
+        String volumeId = this._uuidMgr.getUuid(Volume.class, getId());
+        String zoneId = this._uuidMgr.getUuid(DataCenter.class, getZoneId());
+
+        return String.format("Extracting volume: %s from zone: %s", volumeId, zoneId);
     }
 
     @Override
     public void execute() {
-        CallContext.current().setEventDetails("Volume Id: " + this._uuidMgr.getUuid(Volume.class, getId()));
+        CallContext.current().setEventDetails(getEventDescription());
         String uploadUrl = _volumeService.extractVolume(this);
         if (uploadUrl != null) {
             ExtractResponse response = _responseGenerator.createVolumeExtractResponse(id, zoneId, getEntityOwnerId(), mode, uploadUrl);

api/src/test/java/org/apache/cloudstack/api/command/admin/resource/PurgeExpungedResourcesCmdTest.java

@@ -44,7 +44,7 @@ public class PurgeExpungedResourcesCmdTest {
 
     @Spy
     @InjectMocks
-    PurgeExpungedResourcesCmd spyCmd = Mockito.spy(new PurgeExpungedResourcesCmd());
+    PurgeExpungedResourcesCmd spyCmd;
 
     @Test
     public void testGetResourceType() {

api/src/test/java/org/apache/cloudstack/api/command/admin/storage/DownloadImageStoreObjectCmdTest.java

@@ -20,14 +20,11 @@
 import com.cloud.utils.Pair;
 import org.apache.cloudstack.api.response.ExtractResponse;
 import org.apache.cloudstack.storage.browser.StorageBrowser;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -48,18 +45,6 @@ public class DownloadImageStoreObjectCmdTest {
     @Spy
     private DownloadImageStoreObjectCmd cmd;
 
-    private AutoCloseable closeable;
-
-    @Before
-    public void setUp() {
-        closeable = MockitoAnnotations.openMocks(this);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        closeable.close();
-    }
-
     @Test
     public void testExecute() throws Exception {
         ReflectionTestUtils.setField(cmd, "storeId", 1L);

api/src/test/java/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmdTest.java

@@ -68,6 +68,12 @@ public class MigrateVirtualMachineWithVolumeCmdTest {
     @Mock
     Host hostMock;
 
+    @Mock
+    private Object job;
+
+    @Mock
+    private Object _responseObject;
+
     @Spy
     @InjectMocks
     MigrateVirtualMachineWithVolumeCmd cmdSpy;

api/src/test/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdminTest.java

@@ -20,7 +20,6 @@
 import com.cloud.network.vpc.VpcService;
 import com.cloud.user.AccountService;
 import com.cloud.utils.db.EntityManager;
-import junit.framework.TestCase;
 import org.apache.cloudstack.api.ResponseGenerator;
 import org.junit.Assert;
 import org.junit.Test;
@@ -34,7 +33,7 @@
 import java.util.List;
 
 @RunWith(MockitoJUnitRunner.class)
-public class CreateVPCCmdByAdminTest extends TestCase {
+public class CreateVPCCmdByAdminTest {
 
     @Mock
     public VpcService _vpcService;
@@ -43,8 +42,10 @@ public class CreateVPCCmdByAdminTest extends TestCase {
     @Mock
     public AccountService _accountService;
     private ResponseGenerator responseGenerator;
+    @Mock
+    public Object job;
     @InjectMocks
-    CreateVPCCmdByAdmin cmd = new CreateVPCCmdByAdmin();
+    CreateVPCCmdByAdmin cmd;
 
     @Test
     public void testBgpPeerIds() {