Merge pull request #694 from Dajeong-Park/backup-update-offering

[Mold] 다중 플러그인 적용 시 commvault 백업 오퍼링 편집 오류 수정

Author: jschoiRR

api/src/main/java/org/apache/cloudstack/backup/BackupService.java

@@ -35,13 +35,6 @@ public interface BackupService {
      */
     List<BackupProvider> listBackupProvidersForZone(final Long zoneId);
 
-    /**
-     * Find backup provider by zone ID
-     * @param zoneId zone id
-     * @return backup provider
-     */
-    BackupProvider getBackupProvider(final Long zoneId);
-
     /**
      * Find backup provider by offering ID
      * @param offeringId offering id

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

@@ -1007,12 +1007,6 @@ public List<BackupProvider> listBackupProvidersForZone(final Long zoneId) {
         return getBackupProvidersForZone(zoneId);
     }
 
-    @Override
-    public BackupProvider getBackupProvider(final Long zoneId) {
-        final String name = BackupProviderPlugin.valueIn(zoneId);
-        return getBackupProvider(name);
-    }
-
     @Override
     public BackupProvider getBackupProviderForOffering(final Long offeringId) {
         final BackupOfferingVO offering = backupOfferingDao.findById(offeringId);
@@ -1416,6 +1410,7 @@ public BackupOffering updateBackupOffering(UpdateBackupOfferingCmd updateBackupO
         }
         String externalId = backupOfferingVO.getExternalId();
         Long zoneId = backupOfferingVO.getZoneId();
+        String providerName = backupOfferingVO.getProvider();
 
         logger.debug("Trying to update Backup Offering {} to {}.",
                 ReflectionToStringBuilderUtils.reflectOnlySelectedFields(backupOfferingVO, "uuid", "name", "description", "userDrivenBackupAllowed", "retentionPeriod"),
@@ -1439,7 +1434,7 @@ public BackupOffering updateBackupOffering(UpdateBackupOfferingCmd updateBackupO
         }
 
         if (retentionPeriod != null) {
-            final BackupProvider provider = getBackupProvider(zoneId);
+            final BackupProvider provider = getBackupProvider(providerName);
             if (!provider.getName().equalsIgnoreCase("commvault")){
                 throw new CloudRuntimeException("Failed to update backup offering, Because the backup offering provider is not set to commvault.");
             }

server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java

@@ -36,7 +36,6 @@
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;