Moti Asayag has uploaded a new change for review. Change subject: engine: Replace static referral to DbFacade ......................................................................
engine: Replace static referral to DbFacade A static call to DbFacade from within command classes is replaced by either a call to the direct Dao or by a call to getDbFacade(). As a result some code formatting was executed. Change-Id: I01ad22a4e2450fee1e2b1cf26aff5af8d62c35ff Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/GetNetworkDisplayByClusterIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/CommitNetworkChangesCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/RemoveVmTemplateInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java 13 files changed, 46 insertions(+), 73 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/10510/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java index 0d4b508..607dc02 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java @@ -24,7 +24,6 @@ import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; import org.ovirt.engine.core.utils.NetworkUtils; @@ -39,8 +38,7 @@ @Override protected void executeCommand() { - DbFacade.getInstance().getNetworkClusterDao().remove(getParameters().getVdsGroupId(), - getParameters().getNetwork().getId()); + getNetworkClusterDAO().remove(getParameters().getVdsGroupId(), getParameters().getNetwork().getId()); setSucceeded(true); } @@ -56,7 +54,7 @@ } // check that there is no vm running with this network - List<VmStatic> vms = DbFacade.getInstance().getVmStaticDao().getAllByGroupAndNetworkName( + List<VmStatic> vms = getVmStaticDAO().getAllByGroupAndNetworkName( getParameters().getVdsGroupId(), getParameters().getNetwork().getname()); if (vms.size() > 0) { addCanDoActionMessage(VdcBllMessages.NETWORK_CANNOT_REMOVE_NETWORK_IN_USE_BY_VM); @@ -66,11 +64,9 @@ } // check that no template is using this network - List<VmTemplate> templates = DbFacade.getInstance().getVmTemplateDao() - .getAllForVdsGroup(getParameters().getVdsGroupId()); + List<VmTemplate> templates = getVmTemplateDAO().getAllForVdsGroup(getParameters().getVdsGroupId()); for (VmTemplate tmpl : templates) { - List<VmNetworkInterface> interfaces = DbFacade.getInstance() - .getVmNetworkInterfaceDao().getAllForTemplate(tmpl.getId()); + List<VmNetworkInterface> interfaces = getVmNetworkInterfaceDao().getAllForTemplate(tmpl.getId()); if (networkUsedByAnInterface(interfaces)) { addCanDoActionMessage(VdcBllMessages.NETWORK_CANNOT_REMOVE_NETWORK_IN_USE_BY_TEMPLATE); return false; @@ -90,8 +86,7 @@ List<IVdcQueryable> vmList = (List<IVdcQueryable>) ret.getReturnValue(); for (IVdcQueryable vm_helper : vmList) { VM vm = (VM) vm_helper; - List<VmNetworkInterface> interfaces = DbFacade.getInstance() - .getVmNetworkInterfaceDao().getAllForVm(vm.getId()); + List<VmNetworkInterface> interfaces = getVmNetworkInterfaceDao().getAllForVm(vm.getId()); if (networkUsedByAnInterface(interfaces)) { addCanDoActionMessage(VdcBllMessages.NETWORK_INTERFACE_IN_USE_BY_VM); return false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/GetNetworkDisplayByClusterIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/GetNetworkDisplayByClusterIdQuery.java index f3053b0..8cedb23 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/GetNetworkDisplayByClusterIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/GetNetworkDisplayByClusterIdQuery.java @@ -7,7 +7,6 @@ import org.ovirt.engine.core.common.businessentities.NetworkCluster; import org.ovirt.engine.core.common.queries.VdsGroupQueryParamenters; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; @@ -19,7 +18,7 @@ @Override protected void executeQueryCommand() { Guid vdsgroupid = getParameters().getVdsGroupId(); - List<NetworkCluster> all = DbFacade.getInstance().getNetworkClusterDao().getAllForCluster(vdsgroupid); + List<NetworkCluster> all = getDbFacade().getNetworkClusterDao().getAllForCluster(vdsgroupid); final NetworkCluster nc = LinqUtils.firstOrNull(all, new Predicate<NetworkCluster>() { @Override public boolean eval(NetworkCluster networkCluster) { @@ -28,7 +27,7 @@ }); if (nc != null) { getQueryReturnValue().setReturnValue( - LinqUtils.firstOrNull(DbFacade.getInstance().getNetworkDao().getAllForCluster(vdsgroupid), + LinqUtils.firstOrNull(getDbFacade().getNetworkDao().getAllForCluster(vdsgroupid), new Predicate<Network>() { @Override public boolean eval(Network network) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java index 22898a0..736dd36 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/AddNetworkCommand.java @@ -14,7 +14,6 @@ import org.ovirt.engine.core.common.validation.group.CreateEntity; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; @@ -27,7 +26,7 @@ @Override protected void executeCommand() { getNetwork().setId(Guid.NewGuid()); - DbFacade.getInstance().getNetworkDao().save(getNetwork()); + getNetworkDAO().save(getNetwork()); addPermissions(); getReturnValue().setActionReturnValue(getNetwork().getId()); setSucceeded(true); @@ -63,10 +62,9 @@ List<Network> all; if (getNetwork().getstorage_pool_id() != null && !getNetwork().getstorage_pool_id().getValue().equals(Guid.Empty)) { - all = DbFacade.getInstance().getNetworkDao().getAllForDataCenter( - getNetwork().getstorage_pool_id().getValue()); + all = getNetworkDAO().getAllForDataCenter(getNetwork().getstorage_pool_id().getValue()); } else { - all = DbFacade.getInstance().getNetworkDao().getAll(); + all = getNetworkDAO().getAll(); } boolean exists = null != LinqUtils.firstOrNull(all, new Predicate<Network>() { @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java index 5c5f0f0..d40f3da 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java @@ -12,7 +12,6 @@ import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.validation.group.UpdateEntity; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; @@ -26,7 +25,7 @@ @Override protected void executeCommand() { - DbFacade.getInstance().getNetworkDao().update(getNetwork()); + getNetworkDAO().update(getNetwork()); for (VDSGroup cluster : clusters) { NetworkClusterHelper.setStatus(cluster.getId(), getNetwork()); @@ -42,7 +41,7 @@ @Override protected boolean canDoAction() { - List<Network> networks = DbFacade.getInstance().getNetworkDao().getAll(); + List<Network> networks = getNetworkDAO().getAll(); if (getStoragePool() == null) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_POOL_NOT_EXIST); @@ -106,10 +105,9 @@ } // check if the network in use with running vm - clusters = DbFacade.getInstance().getVdsGroupDao().getAllForStoragePool(getStoragePool().getId()); + clusters = getVdsGroupDAO().getAllForStoragePool(getStoragePool().getId()); for (VDSGroup cluster : clusters) { - List<VmStatic> vms = DbFacade.getInstance().getVmStaticDao().getAllByGroupAndNetworkName(cluster.getId(), - getNetworkName()); + List<VmStatic> vms = getVmStaticDAO().getAllByGroupAndNetworkName(cluster.getId(), getNetworkName()); if (vms.size() > 0) { addCanDoActionMessage(VdcBllMessages.NETWORK_INTERFACE_IN_USE_BY_VM); return false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java index a6dcf03..29d0557 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java @@ -15,7 +15,6 @@ import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; import org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.NetworkUtils; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; @@ -65,7 +64,7 @@ if (retVal.getSucceeded()) { // set network status (this can change the network status to // operational) - VdsStatic vdsStatic = DbFacade.getInstance().getVdsStaticDao().get(params.getVdsId()); + VdsStatic vdsStatic = getDbFacade().getVdsStaticDao().get(params.getVdsId()); NetworkClusterHelper.setStatus(vdsStatic.getvds_group_id(), params .getNetwork()); setSucceeded(true); @@ -84,7 +83,7 @@ return failCanDoAction(VdcBllMessages.NETWORK_NOT_EXISTS); } - List<VdsNetworkInterface> interfaces = DbFacade.getInstance().getInterfaceDao().getAllInterfacesForVds( + List<VdsNetworkInterface> interfaces = getDbFacade().getInterfaceDao().getAllInterfacesForVds( getParameters().getVdsId()); // check that bond exists @@ -137,7 +136,7 @@ } // check that the network exists in current cluster - List<Network> networks = DbFacade.getInstance().getNetworkDao().getAllForCluster(getVds().getvds_group_id()); + List<Network> networks = getNetworkDAO().getAllForCluster(getVds().getvds_group_id()); if (null == LinqUtils.firstOrNull(networks, new Predicate<Network>() { @Override public boolean eval(Network network) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java index 09e64f5..f702c86 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java @@ -22,7 +22,6 @@ import org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.NetworkUtils; @SuppressWarnings("serial") @@ -49,7 +48,7 @@ nics.clear(); bond = params.getInterface().getName(); - List<VdsNetworkInterface> interfaces = DbFacade.getInstance().getInterfaceDao().getAllInterfacesForVds( + List<VdsNetworkInterface> interfaces = getDbFacade().getInterfaceDao().getAllInterfacesForVds( params.getVdsId()); for (VdsNetworkInterface i : interfaces) { @@ -80,7 +79,7 @@ new VdsIdAndVdsVDSCommandParametersBase(params.getVdsId())); if (retVal.getSucceeded()) { - Guid groupId = DbFacade.getInstance().getVdsDao().get(params.getVdsId()).getvds_group_id(); + Guid groupId = getVdsDAO().get(params.getVdsId()).getvds_group_id(); NetworkClusterHelper.setStatus(groupId, params.getNetwork()); setSucceeded(true); } @@ -90,8 +89,8 @@ @Override protected boolean canDoAction() { T params = getParameters(); - List<VdsNetworkInterface> interfaces = DbFacade.getInstance().getInterfaceDao() - .getAllInterfacesForVds(params.getVdsId()); + List<VdsNetworkInterface> interfaces = + getDbFacade().getInterfaceDao().getAllInterfacesForVds(params.getVdsId()); // check that interface exists VdsNetworkInterface iface = Entities.entitiesByName(interfaces).get(params.getInterface().getName()); @@ -124,8 +123,8 @@ // check that the network exists in current cluster - Map<String, Network> networksByName = Entities.entitiesByName(DbFacade.getInstance().getNetworkDao() - .getAllForCluster(getVds().getvds_group_id())); + Map<String, Network> networksByName = + Entities.entitiesByName(getNetworkDAO().getAllForCluster(getVds().getvds_group_id())); if (!networksByName.containsKey(params.getNetwork().getName())) { addCanDoActionMessage(VdcBllMessages.NETWORK_NOT_EXISTS_IN_CLUSTER); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/CommitNetworkChangesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/CommitNetworkChangesCommand.java index b81dc01..0d55647 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/CommitNetworkChangesCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/CommitNetworkChangesCommand.java @@ -7,7 +7,6 @@ import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; import org.ovirt.engine.core.common.vdscommands.VdsIdVDSCommandParametersBase; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; @SuppressWarnings("serial") public class CommitNetworkChangesCommand<T extends VdsActionParameters> extends VdsCommand<T> { @@ -24,7 +23,7 @@ new VdsIdVDSCommandParametersBase(getParameters().getVdsId())); getVds().setnet_config_dirty(false); - DbFacade.getInstance().getVdsDynamicDao().update(getVds().getDynamicData()); + getDbFacade().getVdsDynamicDao().update(getVds().getDynamicData()); setSucceeded(retVal.getSucceeded()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java index b5deca4..f4aa739 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java @@ -6,7 +6,6 @@ import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; import org.ovirt.engine.core.common.queries.GetAllChildVlanInterfacesQueryParameters; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.NetworkUtils; /** @@ -23,8 +22,8 @@ protected void executeQueryCommand() { java.util.ArrayList<VdsNetworkInterface> retVal = new java.util.ArrayList<VdsNetworkInterface>(); if (((VdsNetworkInterface) getParameters().getInterface()).getVlanId() != null) { - List<VdsNetworkInterface> vdsInterfaces = DbFacade.getInstance() - .getInterfaceDao().getAllInterfacesForVds(getParameters().getVdsId()); + List<VdsNetworkInterface> vdsInterfaces = + getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getVdsId()); for (int i = 0; i < vdsInterfaces.size(); i++) { if (vdsInterfaces.get(i).getVlanId() != null && !StringUtils.equals(getParameters().getInterface().getName(), vdsInterfaces.get(i) diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java index 93421c7..b7831fd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVlanParentQuery.java @@ -5,7 +5,6 @@ import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; import org.ovirt.engine.core.common.queries.GetAllChildVlanInterfacesQueryParameters; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.NetworkUtils; /** @@ -19,8 +18,8 @@ @Override protected void executeQueryCommand() { if (((VdsNetworkInterface) getParameters().getInterface()).getVlanId() != null) { - List<VdsNetworkInterface> vdsInterfaces = DbFacade.getInstance() - .getInterfaceDao().getAllInterfacesForVds(getParameters().getVdsId()); + List<VdsNetworkInterface> vdsInterfaces = + getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getVdsId()); for (int i = 0; i < vdsInterfaces.size(); i++) { if (NetworkUtils.interfaceBasedOn(getParameters().getInterface().getName(), vdsInterfaces.get(i).getName())) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java index 7c800f8..c94403a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java @@ -26,7 +26,6 @@ import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; import org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.NetworkUtils; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; @@ -45,8 +44,8 @@ @Override protected void executeCommand() { VdsNetworkInterface bond = null; - List<VdsNetworkInterface> all = DbFacade.getInstance().getInterfaceDao() - .getAllInterfacesForVds(getParameters().getVdsId()); + List<VdsNetworkInterface> all = + getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getVdsId()); for (VdsNetworkInterface iface : all) { if (StringUtils.equals(iface.getName(), getParameters().getBondName())) { bond = iface; @@ -88,7 +87,7 @@ @Override protected boolean canDoAction() { List<VdsNetworkInterface> vdsInterfaces = - DbFacade.getInstance().getInterfaceDao().getAllInterfacesForVds(getParameters().getVdsId()); + getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getVdsId()); // check that bond exists final VdsNetworkInterface bond = LinqUtils.firstOrNull(vdsInterfaces, new Predicate<VdsNetworkInterface>() { @@ -125,11 +124,10 @@ interfaces.add(iface.getName()); } - VDS vds = DbFacade.getInstance().getVdsDao().get(getParameters().getVdsId()); + VDS vds = getVdsDAO().get(getParameters().getVdsId()); // check if network in cluster and vds active if (vds.getstatus() == VDSStatus.Up || vds.getstatus() == VDSStatus.Installing) { - List<Network> networks = DbFacade.getInstance().getNetworkDao() - .getAllForCluster(vds.getvds_group_id()); + List<Network> networks = getNetworkDAO().getAllForCluster(vds.getvds_group_id()); if (null != LinqUtils.firstOrNull(networks, new Predicate<Network>() { @Override public boolean eval(Network n) { @@ -154,8 +152,7 @@ for (IVdcQueryable vm_helper : vmList) { VM vm = (VM) vm_helper; if (vm.getStatus() != VMStatus.Down) { - List<VmNetworkInterface> vmInterfaces = DbFacade.getInstance().getVmNetworkInterfaceDao() - .getAllForVm(vm.getId()); + List<VmNetworkInterface> vmInterfaces = getVmNetworkInterfaceDao().getAllForVm(vm.getId()); VmNetworkInterface iface = LinqUtils.firstOrNull(vmInterfaces, new Predicate<VmNetworkInterface>() { @Override public boolean eval(VmNetworkInterface i) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java index 311f37a..6d4b984 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java @@ -21,8 +21,6 @@ import org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.dao.InterfaceDAO; import org.ovirt.engine.core.utils.IPAddress; import org.ovirt.engine.core.utils.NetworkUtils; import org.ovirt.engine.core.utils.dns.Dns; @@ -144,7 +142,7 @@ @Override protected boolean canDoAction() { String ifaceGateway = null; - interfaces = getInterfaceDAO().getAllInterfacesForVds(getParameters().getVdsId()); + interfaces = getDbFacade().getInterfaceDao().getAllInterfacesForVds(getParameters().getVdsId()); // check that interface exists for (final VdsNetworkInterface i : getParameters().getInterfaces()) { @@ -245,9 +243,5 @@ public AuditLogType getAuditLogTypeValue() { return getSucceeded() ? AuditLogType.NETWORK_ATTACH_NETWORK_TO_VDS : AuditLogType.NETWORK_ATTACH_NETWORK_TO_VDS_FAILED; - } - - protected InterfaceDAO getInterfaceDAO() { - return DbFacade.getInstance().getInterfaceDao(); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/RemoveVmTemplateInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/RemoveVmTemplateInterfaceCommand.java index c1aef8b..0eac1f3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/RemoveVmTemplateInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/RemoveVmTemplateInterfaceCommand.java @@ -6,7 +6,6 @@ import org.ovirt.engine.core.common.businessentities.VmDeviceId; import org.ovirt.engine.core.common.businessentities.VmInterfaceType; import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; @SuppressWarnings("serial") public class RemoveVmTemplateInterfaceCommand<T extends RemoveVmTemplateInterfaceParameters> extends VmTemplateCommand<T> { @@ -22,8 +21,8 @@ AddCustomValue("InterfaceName", iface.getName()); AddCustomValue("InterfaceType", VmInterfaceType.forValue(iface.getType()).getDescription()); } - DbFacade.getInstance().getVmDeviceDao().remove( - new VmDeviceId(getParameters().getInterfaceId(), getParameters().getVmTemplateId())); + getDbFacade().getVmDeviceDao().remove(new VmDeviceId(getParameters().getInterfaceId(), + getParameters().getVmTemplateId())); getVmNetworkInterfaceDao().remove(getParameters().getInterfaceId()); setSucceeded(true); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java index 3b9d301..b42edb0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java @@ -10,7 +10,6 @@ import org.ovirt.engine.core.common.businessentities.VmInterfaceType; import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; import org.ovirt.engine.core.dal.VdcBllMessages; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; @@ -47,21 +46,20 @@ } // remove from db - DbFacade dbFacade = DbFacade.getInstance(); - dbFacade.getVmNetworkInterfaceDao().remove(getParameters().getInterfaceId()); - dbFacade.getVmNetworkStatisticsDao().remove(getParameters().getInterfaceId()); - dbFacade.getVmDeviceDao() - .remove(new VmDeviceId(getParameters().getInterfaceId(), getParameters().getVmId())); + getVmNetworkInterfaceDao().remove(getParameters().getInterfaceId()); + getDbFacade().getVmNetworkStatisticsDao().remove(getParameters().getInterfaceId()); + getDbFacade().getVmDeviceDao().remove(new VmDeviceId(getParameters().getInterfaceId(), + getParameters().getVmId())); setSucceeded(true); } @Override protected boolean canDoAction() { - VmDynamic vm = DbFacade.getInstance().getVmDynamicDao().get(getParameters().getVmId()); - if (vm.getstatus() != VMStatus.Down && DbFacade.getInstance() - .getVmDeviceDao() - .get(new VmDeviceId(getParameters().getInterfaceId(), getParameters().getVmId())) - .getIsPlugged()) { + VmDynamic vm = getVmDynamicDao().get(getParameters().getVmId()); + if (vm.getstatus() != VMStatus.Down + && getDbFacade().getVmDeviceDao() + .get(new VmDeviceId(getParameters().getInterfaceId(), getParameters().getVmId())) + .getIsPlugged()) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_CANNOT_REMOVE_ACTIVE_DEVICE); return false; } -- To view, visit http://gerrit.ovirt.org/10510 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01ad22a4e2450fee1e2b1cf26aff5af8d62c35ff 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
