diff --git a/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java b/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java index 5e5c3e960c8..83ec485230c 100644 --- a/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java +++ b/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java @@ -17,7 +17,6 @@ package com.cloud.vm; import java.net.URI; -import java.util.Collection; import java.util.List; import java.util.Map; @@ -96,12 +95,6 @@ public interface VirtualMachineManager extends Manager { void registerGuru(VirtualMachine.Type type, VirtualMachineGuru guru); - // FIXME: This method is added by VirtualMachinePowerStateSyncImpl - Collection getRegisteredGurus(); - - // FIXME: Apparently this method is added by Kelven for VmWorkJobDispatcher. Should look into removing this. - VirtualMachineGuru getVmGuru(VirtualMachine vm); - boolean stateTransitTo(VMInstanceVO vm, VirtualMachine.Event e, Long hostId) throws NoTransitionException; void advanceStart(String vmUuid, Map params, DeploymentPlan planToDeploy) diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java index 57c6852708c..f04a589f81f 100755 --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -282,15 +282,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } } - @Override - public Collection getRegisteredGurus() { - synchronized(_vmGurus) { - return _vmGurus.values(); - } - } - - @Override - public VirtualMachineGuru getVmGuru(VirtualMachine vm) { + private VirtualMachineGuru getVmGuru(VirtualMachine vm) { return _vmGurus.get(vm.getType()); }