Merge remote-tracking branch 'origin/main' into sync/apache-main-proper

Author: Srivastava, Piyush

core/src/main/java/com/cloud/agent/api/UpdateVmNicAnswer.java

@@ -14,6 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+<<<<<<<< HEAD:core/src/main/java/com/cloud/agent/api/UpdateVmNicAnswer.java
 //
 package com.cloud.agent.api;
 
@@ -24,4 +25,16 @@ public UpdateVmNicAnswer() {
     public UpdateVmNicAnswer(UpdateVmNicCommand cmd, boolean success, String result) {
         super(cmd, success, result);
     }
+========
+package org.apache.cloudstack.acl.apikeypair;
+
+import java.util.List;
+
+public interface ApiKeyPairService {
+    List<ApiKeyPairPermission> findAllPermissionsByKeyPairId(Long apiKeyPairId, Long roleId);
+
+    ApiKeyPair findByApiKey(String apiKey);
+
+    ApiKeyPair findById(Long id);
+>>>>>>>> origin/main:api/src/main/java/org/apache/cloudstack/acl/apikeypair/ApiKeyPairService.java
 }

server/src/main/java/com/cloud/resourcelimit/ReservationHelper.java

@@ -16,6 +16,7 @@
 // specific language governing permissions and limitations
 // under the License.
 //
+<<<<<<<< HEAD:server/src/main/java/com/cloud/resourcelimit/ReservationHelper.java
 
 package com.cloud.resourcelimit;
 
@@ -30,6 +31,16 @@ public static void closeAll(List<Reserver> reservations) throws CloudRuntimeExce
         for (Reserver reservation : reservations) {
             reservation.close();
         }
+========
+package com.cloud.agent.api;
+
+public class UpdateVmNicAnswer extends Answer {
+    public UpdateVmNicAnswer() {
+    }
+
+    public UpdateVmNicAnswer(UpdateVmNicCommand cmd, boolean success, String result) {
+        super(cmd, success, result);
+>>>>>>>> origin/main:core/src/main/java/com/cloud/agent/api/UpdateVmNicAnswer.java
     }
 
 }

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

@@ -1731,6 +1731,18 @@ private void checkForPendingBackupJobs(final BackupVO backup) {
         }
     }
 
+    private void checkForPendingBackupJobs(final BackupVO backup) {
+        String backupUuid = backup.getUuid();
+        long pendingJobs = asyncJobManager.countPendingJobs(backupUuid,
+                CreateVMFromBackupCmd.class.getName(),
+                CreateVMFromBackupCmdByAdmin.class.getName(),
+                RestoreBackupCmd.class.getName(),
+                RestoreVolumeFromBackupAndAttachToVMCmd.class.getName());
+        if (pendingJobs > 0) {
+            throw new CloudRuntimeException("Cannot delete Backup while a create Instance from Backup or restore Backup operation is in progress, please try again later.");
+        }
+    }
+
     /**
      * Get the pair: hostIp, datastoreUuid in which to restore the volume, based on the VM to be attached information
      */