anmolbabu has uploaded a new change for review.
Change subject: engine : Vds Command for geo-rep session pause
......................................................................
engine : Vds Command for geo-rep session pause
Vds Command for geo-rep session pause
Change-Id: I6e34c69b43355b9d8b8305467508047f65aeb05a
Signed-off-by: Anmol Babu <anb...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
A
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeGeoRepPauseVDSParameters.java
M backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/AbstractGlusterBrokerCommand.java
A
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepPauseVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java
14 files changed, 92 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/32666/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
index 7eeaeb4..dfcde15 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
@@ -308,6 +308,8 @@
GLUSTER_VOLUME_PROFILE_START_FAILED(4023, AuditLogSeverity.ERROR),
GLUSTER_VOLUME_PROFILE_STOP(4024),
GLUSTER_VOLUME_PROFILE_STOP_FAILED(4025, AuditLogSeverity.ERROR),
+ GLUSTER_VOLUME_GEO_REP_PAUSE(4596),
+ GLUSTER_VOLUME_GEO_REP_PAUSE_FAILED_EXCEPTION(4597,
AuditLogSeverity.ERROR),
GLUSTER_VOLUME_CREATED_FROM_CLI(4026, AuditLogSeverity.WARNING),
GLUSTER_VOLUME_DELETED_FROM_CLI(4027, AuditLogSeverity.WARNING),
GLUSTER_VOLUME_OPTION_SET_FROM_CLI(4028, AuditLogSeverity.WARNING),
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 0031b1a..c077439 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
@@ -300,6 +300,7 @@
StopRemoveGlusterVolumeBricks(1423, ActionGroup.MANIPULATE_GLUSTER_VOLUME,
false, QuotaDependency.NONE),
CommitRemoveGlusterVolumeBricks(1424,
ActionGroup.MANIPULATE_GLUSTER_VOLUME, false, QuotaDependency.NONE),
RefreshGlusterVolumeDetails(1425, ActionGroup.MANIPULATE_GLUSTER_VOLUME,
QuotaDependency.NONE),
+ GlusterVolumeGeoRepPause(1426, ActionGroup.MANIPULATE_GLUSTER_VOLUME,
QuotaDependency.NONE),
// Scheduling Policy
AddClusterPolicy(1450, ActionGroup.EDIT_STORAGE_POOL_CONFIGURATION, false,
QuotaDependency.NONE),
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
index 4c7629d..8cbe580 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
@@ -401,6 +401,7 @@
GlfsStatvfsException(4571),
GlfsInitException(4572),
GlfsFiniException(4573),
+ GlusterVolumeGeoRepPauseFailed(4574),
UnicodeArgumentException(4900),
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
index f8252aa..dc6f309 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
@@ -88,6 +88,7 @@
VAR__ACTION__LOGON,
VAR__ACTION__LOGOFF,
VAR__ACTION__REBALANCE_START,
+ VAR_ACTION_GLUSTER_VOLUME_GEO_REP_PAUSE,
VAR__ACTION__REBALANCE_STOP,
VAR__ACTION__REMOVE_BRICKS_START,
VAR__ACTION__ASSIGN,
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
index 6a055cc..364adef 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
@@ -139,6 +139,7 @@
GlusterServersList("org.ovirt.engine.core.vdsbroker.gluster"),
StartGlusterVolumeProfile("org.ovirt.engine.core.vdsbroker.gluster"),
StopGlusterVolumeProfile("org.ovirt.engine.core.vdsbroker.gluster"),
+ GlusterVolumeGeoRepPause("org.ovirt.engine.core.vdsbroker.gluster"),
GetGlusterVolumeAdvancedDetails("org.ovirt.engine.core.vdsbroker.gluster"),
GlusterVolumesList("org.ovirt.engine.core.vdsbroker.gluster"),
GetGlusterVolumeProfileInfo("org.ovirt.engine.core.vdsbroker.gluster"),
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeGeoRepPauseVDSParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeGeoRepPauseVDSParameters.java
new file mode 100644
index 0000000..f6f0a6e
--- /dev/null
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeGeoRepPauseVDSParameters.java
@@ -0,0 +1,45 @@
+package org.ovirt.engine.core.common.vdscommands.gluster;
+
+import org.ovirt.engine.core.compat.Guid;
+
+public class GlusterVolumeGeoRepPauseVDSParameters extends
GlusterVolumeVDSParameters {
+
+ String remoteHost;
+ String remoteVolumeName;
+ boolean force;
+
+ public GlusterVolumeGeoRepPauseVDSParameters() {
+ super();
+ }
+
+ public GlusterVolumeGeoRepPauseVDSParameters(Guid serverId, String
volumeName, String remoteHost, String remoteVolumeName, boolean force) {
+ super(serverId, volumeName);
+ this.remoteHost = remoteHost;
+ this.remoteVolumeName = remoteVolumeName;
+ this.force = force;
+ }
+
+ public String getRemoteHost() {
+ return remoteHost;
+ }
+
+ public void setRemoteHost(String remoteHost) {
+ this.remoteHost = remoteHost;
+ }
+
+ public String getRemoteVolumeName() {
+ return remoteVolumeName;
+ }
+
+ public void setRemoteVolumeName(String remoteVolumeName) {
+ this.remoteVolumeName = remoteVolumeName;
+ }
+
+ public boolean isForce() {
+ return force;
+ }
+
+ public void setForce(boolean force) {
+ this.force = force;
+ }
+}
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
index e2d4509..d7e21fa 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
@@ -348,6 +348,7 @@
GlusterVolumeRemoveBricksCommitFailed=Failed to commit removal of Bricks from
Gluster Volume
GlusterVolumeProfileStartFailed=Gluster Volume Profile Start Failed
GlusterVolumeProfileStopFailed=Gluster Volume Profile Stop Failed
+GlusterVolumeGeoRepPauseFailed=Gluster Volume geo-replication pause failed
GlusterAddHostFailed=Gluster Server Add Failed
GlusterHostRemoveFailedException=Gluster Host Remove Failed
GlusterHostIsNotPartOfCluster=Host is not part of the cluster
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/AbstractGlusterBrokerCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/AbstractGlusterBrokerCommand.java
index 2b2d573..ad63568 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/AbstractGlusterBrokerCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/AbstractGlusterBrokerCommand.java
@@ -37,6 +37,7 @@
case GlusterVolumeResetOptionsFailed:
case GlusterVolumeRemoveBricksFailed:
case GlusterVolumeProfileStartFailed:
+ case GlusterVolumeGeoRepPauseFailed:
case GlusterVolumeProfileStopFailed:
case GlusterAddHostFailed:
case GlusterHostRemoveFailedException:
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepPauseVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepPauseVDSCommand.java
new file mode 100644
index 0000000..0ddebe7
--- /dev/null
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepPauseVDSCommand.java
@@ -0,0 +1,17 @@
+package org.ovirt.engine.core.vdsbroker.gluster;
+
+import
org.ovirt.engine.core.common.vdscommands.gluster.GlusterVolumeGeoRepPauseVDSParameters;
+
+public class GlusterVolumeGeoRepPauseVDSCommand extends
AbstractGlusterBrokerCommand<GlusterVolumeGeoRepPauseVDSParameters> {
+
+ public
GlusterVolumeGeoRepPauseVDSCommand(GlusterVolumeGeoRepPauseVDSParameters
parameters) {
+ super(parameters);
+ }
+
+ @Override
+ protected void executeVdsBrokerCommand() {
+ GlusterVolumeGeoRepPauseVDSParameters parameters = getParameters();
+ status =
getBroker().glusterVolumeGeoRepPause(parameters.getVolumeName(),
parameters.getRemoteHost(), parameters.getRemoteVolumeName(),
parameters.isForce());
+ proceedProxyReturnValue();
+ }
+}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
index bbba12b..f4ef3f7 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
@@ -1201,6 +1201,13 @@
}
@Override
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepPause(String
masterVolumeName, String slaveHost, String slaveVolumeName, boolean force) {
+ JsonRpcRequest request = new
RequestBuilder("GlusterVolume.geoRepPause").withParameter("volumeName",
masterVolumeName).withParameter("remoteHost",
slaveHost).withParameter("remoteVolumeName",
slaveVolumeName).withParameter("force", force).build();
+ Map<String, Object> response = new FutureMap(this.client, request);
+ return new StatusOnlyReturnForXmlRpc(response);
+ }
+
+ @Override
public GlusterVolumeStatusReturnForXmlRpc glusterVolumeStatus(Guid
clusterId,
String volumeName,
String brickName,
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
index ff27a06..4b254ce 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
@@ -265,6 +265,8 @@
StatusOnlyReturnForXmlRpc glusterVolumeProfileStop(String volumeName);
+ StatusOnlyReturnForXmlRpc glusterVolumeGeoRepPause(String
masterVolumeName, String slaveHost, String slaveVolumeName, boolean force);
+
GlusterVolumeStatusReturnForXmlRpc glusterVolumeStatus(Guid clusterId,
String volumeName,
String brickName,
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java
index c937834..60cab1e 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java
@@ -259,6 +259,8 @@
public Map<String, Object> glusterVolumeProfileStop(String volumeName);
+ public Map<String, Object> glusterVolumeGeoRepPause(String
masterVolumeName, String slaveHost, String slaveVolumeName, boolean force);
+
public Map<String, Object> glusterVolumeStatus(String volumeName, String
brickName, String volumeStatusOption);
public Map<String, Object> glusterVolumeProfileInfo(String volumeName,
boolean nfs);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
index 82e28e0..c2d1a26 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
@@ -1189,6 +1189,14 @@
}
}
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepPause(String
masterVolumeName, String slaveHost, String slaveVolumeName, boolean force) {
+ try {
+ return new
StatusOnlyReturnForXmlRpc(vdsServer.glusterVolumeGeoRepPause(masterVolumeName,
slaveHost, slaveVolumeName, force));
+ } catch (UndeclaredThrowableException ute) {
+ throw new XmlRpcRunTimeException(ute);
+ }
+ }
+
@Override
public GlusterVolumeStatusReturnForXmlRpc glusterVolumeStatus(Guid
clusterId,
String volumeName, String brickName, String volumeStatusOption) {
diff --git
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java
index 04cc904..f05cb80 100644
---
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java
+++
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java
@@ -735,6 +735,9 @@
@DefaultStringValue("Gluster Volume Profile Stop Failed.")
String GlusterVolumeProfileStopFailed();
+ @DefaultStringValue("Gluster Volume geo-replication pause failed")
+ String GlusterVolumeGeoRepPauseFailed();
+
String ACTIVATE_NIC_FAILED();
String DEACTIVATE_NIC_FAILED();
--
To view, visit http://gerrit.ovirt.org/32666
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e34c69b43355b9d8b8305467508047f65aeb05a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: anmolbabu <anb...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
