[Engine-patches] Change in ovirt-engine[master]: core: 'No Network' on a Vnic should be marked as null and no...

[alkaplan]

Alona Kaplan has uploaded a new change for review.

Change subject: core: 'No Network' on a Vnic should be marked as null and not 
empty String.
......................................................................

core: 'No Network' on a Vnic should be marked as null and not empty String.

If on importVm, the VM has Nics with non valid Network, the Network
was deleted by setting it to empty String.

Since NetworkLinking feature, the convention is to mark no-network as null
and not as empty String.

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


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/9563/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
index c33c446..4dd4341 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
@@ -839,7 +839,7 @@
             if (!vmInterfaceManager.isValidVmNetwork(iface, 
networksInVdsByName)) {
                 invalidNetworkNames.add(iface.getNetworkName());
                 invalidIfaceNames.add(iface.getName());
-                iface.setNetworkName(StringUtils.EMPTY);
+                iface.setNetworkName(null);
             }
 
             vmInterfaceManager.add(iface, getCompensationContext(), 
getParameters().isImportAsNewEntity());
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
index 3486066..6dea11d 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.bll.command.utils.StorageDomainSpaceChecker;
 import org.ovirt.engine.core.bll.job.ExecutionHandler;
 import org.ovirt.engine.core.bll.network.VmInterfaceManager;
@@ -377,7 +376,7 @@
             } else {
                 invalidNetworkNames.add(iface.getNetworkName());
                 invalidIfaceNames.add(iface.getName());
-                iDynamic.setNetworkName(StringUtils.EMPTY);
+                iDynamic.setNetworkName(null);
             }
             iDynamic.setSpeed(iface.getSpeed());
             iDynamic.setType(iface.getType());


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

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