Sahina Bose has uploaded a new change for review.
Change subject: engine: Added username to geo-rep commands
......................................................................
engine: Added username to geo-rep commands
To support non-root geo-rep session management
Change-Id: I3fcdc7c29abb88916eacc048f2708ea68540134a
Signed-off-by: Sahina Bose <sab...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/DeleteGeoRepSessionCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/PauseGlusterVolumeGeoRepSessionCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResetDefaultGeoRepConfigCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResumeGeoRepSessionCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SetGeoRepConfigCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeGeoRepCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopGeoRepSessionCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeGeoRepConfigVdsParameters.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/DeleteGlusterVolumeGeoRepSessionVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepConfigListVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionListVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionStatusVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/PauseGlusterVolumeGeoRepSessionVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResumeGeoRepSessionVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/SetGlusterVolumeGeoRepConfigDefaultVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/SetGlusterVolumeGeoRepConfigVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartGlusterVolumeGeoRepVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopGlusterVolumeGeoRepSessionVDSCommand.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
22 files changed, 370 insertions(+), 141 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/55/40455/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/DeleteGeoRepSessionCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/DeleteGeoRepSessionCommand.java
index 573335a..4d732e3 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/DeleteGeoRepSessionCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/DeleteGeoRepSessionCommand.java
@@ -40,7 +40,7 @@
VDSCommandType.DeleteGlusterVolumeGeoRepSession,
new
GlusterVolumeGeoRepSessionVDSParameters(upServer.getId(),
getGeoRepSession().getMasterVolumeName(),
getGeoRepSession().getSlaveHostName(),
- getGeoRepSession().getSlaveVolumeName()));
+ getGeoRepSession().getSlaveVolumeName(),
getGeoRepSession().getUserName()));
setSucceeded(returnValue.getSucceeded());
if (getSucceeded()) {
getGlusterGeoRepDao().remove(getGeoRepSession().getId());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/PauseGlusterVolumeGeoRepSessionCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/PauseGlusterVolumeGeoRepSessionCommand.java
index 1ab00a1..3a70759 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/PauseGlusterVolumeGeoRepSessionCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/PauseGlusterVolumeGeoRepSessionCommand.java
@@ -46,6 +46,7 @@
session.getMasterVolumeName(),
session.getSlaveHostName(),
session.getSlaveVolumeName(),
+ session.getUserName(),
getParameters().isForce()));
setSucceeded(returnValue.getSucceeded());
if (!getSucceeded()) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResetDefaultGeoRepConfigCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResetDefaultGeoRepConfigCommand.java
index 215371c..078c663 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResetDefaultGeoRepConfigCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResetDefaultGeoRepConfigCommand.java
@@ -27,7 +27,9 @@
session.getMasterVolumeName(),
session.getSlaveHostName(),
session.getSlaveVolumeName(),
- getParameters().getConfigKey()));
+ getParameters().getConfigKey(),
+ null,
+ session.getUserName()));
setSucceeded(returnValue.getSucceeded());
if (!getSucceeded()) {
handleVdsError(AuditLogType.GLUSTER_GEOREP_CONFIG_SET_DEFAULT_FAILED,
returnValue.getVdsError()
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResumeGeoRepSessionCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResumeGeoRepSessionCommand.java
index 7ea37d2..1634369 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResumeGeoRepSessionCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResumeGeoRepSessionCommand.java
@@ -50,6 +50,7 @@
session.getMasterVolumeName(),
session.getSlaveHostName(),
session.getSlaveVolumeName(),
+ session.getUserName(),
parameters.isForce()));
setSucceeded(returnValue.getSucceeded());
if (!getSucceeded()) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SetGeoRepConfigCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SetGeoRepConfigCommand.java
index dce0c43..44c9eeb 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SetGeoRepConfigCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SetGeoRepConfigCommand.java
@@ -44,7 +44,8 @@
session.getSlaveHostName(),
session.getSlaveVolumeName(),
configKey,
- configValue));
+ configValue,
+ session.getUserName()));
setSucceeded(returnValue.getSucceeded());
if (getSucceeded()) {
GlusterGeoRepSessionConfiguration geoRepSessionConfig = new
GlusterGeoRepSessionConfiguration();
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeGeoRepCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeGeoRepCommand.java
index fc5bee7..b4aa1ca 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeGeoRepCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeGeoRepCommand.java
@@ -29,7 +29,13 @@
@Override
protected void executeCommand() {
GlusterGeoRepSession session = getGeoRepSession();
- VDSReturnValue returnValue =
runVdsCommand(VDSCommandType.StartGlusterVolumeGeoRep, new
GlusterVolumeGeoRepSessionVDSParameters(upServer.getId(),
getGlusterVolumeName(), session.getSlaveHostName(),
session.getSlaveVolumeName()));
+ VDSReturnValue returnValue =
+ runVdsCommand(VDSCommandType.StartGlusterVolumeGeoRep,
+ new
GlusterVolumeGeoRepSessionVDSParameters(upServer.getId(),
+ getGlusterVolumeName(),
+ session.getSlaveHostName(),
+ session.getSlaveVolumeName(),
+ session.getUserName()));
setSucceeded(returnValue.getSucceeded());
if (getSucceeded()) {
session.setStatus(GeoRepSessionStatus.INITIALIZING);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopGeoRepSessionCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopGeoRepSessionCommand.java
index 40a4b6f..0eea76c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopGeoRepSessionCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopGeoRepSessionCommand.java
@@ -55,8 +55,11 @@
runVdsCommand(
VDSCommandType.StopGlusterVolumeGeoRepSession,
new
GlusterVolumeGeoRepSessionVDSParameters(upServer.getId(),
- getGeoRepSession().getMasterVolumeName(),
getGeoRepSession().getSlaveHostName(),
- getGeoRepSession().getSlaveVolumeName(),
getParameters().isForce()));
+ getGeoRepSession().getMasterVolumeName(),
+ getGeoRepSession().getSlaveHostName(),
+ getGeoRepSession().getSlaveVolumeName(),
+ getGeoRepSession().getUserName(),
+ getParameters().isForce()));
setSucceeded(returnValue.getSucceeded());
if (getSucceeded()) {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeGeoRepConfigVdsParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeGeoRepConfigVdsParameters.java
index e7ac0d2..c0640c0 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeGeoRepConfigVdsParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeGeoRepConfigVdsParameters.java
@@ -17,6 +17,18 @@
this.configValue = configValue;
}
+ public GlusterVolumeGeoRepConfigVdsParameters(Guid serverId,
+ String volumeName,
+ String slaveHost,
+ String slaveVolume,
+ String configKey,
+ String configValue,
+ String userName) {
+ super(serverId, volumeName, slaveHost, slaveVolume, userName);
+ this.configKey = configKey;
+ this.configValue = configValue;
+ }
+
public GlusterVolumeGeoRepConfigVdsParameters(Guid serverId, String
volumeName, String slaveHost, String slaveVolume, String configKey) {
super(serverId, volumeName, slaveHost, slaveVolume);
this.configKey = configKey;
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/DeleteGlusterVolumeGeoRepSessionVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/DeleteGlusterVolumeGeoRepSessionVDSCommand.java
index f96e803..7b73199 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/DeleteGlusterVolumeGeoRepSessionVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/DeleteGlusterVolumeGeoRepSessionVDSCommand.java
@@ -16,7 +16,8 @@
protected void executeVdsBrokerCommand() {
status =
getBroker().glusterVolumeGeoRepSessionDelete(getParameters().getVolumeName(),
getParameters().getSlaveHost(),
- getParameters().getSlaveVolume());
+ getParameters().getSlaveVolume(),
+ getParameters().getUserName());
// Handle errors if any
proceedProxyReturnValue();
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepConfigListVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepConfigListVDSCommand.java
index 8d0ca29..7b3d20e 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepConfigListVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepConfigListVDSCommand.java
@@ -21,7 +21,11 @@
@Override
protected void executeVdsBrokerCommand() {
- result =
getBroker().glusterVolumeGeoRepConfigList(getParameters().getVolumeName(),
getParameters().getSlaveHost(), getParameters().getSlaveVolume());
+ result =
+
getBroker().glusterVolumeGeoRepConfigList(getParameters().getVolumeName(),
+ getParameters().getSlaveHost(),
+ getParameters().getSlaveVolume(),
+ getParameters().getUserName());
proceedProxyReturnValue();
List<GlusterGeoRepSessionConfiguration> sessionConfigs =
result.getSessionConfig();
setReturnValue(sessionConfigs);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionListVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionListVDSCommand.java
index 34ac9c9..3e88b92 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionListVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionListVDSCommand.java
@@ -26,7 +26,8 @@
result =
getBroker().glusterVolumeGeoRepSessionList(parameter.getVolumeName(),
parameter.getSlaveHost(),
- parameter.getSlaveVolume());
+ parameter.getSlaveVolume(),
+ parameter.getUserName());
}
proceedProxyReturnValue();
if (getVDSReturnValue().getSucceeded()) {
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionStatusVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionStatusVDSCommand.java
index f4a8089..a658c0b 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionStatusVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionStatusVDSCommand.java
@@ -19,8 +19,9 @@
protected void executeVdsBrokerCommand() {
GlusterVolumeGeoRepSessionVDSParameters parameter = getParameters();
result =
getBroker().glusterVolumeGeoRepSessionStatus(parameter.getVolumeName(),
- parameter.getSlaveHost(),
- parameter.getSlaveVolume());
+ parameter.getSlaveHost(),
+ parameter.getSlaveVolume(),
+ parameter.getUserName());
proceedProxyReturnValue();
if (getVDSReturnValue().getSucceeded()) {
setReturnValue(result.getGeoRepDetails());
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/PauseGlusterVolumeGeoRepSessionVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/PauseGlusterVolumeGeoRepSessionVDSCommand.java
index e5cb03e..5611c91 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/PauseGlusterVolumeGeoRepSessionVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/PauseGlusterVolumeGeoRepSessionVDSCommand.java
@@ -11,7 +11,12 @@
@Override
protected void executeVdsBrokerCommand() {
GlusterVolumeGeoRepSessionVDSParameters parameters = getParameters();
- status =
getBroker().glusterVolumeGeoRepSessionPause(parameters.getVolumeName(),
parameters.getSlaveHost(), parameters.getSlaveVolume(), parameters.getForce());
+ status =
+
getBroker().glusterVolumeGeoRepSessionPause(parameters.getVolumeName(),
+ parameters.getSlaveHost(),
+ parameters.getSlaveVolume(),
+ parameters.getUserName(),
+ parameters.getForce());
proceedProxyReturnValue();
}
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResumeGeoRepSessionVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResumeGeoRepSessionVDSCommand.java
index 9fca86b..ba07e8c 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResumeGeoRepSessionVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResumeGeoRepSessionVDSCommand.java
@@ -11,7 +11,12 @@
@Override
protected void executeVdsBrokerCommand() {
GlusterVolumeGeoRepSessionVDSParameters parameters = getParameters();
- status =
getBroker().glusterVolumeGeoRepSessionResume(parameters.getVolumeName(),
parameters.getSlaveHost(), parameters.getSlaveVolume(), parameters.getForce());
+ status =
+
getBroker().glusterVolumeGeoRepSessionResume(parameters.getVolumeName(),
+ parameters.getSlaveHost(),
+ parameters.getSlaveVolume(),
+ parameters.getUserName(),
+ parameters.getForce());
proceedProxyReturnValue();
}
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/SetGlusterVolumeGeoRepConfigDefaultVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/SetGlusterVolumeGeoRepConfigDefaultVDSCommand.java
index 8118487..e8afe0b 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/SetGlusterVolumeGeoRepConfigDefaultVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/SetGlusterVolumeGeoRepConfigDefaultVDSCommand.java
@@ -10,7 +10,12 @@
@Override
protected void executeVdsBrokerCommand() {
- status =
getBroker().glusterVolumeGeoRepConfigReset(getParameters().getVolumeName(),
getParameters().getSlaveHost(), getParameters().getSlaveVolume(),
getParameters().getConfigKey());
+ status =
+
getBroker().glusterVolumeGeoRepConfigReset(getParameters().getVolumeName(),
+ getParameters().getSlaveHost(),
+ getParameters().getSlaveVolume(),
+ getParameters().getConfigKey(),
+ getParameters().getUserName());
proceedProxyReturnValue();
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/SetGlusterVolumeGeoRepConfigVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/SetGlusterVolumeGeoRepConfigVDSCommand.java
index 8d03426..d3f7725 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/SetGlusterVolumeGeoRepConfigVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/SetGlusterVolumeGeoRepConfigVDSCommand.java
@@ -10,7 +10,13 @@
@Override
protected void executeVdsBrokerCommand() {
- status =
getBroker().glusterVolumeGeoRepConfigSet(getParameters().getVolumeName(),
getParameters().getSlaveHost(), getParameters().getSlaveVolume(),
getParameters().getConfigKey(), getParameters().getConfigValue());
+ status =
+
getBroker().glusterVolumeGeoRepConfigSet(getParameters().getVolumeName(),
+ getParameters().getSlaveHost(),
+ getParameters().getSlaveVolume(),
+ getParameters().getConfigKey(),
+ getParameters().getConfigValue(),
+ getParameters().getUserName());
proceedProxyReturnValue();
}
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartGlusterVolumeGeoRepVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartGlusterVolumeGeoRepVDSCommand.java
index bdec25b..a5bdc37 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartGlusterVolumeGeoRepVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartGlusterVolumeGeoRepVDSCommand.java
@@ -11,7 +11,12 @@
@Override
protected void executeVdsBrokerCommand() {
GlusterVolumeGeoRepSessionVDSParameters parameters = getParameters();
- status =
getBroker().glusterVolumeGeoRepSessionStart(parameters.getVolumeName(),
parameters.getSlaveHost(), parameters.getSlaveVolume(), parameters.getForce());
+ status =
+
getBroker().glusterVolumeGeoRepSessionStart(parameters.getVolumeName(),
+ parameters.getSlaveHost(),
+ parameters.getSlaveVolume(),
+ parameters.getUserName(),
+ parameters.getForce());
proceedProxyReturnValue();
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopGlusterVolumeGeoRepSessionVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopGlusterVolumeGeoRepSessionVDSCommand.java
index d132cd2..a65a054 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopGlusterVolumeGeoRepSessionVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopGlusterVolumeGeoRepSessionVDSCommand.java
@@ -14,9 +14,10 @@
@Override
protected void executeVdsBrokerCommand() {
status =
getBroker().glusterVolumeGeoRepSessionStop(getParameters().getVolumeName(),
-
getParameters().getSlaveHost(),
-
getParameters().getSlaveVolume(),
-
getParameters().getForce());
+ getParameters().getSlaveHost(),
+ getParameters().getSlaveVolume(),
+ getParameters().getUserName(),
+ getParameters().getForce());
// Handle errors if any
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 2d0279a..8e2cb63 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
@@ -1190,43 +1190,48 @@
}
@Override
- public StatusOnlyReturnForXmlRpc glusterGeoRepKeysUpdate(List<String>
geoRepPubKeys, String remoteUserName) {
+ public StatusOnlyReturnForXmlRpc glusterGeoRepKeysUpdate(List<String>
geoRepPubKeys, String userName) {
JsonRpcRequest request =
new RequestBuilder("GlusterVolume.geoRepKeysUpdate")
.withParameter("geoRepPubKeys", geoRepPubKeys)
- .withOptionalParameter("userName",
remoteUserName).build();
+ .withOptionalParameter("userName", userName).build();
Map<String, Object> response = new FutureMap(this.client, request);
return new StatusOnlyReturnForXmlRpc(response);
}
@Override
- public StatusOnlyReturnForXmlRpc glusterGeoRepMountBrokerSetup(String
remoteVolumeName, String remoteUserName, String remoteGroupName) {
+ public StatusOnlyReturnForXmlRpc glusterGeoRepMountBrokerSetup(String
remoteVolumeName, String userName, String remoteGroupName) {
JsonRpcRequest request =
new
RequestBuilder("GlusterVolume.geoRepMountBrokerSetup").withParameter("remoteVolumeName",
remoteVolumeName)
- .withOptionalParameter("remoteUserName",
remoteUserName)
+ .withOptionalParameter("remoteUserName", userName)
.withOptionalParameter("remoteGroupName",
remoteGroupName).build();
Map<String, Object> response = new FutureMap(this.client, request);
return new StatusOnlyReturnForXmlRpc(response);
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionCreate(String
volumeName, String remoteHost, String remotVolumeName, String remoteUserName,
Boolean force) {
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionCreate(String
volumeName, String remoteHost, String remotVolumeName, String userName, Boolean
force) {
JsonRpcRequest request =
new
RequestBuilder("GlusterVolume.geoRepSessionCreate").withParameter("volumeName",
volumeName)
.withParameter("remoteHost", remoteHost)
.withParameter("remoteVolumeName", remotVolumeName)
.withParameter("force", force)
- .withOptionalParameter("remoteUserName",
remoteUserName).build();
+ .withOptionalParameter("remoteUserName", userName).build();
Map<String, Object> response = new FutureMap(this.client, request);
return new StatusOnlyReturnForXmlRpc(response);
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionResume(String
volumeName, String slaveHostName, String slaveVolumeName, boolean force) {
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionResume(String
volumeName,
+ String slaveHostName,
+ String slaveVolumeName,
+ String userName,
+ boolean force) {
JsonRpcRequest request = new
RequestBuilder("GlusterVolume.geoRepSessionResume").withParameter("volumeName",
volumeName)
- .withParameter("remoteHost", slaveHostName)
- .withParameter("remoteVolumeName", slaveVolumeName)
- .withParameter("force", force).build();
+ .withParameter("remoteHost", slaveHostName)
+ .withParameter("remoteVolumeName", slaveVolumeName)
+ .withOptionalParameter("remoteUserName", userName)
+ .withParameter("force", force).build();
Map<String, Object> response = new FutureMap(this.client, request);
return new StatusOnlyReturnForXmlRpc(response);
}
@@ -1271,24 +1276,33 @@
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionDelete(String
volumeName, String remoteHost, String remoteVolumeName) {
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionDelete(String
volumeName,
+ String remoteHost,
+ String remoteVolumeName,
+ String userName) {
JsonRpcRequest request = new
RequestBuilder("GlusterVolume.geoRepSessionDelete")
- .withParameter("volumeName",
volumeName)
- .withParameter("remoteHost",
remoteHost)
- .withParameter("remoteVolumeName",
remoteVolumeName)
- .build();
+ .withParameter("volumeName", volumeName)
+ .withParameter("remoteHost", remoteHost)
+ .withParameter("remoteVolumeName", remoteVolumeName)
+ .withOptionalParameter("remoteUserName", userName)
+ .build();
Map<String, Object> response = new FutureMap(this.client, request);
return new StatusOnlyReturnForXmlRpc(response);
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionStop(String
volumeName, String remoteHost, String remoteVolumeName, Boolean force) {
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionStop(String
volumeName,
+ String remoteHost,
+ String remoteVolumeName,
+ String userName,
+ Boolean force) {
JsonRpcRequest request = new
RequestBuilder("GlusterVolume.geoRepSessionStop")
- .withParameter("volumeName",
volumeName)
- .withParameter("remoteHost",
remoteHost)
- .withParameter("remoteVolumeName",
remoteVolumeName)
- .withParameter("force", force)
- .build();
+ .withParameter("volumeName", volumeName)
+ .withParameter("remoteHost", remoteHost)
+ .withParameter("remoteVolumeName", remoteVolumeName)
+ .withOptionalParameter("remoteUserName", userName)
+ .withParameter("force", force)
+ .build();
Map<String, Object> response = new FutureMap(this.client, request);
return new StatusOnlyReturnForXmlRpc(response);
}
@@ -1342,33 +1356,49 @@
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionPause(String
masterVolumeName, String slaveHost, String slaveVolumeName, boolean force) {
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionPause(String
masterVolumeName,
+ String slaveHost,
+ String slaveVolumeName,
+ String userName,
+ boolean force) {
JsonRpcRequest request = new
RequestBuilder("GlusterVolume.geoRepSessionPause").withParameter("volumeName",
masterVolumeName)
- .withParameter("remoteHost", slaveHost)
- .withParameter("remoteVolumeName", slaveVolumeName)
- .withParameter("force", force).build();
+ .withParameter("remoteHost", slaveHost)
+ .withParameter("remoteVolumeName", slaveVolumeName)
+ .withOptionalParameter("remoteUserName", userName)
+ .withParameter("force", force).build();
Map<String, Object> response = new FutureMap(this.client, request);
return new StatusOnlyReturnForXmlRpc(response);
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionStart(String
volumeName, String remoteHost, String remoteVolumeName, Boolean force) {
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionStart(String
volumeName,
+ String remoteHost,
+ String remoteVolumeName,
+ String userName,
+ Boolean force) {
JsonRpcRequest request = new
RequestBuilder("GlusterVolume.geoRepSessionStart").withParameter("volumeName",
volumeName)
- .withParameter("remoteHost", remoteHost)
- .withParameter("remoteVolumeName", remoteVolumeName)
- .withParameter("force", force).build();
+ .withParameter("remoteHost", remoteHost)
+ .withParameter("remoteVolumeName", remoteVolumeName)
+ .withOptionalParameter("remoteUserName", userName)
+ .withParameter("force", force).build();
Map<String, Object> response = new FutureMap(this.client, request);
return new StatusOnlyReturnForXmlRpc(response);
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepConfigSet(String
volumeName, String slaveHost, String slaveVolumeName, String configKey, String
configValue) {
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepConfigSet(String
volumeName,
+ String slaveHost,
+ String slaveVolumeName,
+ String configKey,
+ String configValue,
+ String userName) {
JsonRpcRequest request = new
RequestBuilder("GlusterVolume.geoRepConfigSet")
.withParameter("volumeName", volumeName)
.withParameter("remoteHost", slaveHost)
.withParameter("remoteVolumeName", slaveVolumeName)
.withParameter("optionName", configKey)
- .withParameter("optionValue", configValue).build();
+ .withParameter("optionValue", configValue)
+ .withOptionalParameter("remoteUserName", userName).build();
Map<String, Object> response = new FutureMap(this.client, request);
return new StatusOnlyReturnForXmlRpc(response);
}
@@ -1377,24 +1407,30 @@
public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepConfigReset(String
volumeName,
String slaveHost,
String slaveVolumeName,
- String configKey) {
+ String configKey,
+ String userName) {
JsonRpcRequest request = new
RequestBuilder("GlusterVolume.geoRepConfigReset")
- .withParameter("volumeName", volumeName)
- .withParameter("remoteHost", slaveHost)
- .withParameter("remoteVolumeName", slaveVolumeName)
- .withParameter("optionName", configKey)
- .build();
+ .withParameter("volumeName", volumeName)
+ .withParameter("remoteHost", slaveHost)
+ .withParameter("remoteVolumeName", slaveVolumeName)
+ .withParameter("optionName", configKey)
+ .withOptionalParameter("remoteUserName", userName)
+ .build();
Map<String, Object> response = new FutureMap(this.client, request);
return new StatusOnlyReturnForXmlRpc(response);
}
@Override
- public GlusterVolumeGeoRepConfigListXmlRpc
glusterVolumeGeoRepConfigList(String volumeName, String slaveHost, String
slaveVolumeName) {
+ public GlusterVolumeGeoRepConfigListXmlRpc
glusterVolumeGeoRepConfigList(String volumeName,
+ String slaveHost,
+ String slaveVolumeName,
+ String userName) {
JsonRpcRequest request = new
RequestBuilder("GlusterVolume.geoRepConfigList")
- .withParameter("volumeName", volumeName)
- .withParameter("remoteHost", slaveHost)
- .withParameter("remoteVolumeName", slaveVolumeName)
- .build();
+ .withParameter("volumeName", volumeName)
+ .withParameter("remoteHost", slaveHost)
+ .withParameter("remoteVolumeName", slaveVolumeName)
+ .withOptionalParameter("remoteUserName", userName)
+ .build();
Map<String, Object> response = new FutureMap(this.client, request);
return new GlusterVolumeGeoRepConfigListXmlRpc(response);
}
@@ -1596,11 +1632,13 @@
@Override
public GlusterVolumeGeoRepStatusForXmlRpc
glusterVolumeGeoRepSessionList(String volumeName,
String slaveHost,
- String slaveVolumeName) {
+ String slaveVolumeName,
+ String userName) {
JsonRpcRequest request =
new
RequestBuilder("GlusterVolume.geoRepSessionList").withParameter("volumeName",
volumeName)
- .withParameter("remoteHost", slaveHost)
- .withParameter("remoteVolumeName",
slaveVolumeName).build();
+ .withParameter("remoteHost", slaveHost)
+ .withParameter("remoteVolumeName", slaveVolumeName)
+ .withOptionalParameter("remoteUserName",
userName).build();
Map<String, Object> response = new FutureMap(this.client,
request).withIgnoreResponseKey();
return new GlusterVolumeGeoRepStatusForXmlRpc(response);
}
@@ -1608,11 +1646,13 @@
@Override
public GlusterVolumeGeoRepStatusDetailForXmlRpc
glusterVolumeGeoRepSessionStatus(String volumeName,
String slaveHost,
- String slaveVolumeName) {
+ String slaveVolumeName,
+ String userName) {
JsonRpcRequest request =
new
RequestBuilder("GlusterVolume.geoRepSessionStatus").withParameter("volumeName",
volumeName)
- .withParameter("remoteHost", slaveHost)
- .withParameter("remoteVolumeName",
slaveVolumeName).build();
+ .withParameter("remoteHost", slaveHost)
+ .withParameter("remoteVolumeName", slaveVolumeName)
+ .withOptionalParameter("remoteUserName",
userName).build();
Map<String, Object> response = new FutureMap(this.client,
request).withIgnoreResponseKey();
return new GlusterVolumeGeoRepStatusDetailForXmlRpc(response);
}
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 d8ef0e9..c012329 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
@@ -274,18 +274,6 @@
GlusterServersListReturnForXmlRpc glusterServersList();
- GlusterHostsPubKeyReturnForXmlRpc glusterGeoRepKeysGet();
-
- StatusOnlyReturnForXmlRpc glusterGeoRepKeysUpdate(List<String>
geoRepPubKeys, String remoteUserName);
-
- StatusOnlyReturnForXmlRpc glusterGeoRepMountBrokerSetup(String
remoteVolumeName, String remoteUserName, String remoteGroupName);
-
- StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionCreate(String
volumeName, String remoteHost, String remoteVolumeName, String remoteUserName,
Boolean force);
-
- StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionDelete(String
volumeName, String remoteHost, String remoteVolumeName);
-
- StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionStop(String
volumeName, String remoteHost, String remoteVolumeName, Boolean force);
-
StatusOnlyReturnForXmlRpc diskReplicateStart(String vmUUID, Map srcDisk,
Map dstDisk);
StatusOnlyReturnForXmlRpc diskReplicateFinish(String vmUUID, Map srcDisk,
Map dstDisk);
@@ -293,10 +281,6 @@
StatusOnlyReturnForXmlRpc glusterVolumeProfileStart(String volumeName);
StatusOnlyReturnForXmlRpc glusterVolumeProfileStop(String volumeName);
-
- StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionStart(String
volumeName, String remoteHost, String remoteVolumeName, Boolean force);
-
- StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionPause(String
masterVolumeName, String slaveHost, String slaveVolumeName, boolean force);
GlusterVolumeStatusReturnForXmlRpc glusterVolumeStatus(Guid clusterId,
String volumeName,
@@ -333,23 +317,74 @@
GlusterVolumeTaskReturnForXmlRpc glusterVolumeRebalanceStatus(String
volumeName);
+ GlusterHostsPubKeyReturnForXmlRpc glusterGeoRepKeysGet();
+
+ StatusOnlyReturnForXmlRpc glusterGeoRepKeysUpdate(List<String>
geoRepPubKeys, String userName);
+
+ StatusOnlyReturnForXmlRpc glusterGeoRepMountBrokerSetup(String
remoteVolumeName,
+ String userName,
+ String remoteGroupName);
+
+ StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionCreate(String
volumeName,
+ String remoteHost,
+ String remoteVolumeName,
+ String userName,
+ Boolean force);
+
+ StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionDelete(String
volumeName,
+ String remoteHost,
+ String remoteVolumeName,
+ String userName);
+
+ StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionStop(String volumeName,
+ String remoteHost,
+ String remoteVolumeName,
+ String userName,
+ Boolean force);
+
GlusterVolumeGeoRepStatusForXmlRpc glusterVolumeGeoRepSessionList();
GlusterVolumeGeoRepStatusForXmlRpc glusterVolumeGeoRepSessionList(String
volumeName);
GlusterVolumeGeoRepStatusForXmlRpc glusterVolumeGeoRepSessionList(String
volumeName,
String slaveHost,
- String slaveVolumeName);
+ String slaveVolumeName,
+ String userName);
GlusterVolumeGeoRepStatusDetailForXmlRpc
glusterVolumeGeoRepSessionStatus(String volumeName,
String slaveHost,
- String slaveVolumeName);
+ String slaveVolumeName,
+ String userName);
- StatusOnlyReturnForXmlRpc glusterVolumeGeoRepConfigSet(String volumeName,
String slaveHost, String slaveVolumeName, String configKey, String configValue);
+ StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionStart(String
volumeName,
+ String remoteHost,
+ String remoteVolumeName,
+ String userName,
+ Boolean force);
- StatusOnlyReturnForXmlRpc glusterVolumeGeoRepConfigReset(String
volumeName, String slaveHost, String slaveVolumeName, String configKey);
+ StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionPause(String
masterVolumeName,
+ String slaveHost,
+ String slaveVolumeName,
+ String userName,
+ boolean force);
- GlusterVolumeGeoRepConfigListXmlRpc glusterVolumeGeoRepConfigList(String
volumeName, String slaveHost, String slaveVolumeName);
+ StatusOnlyReturnForXmlRpc glusterVolumeGeoRepConfigSet(String volumeName,
+ String slaveHost,
+ String slaveVolumeName,
+ String configKey,
+ String configValue,
+ String userName);
+
+ StatusOnlyReturnForXmlRpc glusterVolumeGeoRepConfigReset(String volumeName,
+ String slaveHost,
+ String slaveVolumeName,
+ String configKey,
+ String userName);
+
+ GlusterVolumeGeoRepConfigListXmlRpc glusterVolumeGeoRepConfigList(String
volumeName,
+ String slaveHost,
+ String slaveVolumeName,
+ String userName);
GlusterVolumeTaskReturnForXmlRpc glusterVolumeRemoveBrickStatus(String
volumeName, String[] bricksList);
@@ -357,7 +392,11 @@
StatusOnlyReturnForXmlRpc updateVmPolicy(Map info);
- StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionResume(String
volumeName, String slaveHostName, String slaveVolumeName, boolean force);
+ StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionResume(String
volumeName,
+ String slaveHostName,
+ String slaveVolumeName,
+ String userName,
+ boolean force);
GlusterVolumeSnapshotInfoReturnForXmlRpc glusterSnapshotInfo(Guid
clusterId, String volumeName);
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 c0d8154..91eb739 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
@@ -233,16 +233,6 @@
public Map<String, Object> glusterVolumeRebalanceStart(String volumeName,
Boolean fixLayoutOnly, Boolean force);
- public Map<String, Object> glusterGeoRepKeysGet();
-
- public Map<String, Object> glusterGeoRepKeysUpdate(String remoteUserName,
List<String> geoRepPubKeys);
-
- public Map<String, Object> glusterGeoRepMountBrokerSetup(String
remoteUserName, String remoteGroupName, String remoteVolumeName);
-
- public Map<String, Object> glusterVolumeGeoRepSessionCreate(String
volumeName, String remoteHost, String remoteVolumeName, String remoteUserName,
Boolean force);
-
- public Map<String, Object> glusterVolumeGeoRepSessionResume(String
volumeName, String slaveHostName, String slaveVolumeName, boolean force);
-
public Map<String, Object> glusterVolumeRebalanceStop(String volumeName);
public Map<String, Object> replaceGlusterVolumeBrickStart(String
volumeName, String existingBrickDir, String newBrickDir);
@@ -257,12 +247,6 @@
public Map<String, Object> glusterVolumesList();
- public Map<String, Object> glusterVolumeGeoRepSessionDelete(String
volumeName, String remoteHost, String remoteVolumeName);
-
- public Map<String, Object> glusterVolumeGeoRepSessionStop(String
volumeName, String remoteHost, String remoteVolumeName, Boolean force);
-
- public Map<String, Object> glusterVolumeGeoRepConfigSet(String volumeName,
String slaveHost, String slaveVolumeName, String configKey, String configValue);
-
public Map<String, Object> ping();
@FutureCall(delegeteTo = "ping")
@@ -275,10 +259,6 @@
public Map<String, Object> glusterVolumeProfileStart(String volumeName);
public Map<String, Object> glusterVolumeProfileStop(String volumeName);
-
- public Map<String, Object> glusterVolumeGeoRepSessionStart(String
volumeName, String remoteHost, String remoteVolumeName, Boolean force);
-
- public Map<String, Object> glusterVolumeGeoRepSessionPause(String
masterVolumeName, String slaveHost, String slaveVolumeName, boolean force);
public Map<String, Object> glusterVolumeStatus(String volumeName, String
brickName, String volumeStatusOption);
@@ -310,27 +290,86 @@
public Map<String, Object> glusterVolumeRebalanceStatus(String volumeName);
+ public Map<String, Object> glusterGeoRepKeysGet();
+
+ public Map<String, Object> glusterGeoRepKeysUpdate(String userName,
List<String> geoRepPubKeys);
+
+ public Map<String, Object> glusterGeoRepMountBrokerSetup(String userName,
+ String remoteGroupName,
+ String remoteVolumeName);
+
+ public Map<String, Object> glusterVolumeGeoRepSessionCreate(String
volumeName,
+ String remoteHost,
+ String remoteVolumeName,
+ String userName,
+ Boolean force);
+
+ public Map<String, Object> glusterVolumeGeoRepSessionResume(String
volumeName,
+ String slaveHostName,
+ String slaveVolumeName,
+ String userName,
+ boolean force);
+
+ public Map<String, Object> glusterVolumeGeoRepSessionStart(String
volumeName,
+ String remoteHost,
+ String remoteVolumeName,
+ String userName,
+ Boolean force);
+
+ public Map<String, Object> glusterVolumeGeoRepSessionPause(String
masterVolumeName,
+ String slaveHost,
+ String slaveVolumeName,
+ String userName,
+ boolean force);
+
public Map<String, Object> glusterVolumeGeoRepSessionList();
public Map<String, Object> glusterVolumeGeoRepSessionList(String
volumeName);
public Map<String, Object> glusterVolumeGeoRepSessionList(String
volumeName,
String slaveHost,
- String slaveVolumeName);
+ String slaveVolumeName,
+ String userName);
public Map<String, Object> glusterVolumeGeoRepSessionStatus(String
volumeName,
String slaveHost,
- String slaveVolumeName);
+ String slaveVolumeName,
+ String userName);
+
+ public Map<String, Object> glusterVolumeGeoRepConfigReset(String
volumeName,
+ String slaveHost,
+ String slaveVolumeName,
+ String configKey,
+ String userName);
+
+ public Map<String, Object> glusterVolumeGeoRepConfigList(String volumeName,
+ String slaveHost,
+ String slaveVolumeName,
+ String userName);
+
+ public Map<String, Object> glusterVolumeGeoRepSessionDelete(String
volumeName,
+ String remoteHost,
+ String remoteVolumeName,
+ String userName);
+
+ public Map<String, Object> glusterVolumeGeoRepSessionStop(String
volumeName,
+ String remoteHost,
+ String remoteVolumeName,
+ String userName,
+ Boolean force);
+
+ public Map<String, Object> glusterVolumeGeoRepConfigSet(String volumeName,
+ String slaveHost,
+ String slaveVolumeName,
+ String configKey,
+ String configValue,
+ String userName);
public Map<String, Object> glusterVolumeRemoveBrickStatus(String
volumeName, String[] bricksList);
public Map<String, Object> setNumberOfCpus(String vmId, String
numberOfCpus);
public Map<String, Object> updateVmPolicy(Map info);
-
- public Map<String, Object> glusterVolumeGeoRepConfigReset(String
volumeName, String slaveHost, String slaveVolumeName, String configKey);
-
- public Map<String, Object> glusterVolumeGeoRepConfigList(String
volumeName, String slaveHost, String slaveVolumeName);
public Map<String, Object> glusterSnapshotInfo(String snapshotName, String
volumeName);
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 20f79f1..a4ab037 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
@@ -1122,9 +1122,9 @@
}
@Override
- public StatusOnlyReturnForXmlRpc glusterGeoRepKeysUpdate(List<String>
geoRepPubKeys, String remoteUserName) {
+ public StatusOnlyReturnForXmlRpc glusterGeoRepKeysUpdate(List<String>
geoRepPubKeys, String userName) {
try {
- Map<String, Object> xmlRpcReturnValue =
vdsServer.glusterGeoRepKeysUpdate(remoteUserName, geoRepPubKeys);
+ Map<String, Object> xmlRpcReturnValue =
vdsServer.glusterGeoRepKeysUpdate(userName, geoRepPubKeys);
StatusOnlyReturnForXmlRpc wrapper = new
StatusOnlyReturnForXmlRpc(xmlRpcReturnValue);
return wrapper;
} catch (UndeclaredThrowableException ute) {
@@ -1133,9 +1133,9 @@
}
@Override
- public StatusOnlyReturnForXmlRpc glusterGeoRepMountBrokerSetup(String
remoteVolumeName, String remoteUserName, String remoteGroupName) {
+ public StatusOnlyReturnForXmlRpc glusterGeoRepMountBrokerSetup(String
remoteVolumeName, String userName, String remoteGroupName) {
try {
- Map<String, Object> xmlRpcReturnValue =
vdsServer.glusterGeoRepMountBrokerSetup(remoteUserName, remoteGroupName,
remoteVolumeName);
+ Map<String, Object> xmlRpcReturnValue =
vdsServer.glusterGeoRepMountBrokerSetup(userName, remoteGroupName,
remoteVolumeName);
StatusOnlyReturnForXmlRpc wrapper = new
StatusOnlyReturnForXmlRpc(xmlRpcReturnValue);
return wrapper;
} catch (UndeclaredThrowableException ute) {
@@ -1144,9 +1144,9 @@
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionCreate(String
volumeName, String remoteHost, String remoteVolumeName, String remoteUserName,
Boolean force) {
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionCreate(String
volumeName, String remoteHost, String remoteVolumeName, String userName,
Boolean force) {
try {
- Map<String, Object> xmlRpcReturnValue =
vdsServer.glusterVolumeGeoRepSessionCreate(volumeName, remoteHost,
remoteVolumeName, remoteUserName, force);
+ Map<String, Object> xmlRpcReturnValue =
vdsServer.glusterVolumeGeoRepSessionCreate(volumeName, remoteHost,
remoteVolumeName, userName, force);
StatusOnlyReturnForXmlRpc wrapper = new
StatusOnlyReturnForXmlRpc(xmlRpcReturnValue);
return wrapper;
} catch (UndeclaredThrowableException ute) {
@@ -1155,9 +1155,18 @@
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionResume(String
volumeName, String slaveHostName, String slaveVolumeName, boolean force) {
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionResume(String
volumeName,
+ String slaveHostName,
+ String slaveVolumeName,
+ String userName,
+ boolean force) {
try{
- Map<String, Object> xmlRpcReturnValue =
vdsServer.glusterVolumeGeoRepSessionResume(volumeName, slaveHostName,
slaveVolumeName, force);
+ Map<String, Object> xmlRpcReturnValue =
+ vdsServer.glusterVolumeGeoRepSessionResume(volumeName,
+ slaveHostName,
+ slaveVolumeName,
+ userName,
+ force);
StatusOnlyReturnForXmlRpc wrapper = new
StatusOnlyReturnForXmlRpc(xmlRpcReturnValue);
return wrapper;
} catch (UndeclaredThrowableException ute) {
@@ -1261,18 +1270,34 @@
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionPause(String
masterVolumeName, String slaveHost, String slaveVolumeName, boolean force) {
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionPause(String
masterVolumeName,
+ String slaveHost,
+ String slaveVolumeName,
+ String userName,
+ boolean force) {
try {
- return new
StatusOnlyReturnForXmlRpc(vdsServer.glusterVolumeGeoRepSessionPause(masterVolumeName,
slaveHost, slaveVolumeName, force));
+ return new
StatusOnlyReturnForXmlRpc(vdsServer.glusterVolumeGeoRepSessionPause(masterVolumeName,
+ slaveHost,
+ slaveVolumeName,
+ userName,
+ force));
} catch (UndeclaredThrowableException ute) {
throw new XmlRpcRunTimeException(ute);
}
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionStart(String
volumeName, String remoteHost, String remoteVolumeName, Boolean force) {
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionStart(String
volumeName,
+ String remoteHost,
+ String remoteVolumeName,
+ String userName,
+ Boolean force) {
try {
- return new
StatusOnlyReturnForXmlRpc(vdsServer.glusterVolumeGeoRepSessionStart(volumeName,
remoteHost, remoteVolumeName, force));
+ return new
StatusOnlyReturnForXmlRpc(vdsServer.glusterVolumeGeoRepSessionStart(volumeName,
+ remoteHost,
+ remoteVolumeName,
+ userName,
+ force));
} catch (UndeclaredThrowableException ute) {
throw new XmlRpcRunTimeException(ute);
}
@@ -1476,10 +1501,11 @@
@Override
public GlusterVolumeGeoRepStatusForXmlRpc
glusterVolumeGeoRepSessionList(String volumeName,
String slaveHost,
- String slaveVolumeName) {
+ String slaveVolumeName,
+ String userName) {
try {
Map<String, Object> response;
- response = vdsServer.glusterVolumeGeoRepSessionList(volumeName,
slaveHost, slaveVolumeName);
+ response = vdsServer.glusterVolumeGeoRepSessionList(volumeName,
slaveHost, slaveVolumeName, userName);
return new GlusterVolumeGeoRepStatusForXmlRpc(response);
} catch (UndeclaredThrowableException ute) {
throw new XmlRpcRunTimeException(ute);
@@ -1489,10 +1515,11 @@
@Override
public GlusterVolumeGeoRepStatusDetailForXmlRpc
glusterVolumeGeoRepSessionStatus(String volumeName,
String slaveHost,
- String slaveVolumeName) {
+ String slaveVolumeName,
+ String userName) {
try {
Map<String, Object> response =
- vdsServer.glusterVolumeGeoRepSessionStatus(volumeName,
slaveHost, slaveVolumeName);
+ vdsServer.glusterVolumeGeoRepSessionStatus(volumeName,
slaveHost, slaveVolumeName, userName);
return new GlusterVolumeGeoRepStatusDetailForXmlRpc(response);
} catch (UndeclaredThrowableException ute) {
throw new XmlRpcRunTimeException(ute);
@@ -1512,10 +1539,10 @@
@Override
public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionDelete(String
volumeName, String remoteHost,
- String remoteVolumeName) {
+ String remoteVolumeName, String userName) {
try {
return new
StatusOnlyReturnForXmlRpc(vdsServer.glusterVolumeGeoRepSessionDelete(volumeName,
- remoteHost, remoteVolumeName));
+ remoteHost, remoteVolumeName, userName));
} catch (UndeclaredThrowableException ute) {
throw new XmlRpcRunTimeException(ute);
}
@@ -1523,37 +1550,61 @@
@Override
public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepSessionStop(String
volumeName, String remoteHost,
- String remoteVolumeName, Boolean force) {
+ String remoteVolumeName, String userName, Boolean force) {
try {
return new
StatusOnlyReturnForXmlRpc(vdsServer.glusterVolumeGeoRepSessionStop(volumeName,
- remoteHost, remoteVolumeName, force));
+ remoteHost, remoteVolumeName, userName, force));
} catch (UndeclaredThrowableException ute) {
throw new XmlRpcRunTimeException(ute);
}
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepConfigSet(String
volumeName, String slaveHost, String slaveVolumeName, String configKey, String
configValue) {
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepConfigSet(String
volumeName,
+ String slaveHost,
+ String slaveVolumeName,
+ String configKey,
+ String configValue,
+ String userName) {
try {
- return new
StatusOnlyReturnForXmlRpc(vdsServer.glusterVolumeGeoRepConfigSet(volumeName,
slaveHost, slaveVolumeName, configKey, configValue));
+ return new
StatusOnlyReturnForXmlRpc(vdsServer.glusterVolumeGeoRepConfigSet(volumeName,
+ slaveHost,
+ slaveVolumeName,
+ configKey,
+ configValue,
+ userName));
} catch (UndeclaredThrowableException ute) {
throw new XmlRpcRunTimeException(ute);
}
}
@Override
- public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepConfigReset(String
volumeName, String slaveHost, String slaveVolumeName, String configKey) {
+ public StatusOnlyReturnForXmlRpc glusterVolumeGeoRepConfigReset(String
volumeName,
+ String slaveHost,
+ String slaveVolumeName,
+ String configKey,
+ String userName) {
try {
- return new
StatusOnlyReturnForXmlRpc(vdsServer.glusterVolumeGeoRepConfigReset(volumeName,
slaveHost, slaveVolumeName, configKey));
+ return new
StatusOnlyReturnForXmlRpc(vdsServer.glusterVolumeGeoRepConfigReset(volumeName,
+ slaveHost,
+ slaveVolumeName,
+ configKey,
+ userName));
} catch(UndeclaredThrowableException ute) {
throw new XmlRpcRunTimeException(ute);
}
}
@Override
- public GlusterVolumeGeoRepConfigListXmlRpc
glusterVolumeGeoRepConfigList(String volumeName, String slaveHost, String
slaveVolumeName) {
+ public GlusterVolumeGeoRepConfigListXmlRpc
glusterVolumeGeoRepConfigList(String volumeName,
+ String slaveHost,
+ String slaveVolumeName,
+ String userName) {
try {
- return new
GlusterVolumeGeoRepConfigListXmlRpc(vdsServer.glusterVolumeGeoRepConfigList(volumeName,
slaveHost, slaveVolumeName));
+ return new
GlusterVolumeGeoRepConfigListXmlRpc(vdsServer.glusterVolumeGeoRepConfigList(volumeName,
+ slaveHost,
+ slaveVolumeName,
+ userName));
} catch(UndeclaredThrowableException ute) {
throw new XmlRpcRunTimeException(ute);
}
--
To view, visit https://gerrit.ovirt.org/40455
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fcdc7c29abb88916eacc048f2708ea68540134a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5-gluster
Gerrit-Owner: Sahina Bose <sab...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
