cleanup conflicting key

Author: sudo87

api/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManager.java

@@ -70,6 +70,15 @@ public interface UnmanagedVMsManager extends VmImportService, UnmanageVMService,
             ConfigKey.Scope.Global,
             null);
 
+    ConfigKey<Boolean> AllowImportVolumeWithBackingFile = new ConfigKey<>(Boolean.class,
+            "allow.import.volume.with.backing.file",
+            "Advanced",
+            "false",
+            "If enabled, allows QCOW2 volumes with backing files to be imported or unmanaged",
+            true,
+            ConfigKey.Scope.Global,
+            null);
+
     static boolean isSupported(Hypervisor.HypervisorType hypervisorType) {
         return hypervisorType == VMware || hypervisorType == KVM;
     }

server/src/main/java/org/apache/cloudstack/storage/volume/VolumeImportUnmanageManagerImpl.java

@@ -17,6 +17,8 @@
 
 package org.apache.cloudstack.storage.volume;
 
+import static org.apache.cloudstack.vm.UnmanagedVMsManager.AllowImportVolumeWithBackingFile;
+
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.GetVolumesOnStorageAnswer;
@@ -73,8 +75,6 @@
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.utils.bytescale.ByteScaleUtils;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.cloudstack.framework.config.ConfigKey;
-import org.apache.cloudstack.framework.config.Configurable;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -86,7 +86,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class VolumeImportUnmanageManagerImpl implements VolumeImportUnmanageService, Configurable {
+public class VolumeImportUnmanageManagerImpl implements VolumeImportUnmanageService {
     protected Logger logger = LogManager.getLogger(VolumeImportUnmanageManagerImpl.class);
 
     @Inject
@@ -125,15 +125,6 @@ public class VolumeImportUnmanageManagerImpl implements VolumeImportUnmanageServ
     static final String DISK_OFFERING_NAME_SUFFIX_LOCAL = " - Local Storage";
     static final String DISK_OFFERING_UNIQUE_NAME_SUFFIX_LOCAL = "-Local";
 
-    ConfigKey<Boolean> AllowImportVolumeWithBackingFile = new ConfigKey<>(Boolean.class,
-            "allow.import.volume.with.backing.file",
-            "Advanced",
-            "false",
-            "If enabled, allows QCOW2 volumes with backing files to be imported or unmanaged",
-            true,
-            ConfigKey.Scope.Global,
-            null);
-
     protected void logFailureAndThrowException(String msg) {
         logger.error(msg);
         throw new CloudRuntimeException(msg);
@@ -524,14 +515,4 @@ private void unmanageVolumeFromDatabase(VolumeVO volume) {
         volume.setRemoved(new Date());
         volumeDao.update(volume.getId(), volume);
     }
-
-    @Override
-    public String getConfigComponentName() {
-        return VolumeImportUnmanageManagerImpl.class.getSimpleName();
-    }
-
-    @Override
-    public ConfigKey<?>[] getConfigKeys() {
-        return new ConfigKey<?>[]{ AllowImportVolumeWithBackingFile };
-    }
 }

server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java

@@ -220,15 +220,6 @@ public class UnmanagedVMsManagerImpl implements UnmanagedVMsManager {
             ConfigKey.Scope.Global,
             null);
 
-    ConfigKey<Boolean> AllowImportVolumeWithBackingFile = new ConfigKey<>(Boolean.class,
-            "allow.import.volume.with.backing.file",
-            "Advanced",
-            "false",
-            "If enabled, allows QCOW2 volumes with backing files to be imported or unmanaged",
-            true,
-            ConfigKey.Scope.Global,
-            null);
-
     ConfigKey<String> ConvertVmwareInstanceToKvmExtraParamsAllowedList = new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED,
             String.class,
             "convert.vmware.instance.to.kvm.extra.params.allowed.list",
@@ -2898,7 +2889,7 @@ private UserVm importKvmVirtualMachineFromDisk(final ImportSource importSource,
         return userVm;
     }
 
-    protected void checkVolume(Map<VolumeOnStorageTO.Detail, String> volumeDetails) {
+    private void checkVolume(Map<VolumeOnStorageTO.Detail, String> volumeDetails) {
         if (MapUtils.isEmpty(volumeDetails)) {
             return;
         }

server/src/test/java/org/apache/cloudstack/storage/volume/VolumeImportUnmanageManagerImplTest.java

@@ -61,7 +61,6 @@
 import org.apache.cloudstack.api.response.VolumeForImportResponse;
 import org.apache.cloudstack.api.response.VolumeResponse;
 import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao;
@@ -135,8 +134,6 @@ public class VolumeImportUnmanageManagerImplTest {
     private VolumeApiService volumeApiService;
     @Mock
     private SnapshotDataStoreDao snapshotDataStoreDao;
-    @Mock
-    private ConfigKey<Boolean> mockAllowImportVolumeWithBackingFile;
 
     @Mock
     StoragePoolVO storagePoolVO;
@@ -346,8 +343,6 @@ public void testCheckIfVolumeIsEncrypted() {
 
     @Test
     public void testCheckIfVolumeHasBackingFile() {
-        volumeImportUnmanageManager.AllowImportVolumeWithBackingFile = mockAllowImportVolumeWithBackingFile;
-        Mockito.when(mockAllowImportVolumeWithBackingFile.value()).thenReturn(false);
         try {
             VolumeOnStorageTO volumeOnStorageTO = new VolumeOnStorageTO(hypervisorType, path, name, fullPath,
                     format, size, virtualSize);
@@ -361,17 +356,6 @@ public void testCheckIfVolumeHasBackingFile() {
         }
     }
 
-    @Test
-    public void testCheckIfVolumeHasBackingFileAllowEnabled() {
-        volumeImportUnmanageManager.AllowImportVolumeWithBackingFile = mockAllowImportVolumeWithBackingFile;
-        Mockito.when(mockAllowImportVolumeWithBackingFile.value()).thenReturn(true);
-        VolumeOnStorageTO volumeOnStorageTO = new VolumeOnStorageTO(hypervisorType, path, name, fullPath,
-                format, size, virtualSize);
-        volumeOnStorageTO.addDetail(VolumeOnStorageTO.Detail.BACKING_FILE, BACKING_FILE);
-        volumeOnStorageTO.addDetail(VolumeOnStorageTO.Detail.BACKING_FILE_FORMAT, BACKING_FILE_FORMAT);
-        volumeImportUnmanageManager.checkIfVolumeHasBackingFile(volumeOnStorageTO);
-    }
-
     @Test
     public void testUnmanageVolume() {
         when(volumeVO.getState()).thenReturn(Volume.State.Ready);

server/src/test/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImplTest.java

@@ -171,7 +171,6 @@
 import com.cloud.vm.dao.UserVmDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.cloud.vm.dao.VMInstanceDetailsDao;
-import org.apache.cloudstack.storage.volume.VolumeOnStorageTO;
 
 @RunWith(MockitoJUnitRunner.class)
 public class UnmanagedVMsManagerImplTest {
@@ -258,8 +257,6 @@ public class UnmanagedVMsManagerImplTest {
     private ConfigKey<Boolean> configKeyMockParamsAllowed;
     @Mock
     private ConfigKey<String> configKeyMockParamsAllowedList;
-    @Mock
-    private ConfigKey<Boolean> configKeyMockAllowBackingFile;
 
     private static final long virtualMachineId = 1L;
 
@@ -1354,22 +1351,4 @@ public void testAddServiceOfferingDetailsToParamsCustomUnconstrainedOffering() {
         Assert.assertFalse(params.containsKey(VmDetailConstants.CPU_SPEED));
         Assert.assertFalse(params.containsKey(VmDetailConstants.MEMORY));
     }
-
-    @Test(expected = CloudRuntimeException.class)
-    public void testCheckVolumeWithBackingFileSettingDisabled() {
-        unmanagedVMsManager.AllowImportVolumeWithBackingFile = configKeyMockAllowBackingFile;
-        Mockito.when(configKeyMockAllowBackingFile.value()).thenReturn(false);
-        Map<VolumeOnStorageTO.Detail, String> details = new HashMap<>();
-        details.put(VolumeOnStorageTO.Detail.BACKING_FILE, "backing.qcow2");
-        unmanagedVMsManager.checkVolume(details);
-    }
-
-    @Test
-    public void testCheckVolumeWithBackingFileSettingEnabled() {
-        unmanagedVMsManager.AllowImportVolumeWithBackingFile = configKeyMockAllowBackingFile;
-        Mockito.when(configKeyMockAllowBackingFile.value()).thenReturn(true);
-        Map<VolumeOnStorageTO.Detail, String> details = new HashMap<>();
-        details.put(VolumeOnStorageTO.Detail.BACKING_FILE, "backing.qcow2");
-        unmanagedVMsManager.checkVolume(details);
-    }
 }