Yevgeny Zaspitsky has uploaded a new change for review.
Change subject: engine | webadmin: Replace the call to deprecated
UpdateDisplayToVdsGroup command with AttachNetworkToVdsGroup one
......................................................................
engine | webadmin: Replace the call to deprecated UpdateDisplayToVdsGroup
command with AttachNetworkToVdsGroup one
1. Replace call to UpdateDisplayToVdsGroup command with
AttachNetworkToVdsGroup one in ClusterNetworkListModel.setDisplay()
method.
2. Remove deprecated UpdateDisplayToVdsGroup and the related command
class as those aren't in use anymore.
Change-Id: I9f103f0db10a06b0b2689298d3bfa505f4615577
Signed-off-by: Yevgeny Zaspitsky <yzasp...@redhat.com>
---
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateDisplayToVdsGroupCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java
3 files changed, 7 insertions(+), 74 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/26505/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateDisplayToVdsGroupCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateDisplayToVdsGroupCommand.java
deleted file mode 100644
index 69cd6c5..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateDisplayToVdsGroupCommand.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import java.util.List;
-
-import org.ovirt.engine.core.common.AuditLogType;
-import org.ovirt.engine.core.common.action.DisplayNetworkToVdsGroupParameters;
-import org.ovirt.engine.core.common.businessentities.network.NetworkCluster;
-import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-import org.ovirt.engine.core.utils.linq.LinqUtils;
-import org.ovirt.engine.core.utils.linq.Predicate;
-
-public class UpdateDisplayToVdsGroupCommand<T extends
DisplayNetworkToVdsGroupParameters> extends
- VdsGroupCommandBase<T> {
- private NetworkCluster _networkCluster;
- private List<NetworkCluster> _allNetworkCluster;
-
- public UpdateDisplayToVdsGroupCommand(T parameters) {
- super(parameters);
- }
-
- public String getNetworkName() {
- return getParameters().getNetwork().getName();
- }
-
- @Override
- protected void executeCommand() {
- NetworkCluster oldDisplay = LinqUtils.firstOrNull(_allNetworkCluster,
- new Predicate<NetworkCluster>() {
- @Override
- public boolean eval(NetworkCluster n) {
- return n.isDisplay();
- }
- });
- if (oldDisplay != null) {
- oldDisplay.setDisplay(false);
- DbFacade.getInstance().getNetworkClusterDao().update(oldDisplay);
- }
-
- _networkCluster.setDisplay(getParameters().getIsDisplay());
- DbFacade.getInstance().getNetworkClusterDao().update(_networkCluster);
-
- setSucceeded(true);
- }
-
- @Override
- protected boolean canDoAction() {
- _allNetworkCluster =
DbFacade.getInstance().getNetworkClusterDao().getAllForCluster(
- getParameters().getVdsGroupId());
- _networkCluster = LinqUtils.firstOrNull(_allNetworkCluster,
- new Predicate<NetworkCluster>() {
- @Override
- public boolean eval(NetworkCluster x) {
- return
x.getNetworkId().equals(getParameters().getNetwork().getId());
- }
- });
-
- return (_networkCluster != null);
- }
-
- @Override
- public AuditLogType getAuditLogTypeValue() {
- return getSucceeded() ?
AuditLogType.NETWORK_UPDATE_DISPLAY_TO_VDS_GROUP
- : AuditLogType.NETWORK_UPDATE_DISPLAY_TO_VDS_GROUP_FAILED;
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
index 2bd8d96..904c6c3 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
@@ -191,9 +191,6 @@
RemoveVdsGroup(706, ActionGroup.DELETE_CLUSTER, false,
QuotaDependency.NONE),
AttachNetworkToVdsGroup(708, ActionGroup.ASSIGN_CLUSTER_NETWORK, false,
QuotaDependency.NONE),
DetachNetworkToVdsGroup(709, ActionGroup.ASSIGN_CLUSTER_NETWORK, false,
QuotaDependency.NONE),
- @Deprecated
- // AttachNetworkToVdsGroup is taking over this functionality
- UpdateDisplayToVdsGroup(710, ActionGroup.EDIT_CLUSTER_CONFIGURATION,
false, QuotaDependency.NONE),
UpdateNetworkOnCluster(711, ActionGroup.CONFIGURE_CLUSTER_NETWORK, false,
QuotaDependency.NONE),
AttachNetworksToCluster(712, false, QuotaDependency.NONE),
DetachNetworksFromCluster(713, false, QuotaDependency.NONE),
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java
index 61a992c..3f84d3e 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java
@@ -5,7 +5,7 @@
import java.util.Collections;
import java.util.List;
-import org.ovirt.engine.core.common.action.DisplayNetworkToVdsGroupParameters;
+import org.ovirt.engine.core.common.action.AttachNetworkToVdsGroupParameter;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
@@ -140,12 +140,13 @@
Frontend.getInstance().runQuery(VdcQueryType.GetAllNetworksByClusterId,
tempVar, _asyncQuery);
}
- public void setAsDisplay()
- {
- Network network = (Network) getSelectedItem();
+ public void setAsDisplay() {
+ final Network network = (Network) Cloner.clone(getSelectedItem());
+ network.getCluster().setDisplay(true);
+ final AttachNetworkToVdsGroupParameter
attachNetworkToVdcGroupParameter =
+ new AttachNetworkToVdsGroupParameter(getEntity(), network);
-
Frontend.getInstance().runAction(VdcActionType.UpdateDisplayToVdsGroup, new
DisplayNetworkToVdsGroupParameters(getEntity(),
- network, true));
+
Frontend.getInstance().runAction(VdcActionType.AttachNetworkToVdsGroup,
attachNetworkToVdcGroupParameter);
}
public void manage() {
--
To view, visit http://gerrit.ovirt.org/26505
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f103f0db10a06b0b2689298d3bfa505f4615577
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yevgeny Zaspitsky <yzasp...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
