[Engine-patches] Change in ovirt-engine[master]: core: add NetworkLinking to UpdateVmTemplateInterfaceCommand

[alkaplan]

Alona Kaplan has uploaded a new change for review.

Change subject: core: add NetworkLinking to UpdateVmTemplateInterfaceCommand
......................................................................

core: add NetworkLinking to UpdateVmTemplateInterfaceCommand

- canDoAction-
If "UnlinkingSupported" is false for the cluster compatibility version.
- block 'null' network.
- block unlinking.

Change-Id: I8b22b20aeb4860226311c1691c6e684c72a07970
Signed-off-by: Alona Kaplan <alkap...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateInterfaceCommand.java
1 file changed, 22 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/10164/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateInterfaceCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateInterfaceCommand.java
index 79689c0..ba9e74d 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateInterfaceCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateInterfaceCommand.java
@@ -6,6 +6,8 @@
 import org.ovirt.engine.core.common.action.AddVmTemplateInterfaceParameters;
 import org.ovirt.engine.core.common.businessentities.VmInterfaceType;
 import org.ovirt.engine.core.common.businessentities.VmNetworkInterface;
+import org.ovirt.engine.core.common.config.Config;
+import org.ovirt.engine.core.common.config.ConfigValues;
 import org.ovirt.engine.core.common.validation.group.UpdateEntity;
 import org.ovirt.engine.core.compat.StringHelper;
 import org.ovirt.engine.core.dal.VdcBllMessages;
@@ -58,6 +60,26 @@
             }
         });
 
+        boolean unlinkingSupported =
+                Config.<Boolean> GetValue(ConfigValues.NetworkLinkingSupported,
+                        getVdsGroup().getcompatibility_version().getValue());
+
+        if (!unlinkingSupported) {
+            if (!getParameters().getInterface().isLinked()) {
+                
addCanDoActionMessage(VdcBllMessages.UNLINKING_IS_NOT_SUPPORTED);
+                addCanDoActionMessage(String.format("$clusterVersion %1$s",
+                        getVdsGroup().getcompatibility_version().getValue()));
+                return false;
+            }
+
+            if (getParameters().getInterface().getNetworkName() == null) {
+                
addCanDoActionMessage(VdcBllMessages.NULL_NETWORK_IS_NOT_SUPPORTED);
+                addCanDoActionMessage(String.format("$clusterVersion %1$s",
+                        getVdsGroup().getcompatibility_version().getValue()));
+                return false;
+            }
+        }
+
         if (!StringHelper.EqOp(oldIface.getName(), 
getParameters().getInterface().getName())) {
             if (!VmHandler.IsNotDuplicateInterfaceName(interfaces,
                             getParameters().getInterface().getName(),


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

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