Moti Asayag has uploaded a new change for review.
Change subject: engine: Cleanup network commands
......................................................................
engine: Cleanup network commands
Avoid static access to DbFacade instance.
Change-Id: Idc02f4024b3c33cee5260bb82b03c25236a3830a
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateInterfaceCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmInterfaceCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateInterfaceCommand.java
4 files changed, 23 insertions(+), 41 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/9546/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java
index a3e172f..ef47529 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java
@@ -29,7 +29,6 @@
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.Regex;
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.linq.LinqUtils;
@@ -55,7 +54,7 @@
protected void executeVmCommand() {
AddCustomValue("InterfaceType",
(VmInterfaceType.forValue(getParameters().getInterface().getType()).getDescription()).toString());
-
this.setVmName(DbFacade.getInstance().getVmStaticDao().get(getParameters().getVmId()).getvm_name());
+
this.setVmName(getVmStaticDAO().get(getParameters().getVmId()).getvm_name());
if (StringUtils.isEmpty(getMacAddress())) {
getParameters().getInterface().setMacAddress(MacPoolManager.getInstance().allocateNewMac());
}
@@ -92,12 +91,10 @@
}
private void addInterfaceToDb(VmNetworkInterface vmNetworkInterface) {
- DbFacade dbFacade = DbFacade.getInstance();
-
- dbFacade.getVmNetworkInterfaceDao().save(vmNetworkInterface);
+ getVmNetworkInterfaceDao().save(vmNetworkInterface);
getCompensationContext().snapshotNewEntity(vmNetworkInterface);
-
dbFacade.getVmNetworkStatisticsDao().save(vmNetworkInterface.getStatistics());
+
getDbFacade().getVmNetworkStatisticsDao().save(vmNetworkInterface.getStatistics());
getCompensationContext().snapshotNewEntity(vmNetworkInterface.getStatistics());
}
@@ -128,7 +125,7 @@
return false;
}
- switch
(DbFacade.getInstance().getVmDynamicDao().get(getParameters().getVmId()).getstatus())
{
+ switch (getVmDynamicDao().get(getParameters().getVmId()).getstatus()) {
case Up:
case Down:
case ImageLocked:
@@ -138,8 +135,7 @@
return false;
}
- List<VmNetworkInterface> interfaces =
DbFacade.getInstance().getVmNetworkInterfaceDao()
- .getAllForVm(getParameters().getVmId());
+ List<VmNetworkInterface> interfaces =
getVmNetworkInterfaceDao().getAllForVm(getParameters().getVmId());
if (!VmHandler.IsNotDuplicateInterfaceName(interfaces,
getParameters().getInterface().getName(),
@@ -156,7 +152,7 @@
List<VmNetworkInterface> allInterfaces = new
ArrayList<VmNetworkInterface>(interfaces);
allInterfaces.add(getParameters().getInterface());
- List<Disk> allDisks =
DbFacade.getInstance().getDiskDao().getAllForVm(getParameters().getVmId());
+ List<Disk> allDisks =
getDiskDao().getAllForVm(getParameters().getVmId());
if (!checkPciAndIdeLimit(vm.getnum_of_monitors(), allInterfaces,
allDisks, getReturnValue().getCanDoActionMessages())) {
return false;
}
@@ -174,7 +170,7 @@
}
// check that the exists in current cluster
- List<Network> networks =
DbFacade.getInstance().getNetworkDao().getAllForCluster(vm.getvds_group_id());
+ List<Network> networks =
getNetworkDAO().getAllForCluster(vm.getvds_group_id());
Network interfaceNetwork = LinqUtils.firstOrNull(networks, new
Predicate<Network>() {
@Override
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateInterfaceCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateInterfaceCommand.java
index 39ed8e8..97c58d2 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateInterfaceCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateInterfaceCommand.java
@@ -18,7 +18,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.dal.dbbroker.auditloghandling.CustomLogField;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields;
import org.ovirt.engine.core.utils.linq.LinqUtils;
@@ -43,10 +42,7 @@
VmInterfaceType.forValue(
getParameters().getInterface().getType()).getSpeed());
- DbFacade.getInstance()
- .getVmNetworkInterfaceDao()
- .save(getParameters().getInterface());
- //
\\DbFacade.Instance.addInterfaceStatistics(AddVmTemplateInterfaceParameters.Interface.InterfaceStatistics);
+ getVmNetworkInterfaceDao().save(getParameters().getInterface());
VmDeviceUtils.addNetworkInterfaceDevice(
new VmDeviceId(getParameters().getInterface().getId(),
getParameters().getVmTemplateId()),
@@ -57,8 +53,8 @@
@Override
protected boolean canDoAction() {
- List<VmNetworkInterface> interfaces =
DbFacade.getInstance().getVmNetworkInterfaceDao()
- .getAllForTemplate(getParameters().getVmTemplateId());
+ List<VmNetworkInterface> interfaces =
+
getVmNetworkInterfaceDao().getAllForTemplate(getParameters().getVmTemplateId());
if (!VmHandler.IsNotDuplicateInterfaceName(interfaces,
getParameters().getInterface().getName(),
getReturnValue().getCanDoActionMessages())) {
@@ -85,7 +81,7 @@
}
// check that the network exists in current cluster
- List<Network> networks =
DbFacade.getInstance().getNetworkDao().getAllForCluster(getVmTemplate().getvds_group_id());
+ List<Network> networks =
getNetworkDAO().getAllForCluster(getVmTemplate().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/UpdateVmInterfaceCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmInterfaceCommand.java
index c6a705a..3c8a16b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmInterfaceCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmInterfaceCommand.java
@@ -21,7 +21,6 @@
import org.ovirt.engine.core.common.validation.group.UpdateVmNic;
import org.ovirt.engine.core.compat.Regex;
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.linq.LinqUtils;
@@ -49,15 +48,13 @@
@Override
protected void executeVmCommand() {
AddCustomValue("InterfaceType",
(VmInterfaceType.forValue(getParameters().getInterface().getType()).getDescription()).toString());
-
this.setVmName(DbFacade.getInstance().getVmStaticDao().get(getParameters().getVmId()).getvm_name());
+
this.setVmName(getVmStaticDAO().get(getParameters().getVmId()).getvm_name());
getParameters().getInterface().setSpeed(
VmInterfaceType.forValue(
getParameters().getInterface().getType()).getSpeed());
- DbFacade.getInstance()
- .getVmNetworkInterfaceDao()
- .update(getParameters().getInterface());
+ getVmNetworkInterfaceDao().update(getParameters().getInterface());
if (macAddressChanged) {
MacPoolManager.getInstance().freeMac(oldIface.getMacAddress());
@@ -85,14 +82,13 @@
@Override
protected boolean canDoAction() {
- VmDynamic vmDynamic =
DbFacade.getInstance().getVmDynamicDao().get(getParameters().getVmId());
+ VmDynamic vmDynamic = getVmDynamicDao().get(getParameters().getVmId());
if (vmDynamic.getstatus() != VMStatus.Down) {
addCanDoActionMessage(VdcBllMessages.NETWORK_CANNOT_CHANGE_STATUS_WHEN_NOT_DOWN);
return false;
}
- List<VmNetworkInterface> interfaces =
DbFacade.getInstance().getVmNetworkInterfaceDao()
- .getAllForVm(getParameters().getVmId());
+ List<VmNetworkInterface> interfaces =
getVmNetworkInterfaceDao().getAllForVm(getParameters().getVmId());
oldIface = LinqUtils.firstOrNull(interfaces, new
Predicate<VmNetworkInterface>() {
@Override
public boolean eval(VmNetworkInterface i) {
@@ -117,9 +113,9 @@
java.util.ArrayList<VmNetworkInterface> allInterfaces = new
java.util.ArrayList<VmNetworkInterface>(interfaces);
allInterfaces.remove(oldIface);
allInterfaces.add(getParameters().getInterface());
- VmStatic vm =
DbFacade.getInstance().getVmStaticDao().get(getParameters().getVmId());
+ VmStatic vm = getVmStaticDAO().get(getParameters().getVmId());
- List<Disk> allDisks =
DbFacade.getInstance().getDiskDao().getAllForVm(getParameters().getVmId());
+ List<Disk> allDisks =
getDiskDao().getAllForVm(getParameters().getVmId());
if (!checkPciAndIdeLimit(vm.getnum_of_monitors(), allInterfaces,
allDisks, getReturnValue().getCanDoActionMessages())) {
addCanDoActionMessage(VdcBllMessages.VAR__ACTION__UPDATE);
addCanDoActionMessage(VdcBllMessages.VAR__TYPE__INTERFACE);
@@ -146,8 +142,7 @@
}
// check that the exists in current cluster
- List<Network> networks = DbFacade.getInstance().getNetworkDao()
- .getAllForCluster(vm.getvds_group_id());
+ List<Network> networks =
getNetworkDAO().getAllForCluster(vm.getvds_group_id());
if (null == LinqUtils.firstOrNull(networks, new Predicate<Network>() {
@Override
public boolean eval(Network n) {
@@ -208,8 +203,7 @@
if (getParameters().getInterface() != null &&
StringUtils.isNotEmpty(getNetworkName()) && getVm() != null) {
- VmNetworkInterface iface =
-
getDbFacade().getVmNetworkInterfaceDao().get(getParameters().getInterface().getId());
+ VmNetworkInterface iface =
getVmNetworkInterfaceDao().get(getParameters().getInterface().getId());
if (iface != null) {
Network network =
getNetworkDAO().getByNameAndCluster(getNetworkName(),
getVm().getvds_group_id());
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 71e603b..60cd920 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
@@ -14,7 +14,6 @@
import org.ovirt.engine.core.common.validation.group.UpdateEntity;
import org.ovirt.engine.core.compat.StringHelper;
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.linq.LinqUtils;
@@ -33,9 +32,7 @@
@Override
protected void executeCommand() {
AddCustomValue("InterfaceType",
(VmInterfaceType.forValue(getParameters().getInterface().getType()).getDescription()).toString());
- DbFacade.getInstance()
- .getVmNetworkInterfaceDao()
- .update(getParameters().getInterface());
+ getVmNetworkInterfaceDao().update(getParameters().getInterface());
setSucceeded(true);
}
@@ -46,8 +43,8 @@
return false;
}
- List<VmNetworkInterface> interfaces =
DbFacade.getInstance().getVmNetworkInterfaceDao()
- .getAllForTemplate(getParameters().getVmTemplateId());
+ List<VmNetworkInterface> interfaces =
+
getVmNetworkInterfaceDao().getAllForTemplate(getParameters().getVmTemplateId());
if (getVmTemplate() == null) {
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_TEMPLATE_DOES_NOT_EXIST);
@@ -103,8 +100,7 @@
if (getParameters().getInterface() != null &&
StringUtils.isNotEmpty(getNetworkName())
&& getVmTemplate() != null) {
- VmNetworkInterface iface =
-
getDbFacade().getVmNetworkInterfaceDao().get(getParameters().getInterface().getId());
+ VmNetworkInterface iface =
getVmNetworkInterfaceDao().get(getParameters().getInterface().getId());
if (iface != null) {
Network network =
getNetworkDAO().getByNameAndCluster(getNetworkName(),
getVmTemplate().getvds_group_id());
--
To view, visit http://gerrit.ovirt.org/9546
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc02f4024b3c33cee5260bb82b03c25236a3830a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
