[Engine-patches] Change in ovirt-engine[master]: engine: Support vnic template api with network name

[masayag]

Moti Asayag has uploaded a new change for review.

Change subject: engine: Support vnic template api with network name
......................................................................

engine: Support vnic template api with network name

The patch supports the previous add/update template
vnic api with the provided network name instead of
vnic profile id.

Change-Id: I5528f48344b77685fe195c32745559f9c6e556ba
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/UpdateVmTemplateInterfaceCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/VmTemplateInterfaceCommandBase.java
3 files changed, 21 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/16/17616/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
index cad4074..efe4d14 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
@@ -57,6 +57,10 @@
             return false;
         }
 
+        if (!updateVnicForBackwardCompatibility()) {
+            return false;
+        }
+
         VmTemplateHandler.UpdateDisksFromDb(getVmTemplate());
 
         if (!VmCommand.checkPciAndIdeLimit(getVmTemplate().getNumOfMonitors(),
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/UpdateVmTemplateInterfaceCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/UpdateVmTemplateInterfaceCommand.java
index ea88099..923fd95 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/UpdateVmTemplateInterfaceCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/UpdateVmTemplateInterfaceCommand.java
@@ -46,11 +46,14 @@
         }
 
         List<VmNic> interfaces = 
getVmNicDao().getAllForTemplate(getParameters().getVmTemplateId());
-
         if (!validate(templateExists())) {
             return false;
         }
 
+        if (!updateVnicForBackwardCompatibility()) {
+            return false;
+        }
+
         // Interface oldIface = interfaces.First(i => i.id ==
         // AddVmInterfaceParameters.Interface.id);
         VmNic oldIface = LinqUtils.firstOrNull(interfaces, new 
Predicate<VmNic>() {
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/VmTemplateInterfaceCommandBase.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/VmTemplateInterfaceCommandBase.java
index b488239..34d621c 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/VmTemplateInterfaceCommandBase.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/VmTemplateInterfaceCommandBase.java
@@ -5,6 +5,7 @@
 import org.ovirt.engine.core.bll.ValidationResult;
 import org.ovirt.engine.core.bll.VmHandler;
 import org.ovirt.engine.core.bll.VmTemplateCommand;
+import org.ovirt.engine.core.bll.network.VmInterfaceManager;
 import org.ovirt.engine.core.common.action.AddVmTemplateInterfaceParameters;
 import org.ovirt.engine.core.common.businessentities.network.VmInterfaceType;
 import org.ovirt.engine.core.common.businessentities.network.VmNic;
@@ -45,4 +46,16 @@
         return getParameters().getInterface().getVmId() == null ? 
ValidationResult.VALID
                 : new 
ValidationResult(VdcBllMessages.NETWORK_INTERFACE_VM_CANNOT_BE_SET);
     }
+
+    protected boolean updateVnicForBackwardCompatibility() {
+        VmInterfaceManager nicManager = new VmInterfaceManager();
+        if 
(!validate(nicManager.updateParametersForBackwardCompatibility(getParameters().getInterface(),
+                getVmTemplate(),
+                getCurrentUser().getUserId()))) {
+            return false;
+        }
+
+        return true;
+    }
+
 }


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

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