[Engine-patches] Change in ovirt-engine[master]: engine: Update the vnic profile resolution of ImportVmTempal...

[masayag]

Moti Asayag has uploaded a new change for review.

Change subject: engine: Update the vnic profile resolution of ImportVmTempalte
......................................................................

engine: Update the vnic profile resolution of ImportVmTempalte

Since vnic profile is introduced, a different method should be
used to resolve the vnic profile which should be used by a vnic
of a template.

Change-Id: I59004e5c61d2fc98c6d6e26fdb16dc0c469acaf4
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
1 file changed, 10 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/17444/1

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 91b5f94..6ea1416 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
@@ -39,6 +39,7 @@
 import 
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
 import 
org.ovirt.engine.core.common.businessentities.network.VmNetworkStatistics;
 import org.ovirt.engine.core.common.businessentities.network.VmNic;
+import org.ovirt.engine.core.common.businessentities.network.VnicProfileView;
 import org.ovirt.engine.core.common.errors.VdcBLLException;
 import org.ovirt.engine.core.common.errors.VdcBllErrors;
 import org.ovirt.engine.core.common.errors.VdcBllMessages;
@@ -384,6 +385,8 @@
         List<String> invalidIfaceNames = new ArrayList<String>();
         Map<String, Network> networksInVdsByName =
                 
Entities.entitiesByName(getNetworkDAO().getAllForCluster(getVmTemplate().getVdsGroupId()));
+        List<VnicProfileView> vnicProfilesInDc =
+                
getDbFacade().getVnicProfileViewDao().getAllForDataCenter(getStoragePoolId());
 
         for (VmNetworkInterface iface : interfaces) {
             if (iface.getId() == null) {
@@ -399,14 +402,16 @@
             nic.setSpeed(iface.getSpeed());
             nic.setType(iface.getType());
 
-            if (vmInterfaceManager.isValidVmNetwork(iface,
+            if (!vmInterfaceManager.updateNicWithVnicProfile(iface,
+                    iface.getNetworkName(),
+                    iface.getVnicProfileName(),
+                    getVdsGroup().getcompatibility_version(),
                     networksInVdsByName,
-                    getVdsGroup().getcompatibility_version())) {
-                nic.setVnicProfileId(iface.getVnicProfileId());
-            } else {
+                    vnicProfilesInDc,
+                    getCurrentUser().getUserId())) {
                 invalidNetworkNames.add(iface.getNetworkName());
                 invalidIfaceNames.add(iface.getName());
-                nic.setVnicProfileId(null);
+                iface.setVnicProfileId(null);
             }
 
             getVmNicDao().save(nic);


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

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