Moti Asayag has uploaded a new change for review. Change subject: engine: Replace use of VmNetworkInterfaceDao with VmNicDao ......................................................................
engine: Replace use of VmNetworkInterfaceDao with VmNicDao The patch replaces usages of VmNetworkInterfaceDao.getAllForTemplate() with VmNicDao.getAllForTemplate() Change-Id: I134594317521482d62ce8cad0320ab66c0499db7 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java 3 files changed, 8 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/17227/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java index 4758cd4..6965517 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java @@ -253,7 +253,7 @@ return VmHandler.VerifyAddVm (getReturnValue().getCanDoActionMessages(), getParameters().getVmsCount() - * getVmNetworkInterfaceDao().getAllForTemplate(getVmTemplateId()).size(), + * getVmNicDao().getAllForTemplate(getVmTemplateId()).size(), getParameters().getVmStaticData().getPriority()); } 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 e3e8bdc..f93375b 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 @@ -38,6 +38,7 @@ 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.errors.VdcBLLException; import org.ovirt.engine.core.common.errors.VdcBllErrors; import org.ovirt.engine.core.common.errors.VdcBllMessages; @@ -415,10 +416,9 @@ } protected void removeNetwork() { - List<VmNetworkInterface> list = - DbFacade.getInstance().getVmNetworkInterfaceDao().getAllForTemplate(getVmTemplateId()); - for (VmNetworkInterface iface : list) { - DbFacade.getInstance().getVmNicDao().remove(iface.getId()); + List<VmNic> list = getVmNicDao().getAllForTemplate(getVmTemplateId()); + for (VmNic iface : list) { + getVmNicDao().remove(iface.getId()); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java index 84127da..c8f0557 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java @@ -15,7 +15,7 @@ import org.ovirt.engine.core.common.businessentities.VmDeviceId; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.VmTemplateStatus; -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.VdcBllMessages; @@ -167,9 +167,8 @@ } protected void RemoveNetwork() { - List<VmNetworkInterface> list = DbFacade.getInstance().getVmNetworkInterfaceDao() - .getAllForTemplate(getVmTemplateId()); - for (VmNetworkInterface iface : list) { + List<VmNic> list = getVmNicDao().getAllForTemplate(getVmTemplateId()); + for (VmNic iface : list) { DbFacade.getInstance().getVmDeviceDao().remove(new VmDeviceId(iface.getId(), getVmTemplateId())); getVmNicDao().remove(iface.getId()); } -- To view, visit http://gerrit.ovirt.org/17227 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I134594317521482d62ce8cad0320ab66c0499db7 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
