[Engine-patches] Change in ovirt-engine[master]: engine: Remove unused method isValidVmNetworkForNullNetwork

[masayag]

Moti Asayag has uploaded a new change for review.

Change subject: engine: Remove unused method isValidVmNetworkForNullNetwork
......................................................................

engine: Remove unused method isValidVmNetworkForNullNetwork

Since vnic profile introduced there is no more use of
VmInterfaceManager.isValidVmNetworkForNullNetwork() method
and it is being removed.

Change-Id: If8e042587216fdf3d0bf724d987c116c84605fc6
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
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
2 files changed, 0 insertions(+), 51 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/17445/1

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 2b42001..47730ff 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
@@ -119,20 +119,6 @@
     }
 
     /**
-     * Checks if a Network is in the given list and is a VM Network
-     *
-     * @param iface
-     * @param networksByName
-     * @param version
-     * @return
-     */
-    public boolean isValidVmNetwork(VmNetworkInterface iface, Map<String, 
Network> networksByName, Version version) {
-        String networkName = iface.getNetworkName();
-        return networkName == null
-                || ((networksByName.containsKey(networkName) && 
networksByName.get(networkName).isVmNetwork()));
-    }
-
-    /**
      * Finds active VMs which uses a network from a given networks list
      *
      * @param vdsId
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 4701043..3c56024 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
@@ -1,7 +1,6 @@
 package org.ovirt.engine.core.bll.network;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doNothing;
@@ -111,42 +110,6 @@
         when(macPoolManager.allocateNewMac()).thenReturn(newMac);
         vmInterfaceManager.add(iface, NoOpCompensationContext.getInstance(), 
true, VERSION_3_2);
         assertEquals(newMac, iface.getMacAddress());
-    }
-
-    @Test
-    public void isValidVmNetworkForNullNetwork() {
-        Network network = createNewNetwork(true, NETWORK_NAME);
-        VmNetworkInterface iface = createNewViewableInterface();
-        assertTrue(vmInterfaceManager.isValidVmNetwork(iface,
-                Collections.singletonMap(network.getName(), network),
-                version));
-    }
-
-    @Test
-    public void isValidVmNetworkForValidNetwork() {
-        Network network = createNewNetwork(true, NETWORK_NAME);
-        VmNetworkInterface iface = createNewViewableInterface();
-        iface.setNetworkName(network.getName());
-        assertTrue(vmInterfaceManager.isValidVmNetwork(iface,
-                Collections.singletonMap(network.getName(), network),
-                version));
-    }
-
-    @Test
-    public void isValidVmNetworkForNonVmNetwork() {
-        Network network = createNewNetwork(false, NETWORK_NAME);
-        VmNetworkInterface iface = createNewViewableInterface();
-        iface.setNetworkName(network.getName());
-        assertFalse(vmInterfaceManager.isValidVmNetwork(iface,
-                Collections.singletonMap(network.getName(), network),
-                version));
-    }
-
-    @Test
-    public void isValidVmNetworkForNetworkNotInVds() {
-        VmNetworkInterface iface = createNewViewableInterface();
-        iface.setNetworkName(NETWORK_NAME);
-        assertFalse(vmInterfaceManager.isValidVmNetwork(iface, 
Collections.<String, Network> emptyMap(), version));
     }
 
     @Test


-- 
To view, visit http://gerrit.ovirt.org/17445
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If8e042587216fdf3d0bf724d987c116c84605fc6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches