Shubhendu Tripathi has uploaded a new change for review.
Change subject: gluster: Adhere to vdsm verb glusterServicesAction
......................................................................
gluster: Adhere to vdsm verb glusterServicesAction
The VDSM verb to perform the gluster service action is modified to
glusterServicesAction. Changed the BLL code to adhere to the new
signature of the verb.
Change-Id: Ic89e819845e0945af4852f4516a46a488aa82d4b
Signed-off-by: Shubhendu Tripathi <shtri...@redhat.com>
---
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ManageGlusterServiceCommandTest.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/AbstractGlusterBrokerCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ManageGlusterServiceVDSCommand.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
8 files changed, 14 insertions(+), 25 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/16840/1
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ManageGlusterServiceCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ManageGlusterServiceCommandTest.java
index 721023d..9b23686 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ManageGlusterServiceCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ManageGlusterServiceCommandTest.java
@@ -377,7 +377,7 @@
ServiceType.GLUSTER_SWIFT,
GlusterConstants.MANAGE_GLUSTER_SERVICE_ACTION_TYPE_START)));
setUpMockUpForStart();
- mockBackend(false, VdcBllErrors.GlusterServiceManageFailed,
GlusterServiceStatus.STOPPED);
+ mockBackend(false, VdcBllErrors.GlusterServicesOperationFailed,
GlusterServiceStatus.STOPPED);
cmd.executeCommand();
verify(serverServiceDao,
never()).updateByServerIdAndServiceType(any(GlusterServerService.class));
assertEquals(cmd.getAuditLogTypeValue(),
AuditLogType.GLUSTER_SERVICE_START_FAILED);
@@ -391,7 +391,7 @@
ServiceType.GLUSTER_SWIFT,
GlusterConstants.MANAGE_GLUSTER_SERVICE_ACTION_TYPE_STOP)));
setUpMockUpForStart();
- mockBackend(false, VdcBllErrors.GlusterServiceManageFailed,
GlusterServiceStatus.RUNNING);
+ mockBackend(false, VdcBllErrors.GlusterServicesOperationFailed,
GlusterServiceStatus.RUNNING);
cmd.executeCommand();
verify(serverServiceDao,
never()).updateByServerIdAndServiceType(any(GlusterServerService.class));
assertEquals(cmd.getAuditLogTypeValue(),
AuditLogType.GLUSTER_SERVICE_STOP_FAILED);
@@ -405,7 +405,7 @@
ServiceType.GLUSTER_SWIFT,
GlusterConstants.MANAGE_GLUSTER_SERVICE_ACTION_TYPE_RESTART)));
setUpMockUpForStart();
- mockBackend(false, VdcBllErrors.GlusterServiceManageFailed,
GlusterServiceStatus.RUNNING);
+ mockBackend(false, VdcBllErrors.GlusterServicesOperationFailed,
GlusterServiceStatus.RUNNING);
cmd.executeCommand();
verify(serverServiceDao,
never()).updateByServerIdAndServiceType(any(GlusterServerService.class));
assertEquals(cmd.getAuditLogTypeValue(),
AuditLogType.GLUSTER_SERVICE_RESTART_FAILED);
@@ -419,7 +419,7 @@
ServiceType.GLUSTER_SWIFT,
GlusterConstants.MANAGE_GLUSTER_SERVICE_ACTION_TYPE_START)));
setUpMockUpForStart();
- mockBackend(false, VdcBllErrors.GlusterServiceManageFailed,
GlusterServiceStatus.STOPPED);
+ mockBackend(false, VdcBllErrors.GlusterServicesOperationFailed,
GlusterServiceStatus.STOPPED);
cmd.executeCommand();
verify(serverServiceDao,
never()).updateByServerIdAndServiceType(any(GlusterServerService.class));
assertEquals(cmd.getAuditLogTypeValue(),
AuditLogType.GLUSTER_SERVICE_START_FAILED);
@@ -433,7 +433,7 @@
ServiceType.GLUSTER_SWIFT,
GlusterConstants.MANAGE_GLUSTER_SERVICE_ACTION_TYPE_STOP)));
setUpMockUpForStart();
- mockBackend(false, VdcBllErrors.GlusterServiceManageFailed,
GlusterServiceStatus.RUNNING);
+ mockBackend(false, VdcBllErrors.GlusterServicesOperationFailed,
GlusterServiceStatus.RUNNING);
cmd.executeCommand();
verify(serverServiceDao,
never()).updateByServerIdAndServiceType(any(GlusterServerService.class));
assertEquals(cmd.getAuditLogTypeValue(),
AuditLogType.GLUSTER_SERVICE_STOP_FAILED);
@@ -447,7 +447,7 @@
ServiceType.GLUSTER_SWIFT,
GlusterConstants.MANAGE_GLUSTER_SERVICE_ACTION_TYPE_RESTART)));
setUpMockUpForStart();
- mockBackend(false, VdcBllErrors.GlusterServiceManageFailed,
GlusterServiceStatus.RUNNING);
+ mockBackend(false, VdcBllErrors.GlusterServicesOperationFailed,
GlusterServiceStatus.RUNNING);
cmd.executeCommand();
verify(serverServiceDao,
never()).updateByServerIdAndServiceType(any(GlusterServerService.class));
assertEquals(cmd.getAuditLogTypeValue(),
AuditLogType.GLUSTER_SERVICE_RESTART_FAILED);
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 7eb7175..03ea888 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
@@ -380,10 +380,8 @@
GlusterHookChecksumMismatch(4508),
GlusterHookAddFailed(4509),
GlusterHookRemoveFailed(4510),
- GlusterServicesFailed(4550),
+ GlusterServicesOperationFailed(4550),
GlusterServiceActionNotSupported(4551),
- GlusterServiceManageFailed(4552),
- GlusterServiceNotSupported(4553),
UnicodeArgumentException(4900),
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 8ee2a43..d638da5 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
@@ -56,10 +56,8 @@
case GlusterHookChecksumMismatch:
case GlusterHookAddFailed:
case GlusterHookRemoveFailed:
- case GlusterServicesFailed:
+ case GlusterServicesOperationFailed:
case GlusterServiceActionNotSupported:
- case GlusterServiceManageFailed:
- case GlusterServiceNotSupported:
// Capture error from gluster command and record failure
getVDSReturnValue().setVdsError(new VDSError(returnStatus,
getReturnStatus().mMessage));
getVDSReturnValue().setSucceeded(false);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ManageGlusterServiceVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ManageGlusterServiceVDSCommand.java
index d41ef15..83d36f5 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ManageGlusterServiceVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ManageGlusterServiceVDSCommand.java
@@ -27,8 +27,7 @@
returnValue =
getBroker().glusterServiceManage(getParameters().getVdsId(),
serviceNameList,
- getParameters().getActionType(),
- false);
+ getParameters().getActionType());
ProceedProxyReturnValue();
if (getVDSReturnValue().getSucceeded()) {
setReturnValue(returnValue.getServices());
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 e3f6e01..b912367 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
@@ -252,5 +252,5 @@
StatusOnlyReturnForXmlRpc glusterHookRemove(String glusterCommand, String
stage, String hookName);
- GlusterServicesReturnForXmlRpc glusterServiceManage(Guid serverId, String
[] serviceList, String actionType, boolean failOnError);
+ GlusterServicesReturnForXmlRpc glusterServiceManage(Guid serverId, String
[] serviceList, String actionType);
}
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 0132dbe..4f88c0f 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
@@ -239,5 +239,5 @@
public Map<String,Object> glusterHookRemove(String glusterCommand, String
stage, String hookName);
- public Map<String, Object> glusterServicesManage(String[] serviceNames,
String action, boolean failOnError);
+ public Map<String, Object> glusterServicesAction(String[] serviceNames,
String action);
}
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 3977428..66c1264 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
@@ -1222,9 +1222,9 @@
}
@Override
- public GlusterServicesReturnForXmlRpc glusterServiceManage(Guid serverId,
String [] serviceList, String actionType, boolean failOnError) {
+ public GlusterServicesReturnForXmlRpc glusterServiceManage(Guid serverId,
String [] serviceList, String actionType) {
try {
- Map<String, Object> xmlRpcReturnValue =
vdsServer.glusterServicesManage(serviceList, actionType, failOnError);
+ Map<String, Object> xmlRpcReturnValue =
vdsServer.glusterServicesAction(serviceList, actionType);
GlusterServicesReturnForXmlRpc wrapper = new
GlusterServicesReturnForXmlRpc(serverId, xmlRpcReturnValue);
return wrapper;
} catch (UndeclaredThrowableException ute) {
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 f887e87..a3ac775 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
@@ -768,14 +768,8 @@
String GlusterHookRemoveFailed();
@DefaultStringValue("Gluster service operation failed")
- String GlusterServicesFailed();
+ String GlusterServicesOperationFailed();
@DefaultStringValue("Gluster service action not supported")
String GlusterServiceActionNotSupported();
-
- @DefaultStringValue("Manage (start/stop/restart) service failed")
- String GlusterServiceManageFailed();
-
- @DefaultStringValue("Gluster service not supported")
- String GlusterServiceNotSupported();
}
--
To view, visit http://gerrit.ovirt.org/16840
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic89e819845e0945af4852f4516a46a488aa82d4b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shubhendu Tripathi <shtri...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
