Yevgeny Zaspitsky has uploaded a new change for review.
Change subject: engine: remove NetworkUtils.isManagementNetwork methods
......................................................................
engine: remove NetworkUtils.isManagementNetwork methods
Remove NetworkUtils.isManagementNetwork methods.
Change-Id: I12fbe3fbf6c0a50e408770d04e776f501957dceb
Signed-off-by: Yevgeny Zaspitsky <yzasp...@redhat.com>
---
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
2 files changed, 3 insertions(+), 69 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/34192/14
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 e445a13..8579b73 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
@@ -165,28 +165,6 @@
}
/**
- * Determine if the network is management network.
- *
- * @param net
- * The network to check.
- * @return <code>true</code> iff the network is a management network.
- */
- public static boolean isManagementNetwork(Network net) {
- return isManagementNetwork(net.getName());
- }
-
- /**
- * Determine if the network is management network.
- *
- * @param networkName
- * The network name to check.
- * @return <code>true</code> iff the network is a management network.
- */
- public static boolean isManagementNetwork(String networkName) {
- return getDefaultManagementNetworkName().equals(networkName);
- }
-
- /**
* Determine if a given network is configured as a vlan
*
* @param network
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 507e6b4..8dd11e8 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
@@ -61,7 +61,7 @@
VdsNetworkInterface iface = createNetworkDevice();
calculateNetworkImplementationDetailsAndAssertManaged(iface,
true,
- createNetwork(iface.getNetworkName(), iface.isBridged(),
iface.getMtu(), iface.getVlanId()));
+ createNetwork(iface.isBridged(), iface.getMtu(),
iface.getVlanId()));
}
@Test
@@ -69,7 +69,6 @@
VdsNetworkInterface iface = createNetworkDevice();
calculateNetworkImplementationDetailsAndAssertSync(iface,
true,
- iface.getNetworkName(),
iface.isBridged(),
iface.getMtu(),
iface.getVlanId(),
@@ -81,7 +80,6 @@
VdsNetworkInterface iface = createNetworkDevice();
calculateNetworkImplementationDetailsAndAssertSync(iface,
false,
- iface.getNetworkName(),
iface.isBridged(),
0,
iface.getVlanId(),
@@ -96,7 +94,6 @@
VdsNetworkInterface iface = createNetworkDevice();
calculateNetworkImplementationDetailsAndAssertSync(iface,
false,
- iface.getNetworkName(),
!iface.isBridged(),
0,
RandomUtils.instance().nextInt(),
@@ -109,7 +106,6 @@
iface.setQos(null);
calculateNetworkImplementationDetailsAndAssertSync(iface,
true,
- iface.getNetworkName(),
iface.isBridged(),
iface.getMtu(),
iface.getVlanId(),
@@ -121,7 +117,6 @@
VdsNetworkInterface iface = createNetworkDevice();
calculateNetworkImplementationDetailsAndAssertSync(iface,
false,
- iface.getNetworkName(),
iface.isBridged(),
iface.getMtu() + 1,
iface.getVlanId(),
@@ -133,7 +128,6 @@
VdsNetworkInterface iface = createNetworkDevice();
calculateNetworkImplementationDetailsAndAssertSync(iface,
false,
- iface.getNetworkName(),
!iface.isBridged(),
iface.getMtu(),
iface.getVlanId(),
@@ -145,7 +139,6 @@
VdsNetworkInterface iface = createNetworkDevice();
calculateNetworkImplementationDetailsAndAssertSync(iface,
false,
- iface.getNetworkName(),
iface.isBridged(),
iface.getMtu(),
iface.getVlanId() + 1,
@@ -158,7 +151,6 @@
iface.setQos(null);
calculateNetworkImplementationDetailsAndAssertSync(iface,
false,
- iface.getNetworkName(),
iface.isBridged(),
iface.getMtu(),
iface.getVlanId(),
@@ -170,7 +162,6 @@
VdsNetworkInterface iface = createNetworkDevice();
calculateNetworkImplementationDetailsAndAssertSync(iface,
false,
- iface.getNetworkName(),
iface.isBridged(),
iface.getMtu(),
iface.getVlanId(),
@@ -186,7 +177,6 @@
qos.setOutboundBurst(30);
calculateNetworkImplementationDetailsAndAssertSync(iface,
false,
- iface.getNetworkName(),
iface.isBridged(),
iface.getMtu(),
iface.getVlanId(),
@@ -199,7 +189,6 @@
iface.setQosOverridden(true);
calculateNetworkImplementationDetailsAndAssertSync(iface,
true,
- iface.getNetworkName(),
iface.isBridged(),
iface.getMtu(),
iface.getVlanId(),
@@ -236,37 +225,6 @@
assertFalse(NetworkUtils.interfaceBasedOn(null, IFACE_NAME));
}
- @Test
- public void managementNetwork() throws Exception {
- Network net = new Network();
- net.setName(MANAGEMENT_NETWORK);
-
- assertTrue(NetworkUtils.isManagementNetwork(net));
- }
-
- @Test
- public void notManagementNetworkDifferentCase() throws Exception {
- Network net = new Network();
- net.setName(MANAGEMENT_NETWORK.toUpperCase());
-
- assertFalse(NetworkUtils.isManagementNetwork(net));
- }
-
- @Test
- public void notManagementNetwork() throws Exception {
- Network net = new Network();
- net.setName(MANAGEMENT_NETWORK + "1");
-
- assertFalse(NetworkUtils.isManagementNetwork(net));
- }
-
- @Test
- public void nullNotManagementNetwork() throws Exception {
- Network net = new Network();
-
- assertFalse(NetworkUtils.isManagementNetwork(net));
- }
-
private VdsNetworkInterface createVlan(String baseIfaceName) {
VdsNetworkInterface iface = new
Vlan(RandomUtils.instance().nextInt(100), baseIfaceName);
return iface;
@@ -292,12 +250,11 @@
private void
calculateNetworkImplementationDetailsAndAssertSync(VdsNetworkInterface iface,
boolean expectSync,
- String networkName,
boolean vmNet,
int mtu,
int vlanId,
NetworkQoS qos) {
- Network network = createNetwork(networkName, vmNet, mtu, vlanId);
+ Network network = createNetwork(vmNet, mtu, vlanId);
NetworkImplementationDetails networkImplementationDetails =
NetworkUtils.calculateNetworkImplementationDetails(network,
qos, iface);
@@ -308,8 +265,7 @@
networkImplementationDetails.isInSync());
}
- private Network createNetwork(String networkName,
- boolean vmNetwork,
+ private Network createNetwork(boolean vmNetwork,
int mtu,
Integer vlanId) {
Network network = new Network();
--
To view, visit http://gerrit.ovirt.org/34192
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12fbe3fbf6c0a50e408770d04e776f501957dceb
Gerrit-PatchSet: 14
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yevgeny Zaspitsky <yzasp...@redhat.com>
Gerrit-Reviewer: Alona Kaplan <alkap...@redhat.com>
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
