Moti Asayag has uploaded a new change for review. Change subject: engine: Change uniqueInterfaceName to work with VmNic ......................................................................
engine: Change uniqueInterfaceName to work with VmNic The patch modifies the signature of uniqueInterfaceName to accept VmNic list and its callers. Change-Id: I89dd8ddfbf3a3777b9ce54d1649b01fb111bceab Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java 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 M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java 8 files changed, 17 insertions(+), 17 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/17226/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java index 040d81e..f9851da 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java @@ -29,6 +29,7 @@ import org.ovirt.engine.core.common.businessentities.VmDynamic; import org.ovirt.engine.core.common.businessentities.VmStatic; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; +import org.ovirt.engine.core.common.businessentities.network.VmNic; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.errors.VdcBLLException; @@ -343,15 +344,15 @@ * - Messages for CanDoAction(). * @return - True , if name is valid, false, if name already exist. */ - public static boolean IsNotDuplicateInterfaceName(List<VmNetworkInterface> interfaces, + public static boolean IsNotDuplicateInterfaceName(List<VmNic> interfaces, final String interfaceName, List<String> messages) { // Interface iface = interfaces.FirstOrDefault(i => i.name == // AddVmInterfaceParameters.Interface.name); - VmNetworkInterface iface = LinqUtils.firstOrNull(interfaces, new Predicate<VmNetworkInterface>() { + VmNic iface = LinqUtils.firstOrNull(interfaces, new Predicate<VmNic>() { @Override - public boolean eval(VmNetworkInterface i) { + public boolean eval(VmNic i) { return i.getName().equals(interfaceName); } }); 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 dc10bec..7fe497b 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 @@ -18,7 +18,6 @@ import org.ovirt.engine.core.common.businessentities.VmDeviceId; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.VmInterfaceType; -import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.businessentities.network.VmNic; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.validation.group.CreateEntity; @@ -52,8 +51,7 @@ @Override protected boolean canDoAction() { - List<VmNetworkInterface> interfaces = - getVmNetworkInterfaceDao().getAllForTemplate(getParameters().getVmTemplateId()); + List<VmNic> interfaces = getVmNicDao().getAllForTemplate(getParameters().getVmTemplateId()); if (!interfaceNameUnique(interfaces) || !validate(templateExists()) || !validate(linkedToTemplate())) { 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 430e4a5..ed275ea 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 @@ -13,6 +13,7 @@ import org.ovirt.engine.core.common.businessentities.VmDeviceId; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; +import org.ovirt.engine.core.common.businessentities.network.VmNic; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.validation.group.UpdateEntity; import org.ovirt.engine.core.compat.Version; @@ -40,8 +41,7 @@ return false; } - List<VmNetworkInterface> interfaces = - getVmNetworkInterfaceDao().getAllForTemplate(getParameters().getVmTemplateId()); + List<VmNic> interfaces = getVmNicDao().getAllForTemplate(getParameters().getVmTemplateId()); if (!validate(templateExists())) { return false; @@ -49,9 +49,9 @@ // Interface oldIface = interfaces.First(i => i.id == // AddVmInterfaceParameters.Interface.id); - VmNetworkInterface oldIface = LinqUtils.firstOrNull(interfaces, new Predicate<VmNetworkInterface>() { + VmNic oldIface = LinqUtils.firstOrNull(interfaces, new Predicate<VmNic>() { @Override - public boolean eval(VmNetworkInterface i) { + public boolean eval(VmNic i) { return i.getId().equals(getParameters().getInterface().getId()); } }); 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 ffbc4e5..1e26d5e 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 @@ -7,7 +7,7 @@ import org.ovirt.engine.core.bll.VmTemplateCommand; 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.VmNetworkInterface; +import org.ovirt.engine.core.common.businessentities.network.VmNic; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.compat.Guid; @@ -39,7 +39,7 @@ return getParameters().getInterface().getNetworkName(); } - protected boolean interfaceNameUnique(List<VmNetworkInterface> interfaces) { + protected boolean interfaceNameUnique(List<VmNic> interfaces) { return VmHandler.IsNotDuplicateInterfaceName(interfaces, getInterfaceName(), getReturnValue().getCanDoActionMessages()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java index 8a23bd8..968bfa9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java @@ -85,7 +85,7 @@ : ValidationResult.VALID; } - protected boolean uniqueInterfaceName(List<VmNetworkInterface> interfaces) { + protected boolean uniqueInterfaceName(List<VmNic> interfaces) { return VmHandler.IsNotDuplicateInterfaceName(interfaces, getInterfaceName(), getReturnValue().getCanDoActionMessages()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java index 38efc08..6e14ab4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java @@ -113,7 +113,7 @@ return false; } - List<VmNetworkInterface> interfaces = getVmNetworkInterfaceDao().getAllForVm(getParameters().getVmId()); + List<VmNic> interfaces = getVmNicDao().getAllForVm(getParameters().getVmId()); if (!uniqueInterfaceName(interfaces)) { return false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java index e02083e..4402349 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java @@ -161,7 +161,8 @@ return false; } - if (!StringUtils.equals(oldIface.getName(), getInterfaceName()) && !uniqueInterfaceName(interfaces)) { + if (!StringUtils.equals(oldIface.getName(), getInterfaceName()) + && !uniqueInterfaceName(Entities.<VmNic, VmNetworkInterface> upcast(interfaces))) { return false; } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java index 7dca54d..c524903 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java @@ -35,8 +35,8 @@ import org.ovirt.engine.core.common.businessentities.permissions; import org.ovirt.engine.core.common.businessentities.vds_spm_id_map; import org.ovirt.engine.core.common.businessentities.network.Network; -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.job.Job; import org.ovirt.engine.core.common.job.Step; import org.ovirt.engine.core.compat.Guid; @@ -148,7 +148,7 @@ put(BaseDisk.class, BaseDiskDao.class); put(DiskImage.class, BaseDiskDao.class); put(DiskImageDynamic.class, DiskImageDynamicDAO.class); - put(VmNetworkInterface.class, VmNetworkInterfaceDao.class); + put(VmNic.class, VmNicDao.class); put(VmNetworkStatistics.class, VmNetworkStatisticsDao.class); put(Network.class, NetworkDao.class); put(Provider.class, ProviderDao.class); -- To view, visit http://gerrit.ovirt.org/17226 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I89dd8ddfbf3a3777b9ce54d1649b01fb111bceab Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
