Martin Mucha has uploaded a new change for review. Change subject: core: MacPoolManager does not delegate ......................................................................
core: MacPoolManager does not delegate * all methods manipulating with pool (which just deletates to same methods on pool instance) are removed from MacPoolManager. Instead MacPoolManager.getInstance() returns pool instance and these methods are called on this instance. Bug-Url: https://bugzilla.redhat.com/1078844 Change-Id: Ic4a6f353095e52088fbf3e7e0e9c1fe624a7e7cd Signed-off-by: Martin Mucha <mmu...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerStrategy.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/VmInterfaceManagerTest.java 4 files changed, 17 insertions(+), 51 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/93/26793/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java index 0bcb9d2..e61ac53 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java @@ -1,60 +1,26 @@ package org.ovirt.engine.core.bll.network; -import java.util.List; - import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; public class MacPoolManager { - private final MacPoolManagerStrategy macPoolManagerStrategy; + private final MacPoolManagerStrategy defaultScope; private static final MacPoolManager INSTANCE = new MacPoolManager(); private MacPoolManager() { + defaultScope = createDefaultScopeMacPoolManager(); + } + + private MacPoolManagerRanges createDefaultScopeMacPoolManager() { final Integer maxMacsCountInPool = Config.getValue(ConfigValues.MaxMacsCountInPool); final String macPoolRanges = Config.getValue(ConfigValues.MacPoolRanges); final Boolean allowDuplicates = Config.getValue(ConfigValues.AllowDuplicateMacAddresses); - macPoolManagerStrategy = new MacPoolManagerRanges(maxMacsCountInPool, macPoolRanges, allowDuplicates); + return new MacPoolManagerRanges(maxMacsCountInPool, macPoolRanges, allowDuplicates); } - public static MacPoolManager getInstance() { - return INSTANCE; - } - - public void initialize() { - macPoolManagerStrategy.initialize(); - } - - public boolean addMac(String mac) { - return macPoolManagerStrategy.addMac(mac); - } - - public boolean isMacInUse(String mac) { - return macPoolManagerStrategy.isMacInUse(mac); - } - - public List<String> allocateMacAddresses(int numberOfAddresses) { - return macPoolManagerStrategy.allocateMacAddresses(numberOfAddresses); - } - - public int getAvailableMacsCount() { - return macPoolManagerStrategy.getAvailableMacsCount(); - } - - public void forceAddMac(String mac) { - macPoolManagerStrategy.forceAddMac(mac); - } - - public void freeMacs(List<String> macs) { - macPoolManagerStrategy.freeMacs(macs); - } - - public String allocateNewMac() { - return macPoolManagerStrategy.allocateNewMac(); - } - - public void freeMac(String mac) { - macPoolManagerStrategy.freeMac(mac); + public static MacPoolManagerStrategy getInstance() { + return INSTANCE.defaultScope; } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerStrategy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerStrategy.java index f247707..d6de8a5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerStrategy.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerStrategy.java @@ -2,7 +2,7 @@ import java.util.List; -interface MacPoolManagerStrategy { +public interface MacPoolManagerStrategy { void initialize(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java index 99082dc..3178634 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java @@ -224,7 +224,7 @@ AuditLogDirector.log(logable, auditLogType); } - protected MacPoolManager getMacPoolManager() { + protected MacPoolManagerStrategy getMacPoolManager() { return MacPoolManager.getInstance(); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/VmInterfaceManagerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/VmInterfaceManagerTest.java index f70bf11..9aa3316 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/VmInterfaceManagerTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/VmInterfaceManagerTest.java @@ -56,7 +56,7 @@ ); @Mock - private MacPoolManager macPoolManager; + private MacPoolManagerStrategy macPoolManagerStrategy; @Mock private VmNetworkStatisticsDao vmNetworkStatisticsDAO; @@ -84,7 +84,7 @@ public void setupMocks() { MockitoAnnotations.initMocks(this); - doReturn(macPoolManager).when(vmInterfaceManager).getMacPoolManager(); + doReturn(macPoolManagerStrategy).when(vmInterfaceManager).getMacPoolManager(); doReturn(vmNetworkStatisticsDAO).when(vmInterfaceManager).getVmNetworkStatisticsDao(); doReturn(vmNetworkInterfaceDAO).when(vmInterfaceManager).getVmNetworkInterfaceDao(); doReturn(vmNicDao).when(vmInterfaceManager).getVmNicDao(); @@ -116,9 +116,9 @@ when(osRepository.hasNicHotplugSupport(any(Integer.class), any(Version.class))).thenReturn(true); vmInterfaceManager.add(iface, NoOpCompensationContext.getInstance(), reserveExistingMac, osId, version); if (reserveExistingMac) { - verify(macPoolManager, times(1)).forceAddMac((iface.getMacAddress())); + verify(macPoolManagerStrategy, times(1)).forceAddMac((iface.getMacAddress())); } else { - verifyZeroInteractions(macPoolManager); + verifyZeroInteractions(macPoolManagerStrategy); } verifyAddDelegatedCorrectly(iface, addMacVerification); } @@ -167,10 +167,10 @@ * @param iface * The interface to check for. * @param addMacVerification - * Mode to check (times(1), never(), etc) for {@link MacPoolManager#addMac(String)}. + * Mode to check (times(1), never(), etc) for {@link org.ovirt.engine.core.bll.network.MacPoolManagerStrategy#addMac(String)}. */ protected void verifyAddDelegatedCorrectly(VmNic iface, VerificationMode addMacVerification) { - verify(macPoolManager, addMacVerification).forceAddMac(iface.getMacAddress()); + verify(macPoolManagerStrategy, addMacVerification).forceAddMac(iface.getMacAddress()); verify(vmNicDao).save(iface); verify(vmNetworkStatisticsDAO).save(iface.getStatistics()); } @@ -182,7 +182,7 @@ * The interface to check for. */ protected void verifyRemoveAllDelegatedCorrectly(VmNic iface) { - verify(macPoolManager, times(1)).freeMac(iface.getMacAddress()); + verify(macPoolManagerStrategy, times(1)).freeMac(iface.getMacAddress()); verify(vmNicDao).remove(iface.getId()); verify(vmNetworkStatisticsDAO).remove(iface.getId()); } -- To view, visit http://gerrit.ovirt.org/26793 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4a6f353095e52088fbf3e7e0e9c1fe624a7e7cd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <mmu...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
