[Engine-patches] Change in ovirt-engine[master]: core : add NetwrokLinking support to ImportVmCommand

[alkaplan]

Alona Kaplan has uploaded a new change for review.

Change subject: core : add NetwrokLinking support to ImportVmCommand
......................................................................

core : add NetwrokLinking support to ImportVmCommand

- Support the case the vm has vnic/s will null network.

Change-Id: I16ef011a47efc6265787b845dc7af6fee5044578
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/network/VmInterfaceManager.java
2 files changed, 14 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/9770/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 4dd4341..10c2b85 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
@@ -14,9 +14,9 @@
 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;
-import org.ovirt.engine.core.bll.quota.QuotaStorageDependent;
-import org.ovirt.engine.core.bll.quota.QuotaStorageConsumptionParameter;
 import org.ovirt.engine.core.bll.quota.QuotaConsumptionParameter;
+import org.ovirt.engine.core.bll.quota.QuotaStorageConsumptionParameter;
+import org.ovirt.engine.core.bll.quota.QuotaStorageDependent;
 import org.ovirt.engine.core.bll.snapshots.SnapshotsManager;
 import org.ovirt.engine.core.bll.utils.PermissionSubject;
 import org.ovirt.engine.core.bll.utils.VmDeviceUtils;
@@ -89,9 +89,9 @@
 
     private static VmStatic vmStaticForDefaultValues = new VmStatic();
     private List<DiskImage> imageList;
-    private List<Guid> diskGuidList = new ArrayList<Guid>();
-    private List<Guid> imageGuidList = new ArrayList<Guid>();
-    private List<String> macsAdded = new ArrayList<String>();
+    private final List<Guid> diskGuidList = new ArrayList<Guid>();
+    private final List<Guid> imageGuidList = new ArrayList<Guid>();
+    private final List<String> macsAdded = new ArrayList<String>();
 
     public ImportVmCommand(ImportVmParameters parameters) {
         super(parameters);
@@ -837,7 +837,11 @@
         for (VmNetworkInterface iface : getVm().getInterfaces()) {
             initInterface(iface);
             if (!vmInterfaceManager.isValidVmNetwork(iface, 
networksInVdsByName)) {
-                invalidNetworkNames.add(iface.getNetworkName());
+                if (iface.getNetworkName() == null) {
+                    invalidNetworkNames.add("[No Network]");
+                } else {
+                    invalidNetworkNames.add(iface.getNetworkName());
+                }
                 invalidIfaceNames.add(iface.getName());
                 iface.setNetworkName(null);
             }
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 e034652..c28a8fb 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
@@ -94,6 +94,9 @@
      */
     public boolean isValidVmNetwork(VmNetworkInterface iface, Map<String, 
Network> networksByName) {
         String networkName = iface.getNetworkName();
+        if (networkName == null) {
+            return true;
+        }
         return (networksByName.containsKey(networkName) && 
networksByName.get(networkName).isVmNetwork());
     }
 
@@ -112,7 +115,7 @@
         for (VM vm : runningVms) {
             List<VmNetworkInterface> vmInterfaces = 
getVmNetworkInterfaceDAO().getAllForVm(vm.getId());
             for (VmNetworkInterface vmNic : vmInterfaces) {
-                if (networks.contains(vmNic.getNetworkName())) {
+                if (vmNic.getNetworkName() != null && 
networks.contains(vmNic.getNetworkName())) {
                     vmNames.add(vm.getvm_name());
                     break;
                 }


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

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