anmolbabu has uploaded a new change for review. Change subject: engine, webadmin: use slave host id instead of slave host name ......................................................................
engine, webadmin: use slave host id instead of slave host name Change-Id: I4440eddbc2616c7ca89feaae3ba0e67d93562213 Signed-off-by: Anmol Babu <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GeoRepSessionCommandBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeGeoRepSessionParameters.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeGeoRepCreateModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepListModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoRepCreateSessionPopupView.java 7 files changed, 42 insertions(+), 37 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/39868/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommand.java index c59a2f7..475f185 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommand.java @@ -71,7 +71,7 @@ } GlusterGeoRepSession geoRepSession = getGeoRepDao().getGeoRepSession(getGlusterVolumeId(), - getParameters().getSlaveHost(), + getSlaveHost().getHostName(), getParameters().getSlaveVolumeName()); if (geoRepSession != null) { return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_GLUSTER_GEOREP_SESSION_ALREADY_CREATED); @@ -89,7 +89,7 @@ } protected VDS getSlaveHost() { - return getVdsDAO().getByName(getParameters().getSlaveHost()); + return getVdsDAO().get(getParameters().getSlaveHostId()); } private boolean areAllRemoteServersUp() { @@ -205,7 +205,7 @@ GlusterVolumeGeoRepSessionVDSParameters params = new GlusterVolumeGeoRepSessionVDSParameters(upServer.getId(), getGlusterVolumeName(), - getParameters().getSlaveHost(), + getSlaveHost().getHostName(), getParameters().getSlaveVolumeName(), getParameters().getUserName(), getParameters().isForce()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GeoRepSessionCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GeoRepSessionCommandBase.java index e9b91d2..4fc0743 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GeoRepSessionCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GeoRepSessionCommandBase.java @@ -59,7 +59,7 @@ } else { geoRepSession = getGlusterGeoRepDao().getGeoRepSession(getGlusterVolumeId(), - getParameters().getSlaveHost(), + getVdsDAO().get(getParameters().getSlaveHostId()).getName(), getParameters().getSlaveVolumeName()); } } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommandTest.java index 00ef83e..27b5df3 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeGeoRepSessionCommandTest.java @@ -71,7 +71,7 @@ command = spy(new CreateGlusterVolumeGeoRepSessionCommand(new GlusterVolumeGeoRepSessionParameters(masterVolumeId, slaveVolumeName, - slaveHost, + Guid.newGuid(), null, null, false))); @@ -100,7 +100,7 @@ command = spy(new CreateGlusterVolumeGeoRepSessionCommand(new GlusterVolumeGeoRepSessionParameters(masterVolumeId, slaveVolumeName, - slaveHost, + Guid.newGuid(), null, null, false))); @@ -117,7 +117,7 @@ command = spy(new CreateGlusterVolumeGeoRepSessionCommand(new GlusterVolumeGeoRepSessionParameters(masterVolumeId, slaveVolumeName, - slaveHost, + Guid.newGuid(), null, null, false))); @@ -136,7 +136,7 @@ command = spy(new CreateGlusterVolumeGeoRepSessionCommand(new GlusterVolumeGeoRepSessionParameters(Guid.newGuid(), slaveVolumeName, - slaveHost, + Guid.newGuid(), null, null, false))); @@ -154,7 +154,7 @@ command = spy(new CreateGlusterVolumeGeoRepSessionCommand(new GlusterVolumeGeoRepSessionParameters(masterVolumeId, slaveVolumeName, - slaveHost, + Guid.newGuid(), null, null, false))); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeGeoRepSessionParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeGeoRepSessionParameters.java index eced882..f7e7043 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeGeoRepSessionParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeGeoRepSessionParameters.java @@ -8,7 +8,7 @@ private Guid geoRepSessionId; private String slaveVolumeName; - private String slaveHost; + private Guid slaveHostId; private String userName; private String userGroup; private boolean force; @@ -22,29 +22,29 @@ this.geoRepSessionId = geoRepSessionId; } - public GlusterVolumeGeoRepSessionParameters(Guid volumeId, String slaveVolumeName, String slaveHost) { - this(volumeId, slaveVolumeName, slaveHost, "root", null, false); + public GlusterVolumeGeoRepSessionParameters(Guid volumeId, String slaveVolumeName, Guid slaveHostId) { + this(volumeId, slaveVolumeName, slaveHostId, "root", null, false); } public GlusterVolumeGeoRepSessionParameters(Guid volumeId, String slaveVolumeName, - String slaveHost, + Guid slaveHostId, String userName, String userGroup, boolean force) { super(volumeId); this.slaveVolumeName = slaveVolumeName; - this.slaveHost = slaveHost; + this.slaveHostId = slaveHostId; this.userName = userName; this.userGroup = userGroup; this.force = force; } public GlusterVolumeGeoRepSessionParameters(Guid volumeId, String slaveVolumeName, - String slaveHost, + Guid slaveHostId, String userName, String userGroup) { - this(volumeId, slaveVolumeName, slaveHost, userName, userGroup, false); + this(volumeId, slaveVolumeName, slaveHostId, userName, userGroup, false); } public String getSlaveVolumeName() { @@ -55,12 +55,12 @@ this.slaveVolumeName = slaveVolumeName; } - public String getSlaveHost() { - return slaveHost; + public Guid getSlaveHostId() { + return slaveHostId; } - public void setSlaveHost(String slaveHost) { - this.slaveHost = slaveHost; + public void setSlaveHostId(Guid slaveHostId) { + this.slaveHostId = slaveHostId; } public boolean isForce() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeGeoRepCreateModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeGeoRepCreateModel.java index c6012b8..8feb76d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeGeoRepCreateModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeGeoRepCreateModel.java @@ -14,6 +14,8 @@ import org.ovirt.engine.core.common.queries.SearchParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; +import org.ovirt.engine.core.common.utils.Pair; +import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; @@ -40,7 +42,7 @@ private EntityModel<String> slaveUserName; private ListModel<GlusterVolumeEntity> slaveVolumes; private ListModel<String> slaveClusters; - private ListModel<String> slaveHosts; + private ListModel<Pair<String, Guid>> slaveHosts; private EntityModel<Boolean> startSession; private String queryFailureMessage; private Collection<GlusterVolumeEntity> volumeList = new ArrayList<GlusterVolumeEntity>(); @@ -90,7 +92,7 @@ @Override public void eventRaised(Event<? extends EventArgs> ev, Object sender, EventArgs args) { GlusterVolumeEntity selectedSlaveVolume = getSlaveVolumes().getSelectedItem(); - Set<String> hostsInCurrentVolume = new HashSet<String>(); + Set<Pair<String, Guid>> hostsInCurrentVolume = new HashSet<Pair<String, Guid>>(); if (!getShowEligibleVolumes().getEntity() && selectedSlaveVolume != null) { updateRecommendatonViolations(); } @@ -171,10 +173,10 @@ return volumesInCurrentCluster; } - public Set<String> getHostNamesForVolume(GlusterVolumeEntity volume) { - Set<String> hosts = new HashSet<String>(); + public Set<Pair<String, Guid>> getHostNamesForVolume(GlusterVolumeEntity volume) { + Set<Pair<String, Guid>> hosts = new HashSet<Pair<String, Guid>>(); for(GlusterBrickEntity currentBrick : volume.getBricks()) { - hosts.add(currentBrick.getServerName()); + hosts.add(new Pair<>(currentBrick.getServerName(), currentBrick.getServerId())); } return hosts; } @@ -187,11 +189,11 @@ this.slaveClusters = slaveClusters; } - public ListModel<String> getSlaveHosts() { + public ListModel<Pair<String, Guid>> getSlaveHosts() { return slaveHosts; } - public void setSlaveHosts(ListModel<String> slaveHosts) { + public void setSlaveHosts(ListModel<Pair<String, Guid>> slaveHosts) { this.slaveHosts = slaveHosts; } @@ -212,7 +214,7 @@ setShowEligibleVolumes(new EntityModel<Boolean>()); setSlaveClusters(new ListModel<String>()); setSlaveVolumes(new ListModel<GlusterVolumeEntity>()); - setSlaveHosts(new ListModel<String>()); + setSlaveHosts(new ListModel<Pair<String, Guid>>()); setStartSession(new EntityModel<Boolean>()); setSlaveUserName(new EntityModel<String>(constants.emptyString())); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepListModel.java index ff699de..2fa4d26 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepListModel.java @@ -380,13 +380,14 @@ createModel.startProgress(null); final Guid masterVolumeId = getEntity().getId(); final String remoteVolumeName = createModel.getSlaveVolumes().getSelectedItem().getName(); - final String remoteHostName = createModel.getSlaveHosts().getSelectedItem(); + final String remoteHostName = createModel.getSlaveHosts().getSelectedItem().getFirst(); String remoteUserName = createModel.getSlaveUserName().getEntity(); String remoteUserGroup = createModel.getSlaveUserGroupName().getEntity(); + final Guid remoteHostId = createModel.getSlaveHosts().getSelectedItem().getSecond(); Frontend.getInstance().runAction(VdcActionType.CreateGlusterVolumeGeoRepSession, new GlusterVolumeGeoRepSessionParameters(masterVolumeId, remoteVolumeName, - remoteHostName, + remoteHostId , remoteUserName, remoteUserGroup, !createModel.getShowEligibleVolumes().getEntity()), @@ -403,7 +404,7 @@ Frontend.getInstance().runAction(VdcActionType.StartGlusterVolumeGeoRep, new GlusterVolumeGeoRepSessionParameters(masterVolumeId, remoteVolumeName, - remoteHostName), + remoteHostId), new IFrontendActionAsyncCallback() { @Override public void executed(FrontendActionAsyncResult result) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoRepCreateSessionPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoRepCreateSessionPopupView.java index 3f45a9c..6ada693 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoRepCreateSessionPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoRepCreateSessionPopupView.java @@ -1,6 +1,8 @@ package org.ovirt.engine.ui.webadmin.section.main.view.popup.gluster; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; +import org.ovirt.engine.core.common.utils.Pair; +import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.ui.common.CommonApplicationTemplates; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; import org.ovirt.engine.ui.common.idhandler.WithElementId; @@ -53,7 +55,7 @@ @UiField(provided = true) @Path(value = "slaveHosts.selectedItem") @WithElementId - ListModelTypeAheadListBoxEditor<String> slaveHostIpEditor; + ListModelTypeAheadListBoxEditor<Pair<String, Guid>> slaveHostIpEditor; @UiField(provided = true) @Path(value = "slaveVolumes.selectedItem") @@ -129,16 +131,16 @@ } }); - slaveHostIpEditor = new ListModelTypeAheadListBoxEditor<String>(new ListModelTypeAheadListBoxEditor.NullSafeSuggestBoxRenderer<String>() { + slaveHostIpEditor = new ListModelTypeAheadListBoxEditor<Pair<String, Guid>>(new ListModelTypeAheadListBoxEditor.NullSafeSuggestBoxRenderer<Pair<String, Guid>>() { @Override - public String getReplacementStringNullSafe(String data) { - return data; + public String getReplacementStringNullSafe(Pair<String, Guid> data) { + return data.getFirst(); } @Override - public String getDisplayStringNullSafe(String data) { - return templates.typeAheadNameDescription(data == null ? constants.empty() : data, constants.empty()).asString(); + public String getDisplayStringNullSafe(Pair<String, Guid> data) { + return templates.typeAheadNameDescription(data == null ? constants.empty() : data.getFirst(), constants.empty()).asString(); } }); -- To view, visit https://gerrit.ovirt.org/39868 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4440eddbc2616c7ca89feaae3ba0e67d93562213 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: anmolbabu <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
