[Engine-patches] Change in ovirt-engine[master]: engine: refactoring NetworkUtils.getVlanDeviceName

[alkaplan]

Alona Kaplan has uploaded a new change for review.

Change subject: engine: refactoring NetworkUtils.getVlanDeviceName
......................................................................

engine: refactoring NetworkUtils.getVlanDeviceName

This patch changes the method name to constructVlanDeviceName.
The method should be used only for constructing new vlan devices.
Other places shoulded assume the vlan device name is in format-
baseIface.vlanId

Change-Id: I34ed8b14fb8e22d9681bdbc34d863c52b6d23be5
Signed-off-by: Alona Kaplan <alkap...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkParametersBuilder.java
M 
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java
2 files changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/27152/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 629b6f7..1e03802 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
@@ -17,6 +17,7 @@
 import org.ovirt.engine.core.common.businessentities.network.Vlan;
 import org.ovirt.engine.core.common.errors.VdcBLLException;
 import org.ovirt.engine.core.common.errors.VdcBllErrors;
+import org.ovirt.engine.core.common.utils.ObjectUtils;
 import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
@@ -50,7 +51,9 @@
         VdsNetworkInterface vlan = new Vlan();
         vlan.setNetworkName(network.getName());
         vlan.setVdsId(nic.getVdsId());
-        vlan.setName(NetworkUtils.getVlanDeviceName(nic, network));
+        vlan.setName(NetworkUtils.constructVlanDeviceName(nic, network));
+        vlan.setVlanId(network.getVlanId());
+        vlan.setBaseInterface(nic.getName());
         vlan.setBootProtocol(NetworkBootProtocol.NONE);
         return vlan;
     }
@@ -122,7 +125,8 @@
             VdsNetworkInterface baseNic,
             Network network) {
         for (VdsNetworkInterface n : nics) {
-            if (StringUtils.equals(n.getName(), 
NetworkUtils.getVlanDeviceName(baseNic, network))
+            if ((baseNic.getName().equals(n.getBaseInterface()) && 
ObjectUtils.objectsEqual(n.getVlanId(),
+                    network.getVlanId()))
                     || StringUtils.equals(n.getNetworkName(), 
network.getName())) {
                 return n;
             }
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 74b0c54..65b2333 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
@@ -305,7 +305,7 @@
      *            the network which holds the vlan-id
      * @return a name representing the vlan device
      */
-    public static String getVlanDeviceName(VdsNetworkInterface underlyingNic, 
Network network) {
+    public static String constructVlanDeviceName(VdsNetworkInterface 
underlyingNic, Network network) {
         return underlyingNic.getName() + "." + network.getVlanId();
     }
 


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

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