Yevgeny Zaspitsky has uploaded a new change for review.
Change subject: engine: Move getDefaultManagementNetworkName to
ManagementNetworkUtils
......................................................................
engine: Move getDefaultManagementNetworkName to ManagementNetworkUtils
Move NetworkUtils.getDefaultManagementNetworkName method to
ManagementNetworkUtils and make it non-static.
Change-Id: I659c5e929974911826c354d021ed6bf94516d22c
Signed-off-by: Yevgeny Zaspitsky <yzasp...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DefaultManagementNetworkFinderImpl.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImpl.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/DefaultManagementNetworkFinderImplTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImplTest.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtil.java
8 files changed, 58 insertions(+), 30 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/34613/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DefaultManagementNetworkFinderImpl.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DefaultManagementNetworkFinderImpl.java
index f3836ef..cc7a06d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DefaultManagementNetworkFinderImpl.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DefaultManagementNetworkFinderImpl.java
@@ -9,18 +9,20 @@
import org.ovirt.engine.core.common.businessentities.network.Network;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dao.network.NetworkDao;
-import org.ovirt.engine.core.utils.NetworkUtils;
@Singleton
final class DefaultManagementNetworkFinderImpl implements
DefaultManagementNetworkFinder {
private final NetworkDao networkDao;
+ private final ManagementNetworkUtil managementNetworkUtil;
@Inject
- DefaultManagementNetworkFinderImpl(NetworkDao networkDao) {
+ DefaultManagementNetworkFinderImpl(NetworkDao networkDao,
ManagementNetworkUtil managementNetworkUtil) {
Validate.notNull(networkDao, "networkDao cannot be null");
+ Validate.notNull(managementNetworkUtil, "managementNetworkUtil cannot
be null");
this.networkDao = networkDao;
+ this.managementNetworkUtil = managementNetworkUtil;
}
/**
@@ -39,8 +41,7 @@
if (defaultEngineManagementNetwork != null) {
return defaultEngineManagementNetwork;
}
- final List<Network> managementNetworks =
- networkDao.getManagementNetworks(dataCenterId);
+ final List<Network> managementNetworks =
networkDao.getManagementNetworks(dataCenterId);
if (managementNetworks.size() == 1) {
return managementNetworks.get(0);
}
@@ -48,7 +49,8 @@
}
private Network findConfigDefaultEngineManagementNetwork(Guid
dataCenterId) {
- return
networkDao.getByNameAndDataCenter(NetworkUtils.getDefaultManagementNetworkName(),
+ return networkDao.getByNameAndDataCenter(
+ managementNetworkUtil.getDefaultManagementNetworkName(),
dataCenterId);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImpl.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImpl.java
index 836d02f..087fd80 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImpl.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImpl.java
@@ -9,6 +9,8 @@
import org.ovirt.engine.core.common.businessentities.network.Network;
import org.ovirt.engine.core.common.businessentities.network.NetworkCluster;
import org.ovirt.engine.core.common.businessentities.network.NetworkClusterId;
+import org.ovirt.engine.core.common.config.Config;
+import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dao.network.NetworkClusterDao;
import org.ovirt.engine.core.dao.network.NetworkDao;
@@ -59,4 +61,16 @@
final Network managementNetwork = getManagementNetwork(clusterId);
return managementNetwork != null &&
managementNetwork.getName().equals(networkName);
}
+
+ /**
+ * Retrieves the default management network name from the {@link Config}.
+ * Should be used in very rare cases. <code>ManagementNetworkUtil</code>
provides more appropriate solution for vast
+ * majority of the cases.
+ *
+ * @return the default management network name.
+ */
+ @Override
+ public String getDefaultManagementNetworkName() {
+ return Config.<String> getValue(ConfigValues.DefaultManagementNetwork);
+ }
}
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 d32282b..45d2066 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
@@ -3,7 +3,10 @@
import java.util.Arrays;
import java.util.List;
+import javax.inject.Inject;
+
import org.ovirt.engine.core.bll.AddVdsGroupCommand;
+import org.ovirt.engine.core.bll.network.cluster.ManagementNetworkUtil;
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;
@@ -18,10 +21,13 @@
import org.ovirt.engine.core.common.errors.VdcBllMessages;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.Version;
-import org.ovirt.engine.core.utils.NetworkUtils;
public class AddEmptyStoragePoolCommand<T extends
StoragePoolManagementParameter> extends
StoragePoolManagementCommandBase<T> {
+
+ @Inject
+ private ManagementNetworkUtil managementNetworkUtil;
+
public AddEmptyStoragePoolCommand(T parameters) {
super(parameters);
}
@@ -64,7 +70,7 @@
private void addDefaultNetworks() {
Network net = new Network();
net.setId(Guid.newGuid());
- net.setName(NetworkUtils.getDefaultManagementNetworkName());
+ net.setName(managementNetworkUtil.getDefaultManagementNetworkName());
net.setDescription(AddVdsGroupCommand.DefaultNetworkDescription);
net.setDataCenterId(getStoragePool().getId());
net.setVmNetwork(true);
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/DefaultManagementNetworkFinderImplTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/DefaultManagementNetworkFinderImplTest.java
index 94aaa9c..9296ed7 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/DefaultManagementNetworkFinderImplTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/DefaultManagementNetworkFinderImplTest.java
@@ -7,17 +7,14 @@
import java.util.Arrays;
import java.util.Collections;
-import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.ovirt.engine.core.common.businessentities.network.Network;
-import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dao.network.NetworkDao;
-import org.ovirt.engine.core.utils.MockConfigRule;
@RunWith(MockitoJUnitRunner.class)
public class DefaultManagementNetworkFinderImplTest {
@@ -26,22 +23,21 @@
private static final Guid TEST_DC_ID = Guid.Empty;
- @Rule
- public MockConfigRule mcr = new MockConfigRule(
- MockConfigRule.mockConfig(ConfigValues.DefaultManagementNetwork,
DEFAULT_ENGINE_NETWORK_NAME));
-
@Mock
private NetworkDao mockNetworkDao;
@Mock
private Network mockNetwork;
@Mock
private Network mockDefaultEngineNetwork;
+ @Mock
+ private ManagementNetworkUtil mockManagementNetworkUtil;
@InjectMocks
private DefaultManagementNetworkFinderImpl underTest;
@Test
public void testFindDefaultManagementNetworkDefault() throws Exception {
+
when(mockManagementNetworkUtil.getDefaultManagementNetworkName()).thenReturn(DEFAULT_ENGINE_NETWORK_NAME);
when(mockNetworkDao.getByNameAndDataCenter(DEFAULT_ENGINE_NETWORK_NAME,
TEST_DC_ID)).thenReturn(mockDefaultEngineNetwork);
final Network actual =
underTest.findDefaultManagementNetwork(TEST_DC_ID);
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImplTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImplTest.java
index 99028bd..72f60ce 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImplTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImplTest.java
@@ -8,6 +8,7 @@
import java.util.Collections;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -18,9 +19,11 @@
import org.ovirt.engine.core.common.businessentities.network.Network;
import org.ovirt.engine.core.common.businessentities.network.NetworkCluster;
import org.ovirt.engine.core.common.businessentities.network.NetworkClusterId;
+import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dao.network.NetworkClusterDao;
import org.ovirt.engine.core.dao.network.NetworkDao;
+import org.ovirt.engine.core.utils.MockConfigRule;
@RunWith(MockitoJUnitRunner.class)
public class ManagementNetworkUtilImplTest {
@@ -46,6 +49,10 @@
@Captor
private ArgumentCaptor<NetworkClusterId> networkClusterIdCaptor;
+
+ @Rule
+ public MockConfigRule mcr = new MockConfigRule(
+ MockConfigRule.mockConfig(ConfigValues.DefaultManagementNetwork,
TEST_NETWORK_NAME));
/**
* Test method for {@link
ManagementNetworkUtilImpl#getManagementNetwork(Guid)} .
@@ -155,4 +162,12 @@
assertEquals(expected, actual);
}
+ /**
+ * Test method for {@link
ManagementNetworkUtilImpl#getDefaultManagementNetworkName()}.
+ */
+ @Test
+ public void testGetDefaultManagementNetworkName() throws Exception {
+ assertEquals(TEST_NETWORK_NAME,
underTest.getDefaultManagementNetworkName());
+ }
+
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java
index 1eede62..7607f04 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java
@@ -21,17 +21,6 @@
public final class NetworkUtils {
public static final String OS_REFERENCE_TO_MACHINE_NAME = "HOSTNAME";
- /**
- * Retrieves the default management network name from the {@link Config}.
- * Should be used in very rare cases. <code>ManagementNetworkUtil</code>
provides more appropriate solution for vast
- * majority of the cases.
- *
- * @return the default management network name.
- */
- public static String getDefaultManagementNetworkName() {
- return Config.<String> getValue(ConfigValues.DefaultManagementNetwork);
- }
-
public static Integer getDefaultMtu() {
return Config.<Integer> getValue(ConfigValues.DefaultMTU);
}
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
index 8dd11e8..a7a0763 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
@@ -20,17 +20,13 @@
private static final String IFACE_NAME = "eth1";
- private static final String MANAGEMENT_NETWORK = "mgmt";
-
private static final int DEFAULT_MTU = 1500;
@Rule
public RandomUtilsSeedingRule rusr = new RandomUtilsSeedingRule();
@Rule
- public MockConfigRule mcr = new MockConfigRule(
- MockConfigRule.mockConfig(ConfigValues.DefaultManagementNetwork,
MANAGEMENT_NETWORK),
- MockConfigRule.mockConfig(ConfigValues.DefaultMTU, DEFAULT_MTU));
+ public MockConfigRule mcr = new
MockConfigRule(MockConfigRule.mockConfig(ConfigValues.DefaultMTU, DEFAULT_MTU));
@Test
public void calculateNetworkImplementationDetailsNoNetworkName() throws
Exception {
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtil.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtil.java
index 19b92a2..57f068a 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtil.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtil.java
@@ -1,6 +1,7 @@
package org.ovirt.engine.core.bll.network.cluster;
import org.ovirt.engine.core.common.businessentities.network.Network;
+import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.compat.Guid;
// TODO: move the interface to more suitable for that module as soon as it
will be possible (CDI cross module issue
@@ -49,4 +50,13 @@
* false otherwise
*/
boolean isManagementNetwork(String networkName, Guid clusterId);
+
+ /**
+ * Retrieves the default management network name from the {@link Config}.
+ * Should be used in very rare cases - {@link #getManagementNetwork} and
{@link #isManagementNetwork} methods
+ * provide more appropriate solution for vast majority of the cases.
+ *
+ * @return the default management network name.
+ */
+ String getDefaultManagementNetworkName();
}
--
To view, visit http://gerrit.ovirt.org/34613
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I659c5e929974911826c354d021ed6bf94516d22c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yevgeny Zaspitsky <yzasp...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
