diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/StrategyPriority.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/StrategyPriority.java index 7c0015bb513..4bfc7485029 100644 --- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/StrategyPriority.java +++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/StrategyPriority.java @@ -17,5 +17,5 @@ package org.apache.cloudstack.engine.subsystem.api.storage; public enum StrategyPriority { - CANT_HANDLE, DEFAULT, HYPERVISOR, PLUGIN, HIGHEST + CANT_HANDLE, DEFAULT, HYPERVISOR, HIGHEST } diff --git a/engine/storage/src/test/java/org/apache/cloudstack/engine/subsystem/api/storage/StrategyPriorityTest.java b/engine/storage/src/test/java/org/apache/cloudstack/engine/subsystem/api/storage/StrategyPriorityTest.java index af44b4a05f1..bddd5a21880 100644 --- a/engine/storage/src/test/java/org/apache/cloudstack/engine/subsystem/api/storage/StrategyPriorityTest.java +++ b/engine/storage/src/test/java/org/apache/cloudstack/engine/subsystem/api/storage/StrategyPriorityTest.java @@ -40,13 +40,11 @@ public class StrategyPriorityTest { SnapshotStrategy cantHandleStrategy = mock(SnapshotStrategy.class); SnapshotStrategy defaultStrategy = mock(SnapshotStrategy.class); SnapshotStrategy hyperStrategy = mock(SnapshotStrategy.class); - SnapshotStrategy pluginStrategy = mock(SnapshotStrategy.class); SnapshotStrategy highestStrategy = mock(SnapshotStrategy.class); doReturn(StrategyPriority.CANT_HANDLE).when(cantHandleStrategy).canHandle(any(Snapshot.class), any(SnapshotOperation.class)); doReturn(StrategyPriority.DEFAULT).when(defaultStrategy).canHandle(any(Snapshot.class), any(SnapshotOperation.class)); doReturn(StrategyPriority.HYPERVISOR).when(hyperStrategy).canHandle(any(Snapshot.class), any(SnapshotOperation.class)); - doReturn(StrategyPriority.PLUGIN).when(pluginStrategy).canHandle(any(Snapshot.class), any(SnapshotOperation.class)); doReturn(StrategyPriority.HIGHEST).when(highestStrategy).canHandle(any(Snapshot.class), any(SnapshotOperation.class)); List strategies = new ArrayList(5); @@ -67,10 +65,6 @@ public class StrategyPriorityTest { strategy = factory.getSnapshotStrategy(mock(Snapshot.class), SnapshotOperation.TAKE); assertEquals("Hypervisor strategy was not picked.", hyperStrategy, strategy); - strategies.add(pluginStrategy); - strategy = factory.getSnapshotStrategy(mock(Snapshot.class), SnapshotOperation.TAKE); - assertEquals("Plugin strategy was not picked.", pluginStrategy, strategy); - strategies.add(highestStrategy); strategy = factory.getSnapshotStrategy(mock(Snapshot.class), SnapshotOperation.TAKE); assertEquals("Highest strategy was not picked.", highestStrategy, strategy); @@ -81,13 +75,11 @@ public class StrategyPriorityTest { DataMotionStrategy cantHandleStrategy = mock(DataMotionStrategy.class); DataMotionStrategy defaultStrategy = mock(DataMotionStrategy.class); DataMotionStrategy hyperStrategy = mock(DataMotionStrategy.class); - DataMotionStrategy pluginStrategy = mock(DataMotionStrategy.class); DataMotionStrategy highestStrategy = mock(DataMotionStrategy.class); doReturn(StrategyPriority.CANT_HANDLE).when(cantHandleStrategy).canHandle(any(DataObject.class), any(DataObject.class)); doReturn(StrategyPriority.DEFAULT).when(defaultStrategy).canHandle(any(DataObject.class), any(DataObject.class)); doReturn(StrategyPriority.HYPERVISOR).when(hyperStrategy).canHandle(any(DataObject.class), any(DataObject.class)); - doReturn(StrategyPriority.PLUGIN).when(pluginStrategy).canHandle(any(DataObject.class), any(DataObject.class)); doReturn(StrategyPriority.HIGHEST).when(highestStrategy).canHandle(any(DataObject.class), any(DataObject.class)); List strategies = new ArrayList(5); @@ -108,10 +100,6 @@ public class StrategyPriorityTest { strategy = factory.getDataMotionStrategy(mock(DataObject.class), mock(DataObject.class)); assertEquals("Hypervisor strategy was not picked.", hyperStrategy, strategy); - strategies.add(pluginStrategy); - strategy = factory.getDataMotionStrategy(mock(DataObject.class), mock(DataObject.class)); - assertEquals("Plugin strategy was not picked.", pluginStrategy, strategy); - strategies.add(highestStrategy); strategy = factory.getDataMotionStrategy(mock(DataObject.class), mock(DataObject.class)); assertEquals("Highest strategy was not picked.", highestStrategy, strategy); @@ -123,13 +111,11 @@ public class StrategyPriorityTest { DataMotionStrategy cantHandleStrategy = mock(DataMotionStrategy.class); DataMotionStrategy defaultStrategy = mock(DataMotionStrategy.class); DataMotionStrategy hyperStrategy = mock(DataMotionStrategy.class); - DataMotionStrategy pluginStrategy = mock(DataMotionStrategy.class); DataMotionStrategy highestStrategy = mock(DataMotionStrategy.class); doReturn(StrategyPriority.CANT_HANDLE).when(cantHandleStrategy).canHandle(any(Map.class), any(Host.class), any(Host.class)); doReturn(StrategyPriority.DEFAULT).when(defaultStrategy).canHandle(any(Map.class), any(Host.class), any(Host.class)); doReturn(StrategyPriority.HYPERVISOR).when(hyperStrategy).canHandle(any(Map.class), any(Host.class), any(Host.class)); - doReturn(StrategyPriority.PLUGIN).when(pluginStrategy).canHandle(any(Map.class), any(Host.class), any(Host.class)); doReturn(StrategyPriority.HIGHEST).when(highestStrategy).canHandle(any(Map.class), any(Host.class), any(Host.class)); List strategies = new ArrayList(5); @@ -150,10 +136,6 @@ public class StrategyPriorityTest { strategy = factory.getDataMotionStrategy(mock(Map.class), mock(Host.class), mock(Host.class)); assertEquals("Hypervisor strategy was not picked.", hyperStrategy, strategy); - strategies.add(pluginStrategy); - strategy = factory.getDataMotionStrategy(mock(Map.class), mock(Host.class), mock(Host.class)); - assertEquals("Plugin strategy was not picked.", pluginStrategy, strategy); - strategies.add(highestStrategy); strategy = factory.getDataMotionStrategy(mock(Map.class), mock(Host.class), mock(Host.class)); assertEquals("Highest strategy was not picked.", highestStrategy, strategy);