Martin Mucha has uploaded a new change for review. Change subject: core: move mac pool classes to own package ......................................................................
core: move mac pool classes to own package Change-Id: I97c8ffee1f4bc50f71e3dd902439e7797cc21728 Bug-Url: https://bugzilla.redhat.com/1078844 Signed-off-by: Martin Mucha <mmu...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/AbstractScope.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/DataCenterScope.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/DefaultScopeManipulation.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/GlobalScope.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManager.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerOriginal.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerRanges.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerStrategy.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/ObjectCounter.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/Scope.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/ScopeManipulation.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/ScopeManipulationImpl.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/ScopedMacPoolManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/VmInterfaceManagerTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerInitializationTimeTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerTestUtils.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerValidityTest.java 32 files changed, 50 insertions(+), 48 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/01/26801/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java index df375cc..54701f2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java @@ -12,8 +12,8 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.job.ExecutionHandler; import org.ovirt.engine.core.bll.network.VmInterfaceManager; -import org.ovirt.engine.core.bll.network.MacPoolManagerStrategy; -import org.ovirt.engine.core.bll.network.ScopedMacPoolManager; +import org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManagerStrategy; +import org.ovirt.engine.core.bll.network.macPoolManager.ScopedMacPoolManager; import org.ovirt.engine.core.bll.quota.QuotaConsumptionParameter; import org.ovirt.engine.core.bll.quota.QuotaSanityParameter; import org.ovirt.engine.core.bll.quota.QuotaStorageConsumptionParameter; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java index c8b49ec..f13c1a4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java @@ -8,8 +8,8 @@ import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.job.ExecutionContext; import org.ovirt.engine.core.bll.job.ExecutionHandler; -import org.ovirt.engine.core.bll.network.MacPoolManagerStrategy; -import org.ovirt.engine.core.bll.network.ScopedMacPoolManager; +import org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManagerStrategy; +import org.ovirt.engine.core.bll.network.macPoolManager.ScopedMacPoolManager; import org.ovirt.engine.core.bll.quota.QuotaConsumptionParameter; import org.ovirt.engine.core.bll.quota.QuotaStorageConsumptionParameter; import org.ovirt.engine.core.bll.quota.QuotaStorageDependent; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index 951e8f2..23c5f55 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -14,8 +14,8 @@ import org.ovirt.engine.core.bll.job.ExecutionContext; import org.ovirt.engine.core.bll.job.ExecutionHandler; import org.ovirt.engine.core.bll.memory.MemoryUtils; -import org.ovirt.engine.core.bll.network.MacPoolManagerStrategy; -import org.ovirt.engine.core.bll.network.ScopedMacPoolManager; +import org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManagerStrategy; +import org.ovirt.engine.core.bll.network.macPoolManager.ScopedMacPoolManager; import org.ovirt.engine.core.bll.network.VmInterfaceManager; import org.ovirt.engine.core.bll.network.vm.VnicProfileHelper; import org.ovirt.engine.core.bll.quota.QuotaConsumptionParameter; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java index 38ce0cf..a940862 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java @@ -15,7 +15,7 @@ import org.ovirt.engine.core.bll.dwh.DwhHeartBeat; import org.ovirt.engine.core.bll.gluster.GlusterJobsManager; import org.ovirt.engine.core.bll.job.ExecutionHandler; -import org.ovirt.engine.core.bll.network.ScopedMacPoolManager; +import org.ovirt.engine.core.bll.network.macPoolManager.ScopedMacPoolManager; import org.ovirt.engine.core.bll.provider.ExternalTrustStoreInitializer; import org.ovirt.engine.core.bll.scheduling.MigrationHandler; import org.ovirt.engine.core.bll.scheduling.SchedulingManager; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java index 9dbfb4d..886f69e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java @@ -11,8 +11,8 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.job.ExecutionHandler; -import org.ovirt.engine.core.bll.network.MacPoolManagerStrategy; -import org.ovirt.engine.core.bll.network.ScopedMacPoolManager; +import org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManagerStrategy; +import org.ovirt.engine.core.bll.network.macPoolManager.ScopedMacPoolManager; import org.ovirt.engine.core.bll.snapshots.SnapshotsManager; import org.ovirt.engine.core.bll.storage.StorageDomainCommandBase; import org.ovirt.engine.core.bll.utils.PermissionSubject; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java index 32f103a..a1d9689 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Set; -import org.ovirt.engine.core.bll.network.MacPoolManagerStrategy; -import org.ovirt.engine.core.bll.network.ScopedMacPoolManager; +import org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManagerStrategy; +import org.ovirt.engine.core.bll.network.macPoolManager.ScopedMacPoolManager; import org.ovirt.engine.core.bll.snapshots.SnapshotsManager; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.FeatureSupported; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java index 6f5bdcf..af7a1c4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java @@ -11,7 +11,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.context.CompensationContext; -import org.ovirt.engine.core.bll.network.MacPoolManagerStrategy; +import org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManagerStrategy; import org.ovirt.engine.core.bll.validator.StorageDomainValidator; import org.ovirt.engine.core.bll.validator.VmValidationUtils; import org.ovirt.engine.core.common.AuditLogType; 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 b837232..a4f4f76 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 @@ -10,6 +10,8 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.context.CompensationContext; +import org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManagerStrategy; +import org.ovirt.engine.core.bll.network.macPoolManager.ScopedMacPoolManager; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.FeatureSupported; import org.ovirt.engine.core.common.businessentities.VM; @@ -42,9 +44,9 @@ private Log log = LogFactory.getLog(getClass()); /** - * Add a {@link VmNic} to the VM. Allocates a MAC from the {@link MacPoolManager} if necessary, otherwise, if - * {@code ConfigValues.HotPlugEnabled} is true, forces adding the MAC address to the {@link MacPoolManager}. If - * HotPlug is not enabled tries to add the {@link VmNic}'s MAC address to the {@link MacPoolManager}, and throws a + * Add a {@link VmNic} to the VM. Allocates a MAC from the {@link org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManager} if necessary, otherwise, if + * {@code ConfigValues.HotPlugEnabled} is true, forces adding the MAC address to the {@link org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManager}. If + * HotPlug is not enabled tries to add the {@link VmNic}'s MAC address to the {@link org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManager}, and throws a * {@link VdcBllException} if it fails. * * @param iface @@ -52,7 +54,7 @@ * @param compensationContext * Used to snapshot the saved entities. * @param reserveExistingMac - * Used to denote if we want to reserve the NIC's MAC address in the {@link MacPoolManager} + * Used to denote if we want to reserve the NIC's MAC address in the {@link org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManager} * @param clusterCompatibilityVersion * the compatibility version of the cluster * @return <code>true</code> if the MAC wasn't used, <code>false</code> if it was. @@ -115,7 +117,7 @@ } /** - * Remove all {@link VmNic}s from the VM, and remove the Mac addresses from {@link MacPoolManager}. + * Remove all {@link VmNic}s from the VM, and remove the Mac addresses from {@link org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManager}. * * @param vmId * The ID of the VM to remove from. diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AbstractScope.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/AbstractScope.java similarity index 96% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AbstractScope.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/AbstractScope.java index ab1d1a0..b1814be 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AbstractScope.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/AbstractScope.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.network; +package org.ovirt.engine.core.bll.network.macPoolManager; import org.ovirt.engine.core.compat.Guid; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/DataCenterScope.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/DataCenterScope.java similarity index 98% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/DataCenterScope.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/DataCenterScope.java index 58700d9..4a4f0d5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/DataCenterScope.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/DataCenterScope.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.network; +package org.ovirt.engine.core.bll.network.macPoolManager; import java.util.HashMap; import java.util.List; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/DefaultScopeManipulation.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/DefaultScopeManipulation.java similarity index 94% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/DefaultScopeManipulation.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/DefaultScopeManipulation.java index 9e29e87..81c19c5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/DefaultScopeManipulation.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/DefaultScopeManipulation.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.network; +package org.ovirt.engine.core.bll.network.macPoolManager; /** * ScopeManipulation which uses one specified pool, which exists, and cannot be modified. diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/GlobalScope.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/GlobalScope.java similarity index 95% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/GlobalScope.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/GlobalScope.java index e92bb85..37ec284 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/GlobalScope.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/GlobalScope.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.network; +package org.ovirt.engine.core.bll.network.macPoolManager; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.network.VmNic; 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/MacPoolManager.java similarity index 93% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManager.java index e61ac53..e805e58 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/MacPoolManager.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.network; +package org.ovirt.engine.core.bll.network.macPoolManager; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerOriginal.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerOriginal.java similarity index 99% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerOriginal.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerOriginal.java index fd2b1a1..5b2b93b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerOriginal.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerOriginal.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.network; +package org.ovirt.engine.core.bll.network.macPoolManager; import java.text.MessageFormat; import java.util.ArrayList; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerRanges.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerRanges.java similarity index 99% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerRanges.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerRanges.java index 1baef6a..07c5a9a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerRanges.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerRanges.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.network; +package org.ovirt.engine.core.bll.network.macPoolManager; import java.util.Arrays; import java.util.BitSet; 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/macPoolManager/MacPoolManagerStrategy.java similarity index 88% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerStrategy.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerStrategy.java index 041dc70..77801f0 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/macPoolManager/MacPoolManagerStrategy.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.network; +package org.ovirt.engine.core.bll.network.macPoolManager; import java.util.List; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ObjectCounter.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/ObjectCounter.java similarity index 98% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ObjectCounter.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/ObjectCounter.java index 0b12142..f4f4da2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ObjectCounter.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/ObjectCounter.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.network; +package org.ovirt.engine.core.bll.network.macPoolManager; import java.util.HashMap; import java.util.Iterator; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/Scope.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/Scope.java similarity index 93% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/Scope.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/Scope.java index e1097e9..e702a03 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/Scope.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/Scope.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.network; +package org.ovirt.engine.core.bll.network.macPoolManager; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.network.VmNic; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ScopeManipulation.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/ScopeManipulation.java similarity index 97% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ScopeManipulation.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/ScopeManipulation.java index 8143288..434568e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ScopeManipulation.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/ScopeManipulation.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.network; +package org.ovirt.engine.core.bll.network.macPoolManager; /** * Encapsulates operations for specific scope. Methods for manipulating with scoped pool as a whole like its creation, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ScopeManipulationImpl.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/ScopeManipulationImpl.java similarity index 97% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ScopeManipulationImpl.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/ScopeManipulationImpl.java index 78e0ef5..fa83d8e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ScopeManipulationImpl.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/ScopeManipulationImpl.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.network; +package org.ovirt.engine.core.bll.network.macPoolManager; import java.util.concurrent.locks.ReentrantReadWriteLock; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ScopedMacPoolManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/ScopedMacPoolManager.java similarity index 96% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ScopedMacPoolManager.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/ScopedMacPoolManager.java index da919be..fd29d46 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ScopedMacPoolManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macPoolManager/ScopedMacPoolManager.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.network; +package org.ovirt.engine.core.bll.network.macPoolManager; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java index b79869b..a697e3d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java @@ -5,7 +5,7 @@ import org.ovirt.engine.core.bll.ValidationResult; import org.ovirt.engine.core.bll.VmCommand; import org.ovirt.engine.core.bll.VmHandler; -import org.ovirt.engine.core.bll.network.MacPoolManagerStrategy; +import org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManagerStrategy; import org.ovirt.engine.core.bll.utils.VmDeviceUtils; import org.ovirt.engine.core.common.action.ActivateDeactivateVmNicParameters; import org.ovirt.engine.core.common.action.AddVmInterfaceParameters; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java index e905055..e26f0dc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java @@ -5,8 +5,8 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; -import org.ovirt.engine.core.bll.network.MacPoolManagerStrategy; -import org.ovirt.engine.core.bll.network.ScopedMacPoolManager; +import org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManagerStrategy; +import org.ovirt.engine.core.bll.network.macPoolManager.ScopedMacPoolManager; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.bll.utils.VmDeviceUtils; import org.ovirt.engine.core.bll.validator.VmNicValidator; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java index 4cf89ab..dc6a65b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java @@ -3,7 +3,7 @@ import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; import org.ovirt.engine.core.bll.VmCommand; import org.ovirt.engine.core.bll.network.ExternalNetworkManager; -import org.ovirt.engine.core.bll.network.ScopedMacPoolManager; +import org.ovirt.engine.core.bll.network.macPoolManager.ScopedMacPoolManager; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.RemoveVmInterfaceParameters; import org.ovirt.engine.core.common.businessentities.VMStatus; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java index d396910..4e20972 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java @@ -8,8 +8,8 @@ import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; import org.ovirt.engine.core.bll.ValidationResult; import org.ovirt.engine.core.bll.network.ExternalNetworkManager; -import org.ovirt.engine.core.bll.network.MacPoolManagerStrategy; -import org.ovirt.engine.core.bll.network.ScopedMacPoolManager; +import org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManagerStrategy; +import org.ovirt.engine.core.bll.network.macPoolManager.ScopedMacPoolManager; import org.ovirt.engine.core.bll.network.cluster.NetworkHelper; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.bll.validator.VmNicValidator; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java index 0229e77..673c7ba 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java @@ -5,7 +5,7 @@ import org.ovirt.engine.core.bll.AddVdsGroupCommand; import org.ovirt.engine.core.bll.MultiLevelAdministrationHandler; -import org.ovirt.engine.core.bll.network.ScopedMacPoolManager; +import org.ovirt.engine.core.bll.network.macPoolManager.ScopedMacPoolManager; import org.ovirt.engine.core.bll.network.cluster.NetworkHelper; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.bll.utils.VersionSupport; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java index 11e2f41..ea2de64 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java @@ -12,7 +12,7 @@ import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.network.ExternalNetworkManager; -import org.ovirt.engine.core.bll.network.ScopedMacPoolManager; +import org.ovirt.engine.core.bll.network.macPoolManager.ScopedMacPoolManager; import org.ovirt.engine.core.bll.validator.StorageDomainValidator; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.DetachStorageDomainFromPoolParameters; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java index d575cfd..7ef44bd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java @@ -6,7 +6,7 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; import org.ovirt.engine.core.bll.RenamedEntityInfoProvider; -import org.ovirt.engine.core.bll.network.ScopedMacPoolManager; +import org.ovirt.engine.core.bll.network.macPoolManager.ScopedMacPoolManager; import org.ovirt.engine.core.bll.utils.VersionSupport; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.FeatureSupported; 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 521a7e0..3b68fd5 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 @@ -20,11 +20,11 @@ import org.junit.ClassRule; import org.junit.Test; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.mockito.Spy; import org.mockito.verification.VerificationMode; import org.ovirt.engine.core.bll.context.NoOpCompensationContext; +import org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManagerStrategy; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; @@ -86,7 +86,7 @@ public void setupMocks() { MockitoAnnotations.initMocks(this); - doReturn(macPoolManagerStrategy).when(vmInterfaceManager).getMacPoolManager(Mockito.any(Guid.class)); + doReturn(macPoolManagerStrategy).when(vmInterfaceManager).getMacPoolManager(any(Guid.class)); doReturn(vmNetworkStatisticsDAO).when(vmInterfaceManager).getVmNetworkStatisticsDao(); doReturn(vmNetworkInterfaceDAO).when(vmInterfaceManager).getVmNetworkInterfaceDao(); doReturn(vmNicDao).when(vmInterfaceManager).getVmNicDao(); @@ -164,12 +164,12 @@ } /** - * Verify that {@link VmInterfaceManager#add} delegated correctly to {@link MacPoolManager} & DAOs. + * Verify that {@link VmInterfaceManager#add} delegated correctly to {@link org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManager} & DAOs. * * @param iface * The interface to check for. * @param addMacVerification - * Mode to check (times(1), never(), etc) for {@link org.ovirt.engine.core.bll.network.MacPoolManagerStrategy#addMac(String)}. + * Mode to check (times(1), never(), etc) for {@link org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManagerStrategy#addMac(String)}. */ protected void verifyAddDelegatedCorrectly(VmNic iface, VerificationMode addMacVerification) { verify(macPoolManagerStrategy, addMacVerification).forceAddMac(iface.getMacAddress()); @@ -178,7 +178,7 @@ } /** - * Verify that {@link VmInterfaceManager#removeAll} delegated correctly to {@link MacPoolManager} & DAOs. + * Verify that {@link VmInterfaceManager#removeAll} delegated correctly to {@link org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManager} & DAOs. * * @param iface * The interface to check for. diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/MacPoolManagerInitializationTimeTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerInitializationTimeTest.java similarity index 95% rename from backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/MacPoolManagerInitializationTimeTest.java rename to backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerInitializationTimeTest.java index 055eed7..16925e4 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/MacPoolManagerInitializationTimeTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerInitializationTimeTest.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.network; +package org.ovirt.engine.core.bll.network.macPoolManager; import org.junit.Ignore; import org.junit.Test; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/MacPoolManagerTestUtils.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerTestUtils.java similarity index 98% rename from backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/MacPoolManagerTestUtils.java rename to backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerTestUtils.java index 6c256c7..e16b4ce 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/MacPoolManagerTestUtils.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerTestUtils.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.network; +package org.ovirt.engine.core.bll.network.macPoolManager; import java.lang.management.ManagementFactory; import java.lang.management.ThreadMXBean; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/MacPoolManagerValidityTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerValidityTest.java similarity index 98% rename from backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/MacPoolManagerValidityTest.java rename to backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerValidityTest.java index b596c1c..63c1788 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/MacPoolManagerValidityTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macPoolManager/MacPoolManagerValidityTest.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.network; +package org.ovirt.engine.core.bll.network.macPoolManager; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; @@ -314,7 +314,7 @@ fail("expected " + VdcBLLException.class.getSimpleName() + " exception during 'allocateNewMac on '" + strategy.getClass().getSimpleName()); } catch (Exception e) { assertThat(e, instanceOf(VdcBLLException.class)); - assertThat(((VdcBLLException)e).getErrorCode(), is(VdcBllErrors.MAC_POOL_NO_MACS_LEFT)); + assertThat(((VdcBLLException) e).getErrorCode(), is(VdcBllErrors.MAC_POOL_NO_MACS_LEFT)); } } -- To view, visit http://gerrit.ovirt.org/26801 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I97c8ffee1f4bc50f71e3dd902439e7797cc21728 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
