[Engine-patches] Change in ovirt-engine[master]: engine: Extract getVlanDevice() to NetworkParametersBuilder

[masayag]

Moti Asayag has uploaded a new change for review.

Change subject: engine: Extract getVlanDevice() to NetworkParametersBuilder
......................................................................

engine: Extract getVlanDevice() to NetworkParametersBuilder

The method could be used by other parameter builders,
therefore it should moved to the base class.

Change-Id: Id3792ef68ac28bd901005642ae0f58dfd9930c1b
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkParametersBuilder.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java
2 files changed, 23 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/23190/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkParametersBuilder.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkParametersBuilder.java
index fe1293a..020e2a1 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkParametersBuilder.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkParametersBuilder.java
@@ -96,6 +96,28 @@
         }
     }
 
+    /**
+     * Finds the vlan device among all interfaces, either by the network name 
or by vlan-id
+     *
+     * @param nics
+     *            the host interfaces
+     * @param baseNic
+     *            the underlying interface of the vlan device
+     * @return the vlan device if exists, else <code>null</code>
+     */
+    protected VdsNetworkInterface getVlanDevice(List<VdsNetworkInterface> nics,
+            VdsNetworkInterface baseNic,
+            Network network) {
+        for (VdsNetworkInterface n : nics) {
+            if (StringUtils.equals(n.getName(), 
NetworkUtils.getVlanDeviceName(baseNic, network))
+                    || StringUtils.equals(n.getNetworkName(), 
network.getName())) {
+                return n;
+            }
+        }
+
+        return null;
+    }
+
     private DbFacade getDbFacade() {
         return DbFacade.getInstance();
     }
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java
index 80f9530..c1b24dc 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java
@@ -5,7 +5,6 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.common.AuditLogType;
 import org.ovirt.engine.core.common.action.SetupNetworksParameters;
 import org.ovirt.engine.core.common.action.VdcActionParametersBase;
@@ -45,7 +44,7 @@
             if (network.getName().equals(nicToConfigure.getNetworkName())) {
                 nicToConfigure.setNetworkName(null);
             } else if (vlanNetwork) {
-                VdsNetworkInterface vlan = 
getVlanDevice(setupNetworkParams.getInterfaces(), nicToConfigure);
+                VdsNetworkInterface vlan = 
getVlanDevice(setupNetworkParams.getInterfaces(), nicToConfigure, network);
 
                 if (vlan == null) {
                     nonUpdateableHosts.add(nic.getVdsId());
@@ -69,25 +68,5 @@
     protected void addValuesToLog(AuditLogableBase logable) {
         logable.setStoragePoolId(network.getDataCenterId());
         logable.addCustomValue("Network", network.getName());
-    }
-
-    /**
-     * Finds the vlan device among all interfaces, either by the network name 
or by vlan-id
-     *
-     * @param nics
-     *            the host interfaces
-     * @param baseNic
-     *            the underlying interface of the vlan device
-     * @return the vlan device if exists, else <code>null</code>
-     */
-    private VdsNetworkInterface getVlanDevice(List<VdsNetworkInterface> nics, 
VdsNetworkInterface baseNic) {
-        for (VdsNetworkInterface n : nics) {
-            if (StringUtils.equals(n.getName(), 
NetworkUtils.getVlanDeviceName(baseNic, network))
-                    || StringUtils.equals(n.getNetworkName(), 
network.getName())) {
-                return n;
-            }
-        }
-
-        return null;
     }
 }


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3792ef68ac28bd901005642ae0f58dfd9930c1b
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