[Engine-patches] Change in ovirt-engine[master]: engine: minor cleanup for ImportVmTemplateCommand

[masayag]

Moti Asayag has uploaded a new change for review.

Change subject: engine: minor cleanup for ImportVmTemplateCommand
......................................................................

engine: minor cleanup for ImportVmTemplateCommand

Replaced an incorrect variable name with a proper one and
moved the network name resolution few lines lower.

Change-Id: I962b89eef095a1ff8451b705e8d2ec7bf0115943
Signed-off-by: Moti Asayag <masa...@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, 13 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/17441/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 e76b01f..1adee36 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
@@ -1095,7 +1095,6 @@
 
             iface.setVnicProfileId(vnicProfile.getId());
             addVnic(vmInterfaceManager, iface);
-            continue;
         }
 
         auditInvalidInterfaces(invalidNetworkNames, invalidIfaceNames);
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 d8da31e..91b5f94 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
@@ -391,29 +391,29 @@
             }
 
             iface.setVmId(getVmTemplateId());
-            VmNic iDynamic = new VmNic();
-            iDynamic.setId(iface.getId());
-            iDynamic.setVmTemplateId(getVmTemplateId());
-            iDynamic.setName(iface.getName());
+            VmNic nic = new VmNic();
+            nic.setId(iface.getId());
+            nic.setVmTemplateId(getVmTemplateId());
+            nic.setName(iface.getName());
+            nic.setLinked(iface.isLinked());
+            nic.setSpeed(iface.getSpeed());
+            nic.setType(iface.getType());
+
             if (vmInterfaceManager.isValidVmNetwork(iface,
                     networksInVdsByName,
                     getVdsGroup().getcompatibility_version())) {
-                iDynamic.setVnicProfileId(iface.getVnicProfileId());
+                nic.setVnicProfileId(iface.getVnicProfileId());
             } else {
                 invalidNetworkNames.add(iface.getNetworkName());
                 invalidIfaceNames.add(iface.getName());
-                iDynamic.setVnicProfileId(null);
+                nic.setVnicProfileId(null);
             }
 
-            iDynamic.setLinked(iface.isLinked());
-            iDynamic.setSpeed(iface.getSpeed());
-            iDynamic.setType(iface.getType());
-
-            getVmNicDao().save(iDynamic);
-            getCompensationContext().snapshotNewEntity(iDynamic);
+            getVmNicDao().save(nic);
+            getCompensationContext().snapshotNewEntity(nic);
 
             VmNetworkStatistics iStat = new VmNetworkStatistics();
-            iDynamic.setStatistics(iStat);
+            nic.setStatistics(iStat);
             iStat.setId(iface.getId());
             iStat.setVmId(getVmTemplateId());
             getDbFacade().getVmNetworkStatisticsDao().save(iStat);


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

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