[Engine-patches] Change in ovirt-engine[master]: core: [Fix] Check PCI limits when adding NICs

[Gustavo Frederico Temple Pedrosa]

Gustavo Frederico Temple Pedrosa has uploaded a new change for review.

Change subject: core: [Fix] Check PCI limits when adding NICs
......................................................................

core: [Fix] Check PCI limits when adding NICs

The AddVmTemplateInterfaceCommand didn't account for all the existing
NICs while passing the "interfaces" list to the checkPciAndIdeLimits
procedure, so a limitless number of NICs could be created.
This change fix this behaviour.

Change-Id: I7e9ead27a7a3fe73093160b06d37159e8b6c3099
Signed-off-by: Gustavo Pedrosa <gustavo.pedr...@eldorado.org.br>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/22333/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 99ac590..04cf943 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
@@ -1,7 +1,6 @@
 package org.ovirt.engine.core.bll.network.template;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import org.ovirt.engine.core.bll.VmCommand;
@@ -59,8 +58,10 @@
 
         VmTemplateHandler.UpdateDisksFromDb(getVmTemplate());
 
+        List<VmNic> interfacesForCheckPciLimit = new 
ArrayList<VmNic>(interfaces);
+        interfacesForCheckPciLimit.add(getParameters().getInterface());
         if (!VmCommand.checkPciAndIdeLimit(getVmTemplate().getNumOfMonitors(),
-                
Collections.<VmNic>singletonList(getParameters().getInterface()),
+                interfacesForCheckPciLimit,
                 new ArrayList<DiskImageBase>(getVmTemplate().getDiskList()),
                     VmDeviceUtils.isVirtioScsiControllerAttached(getVmId()),
                     getReturnValue().getCanDoActionMessages())) {


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e9ead27a7a3fe73093160b06d37159e8b6c3099
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gustavo Frederico Temple Pedrosa <gustavo.pedr...@eldorado.org.br>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches