Ramesh N has uploaded a new change for review. Change subject: gluster: add 'gluster' prefix to getStorageDeviceList method ......................................................................
gluster: add 'gluster' prefix to getStorageDeviceList method Add 'gluster' prefix to getStorageDeviceList method in IVdsServer. Change-Id: Ia053fd11c2c8b8ef3faddcfb1660c55a1cbf56bf Signed-off-by: Ramesh Nachimuthu <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetStorageDeviceListVDSCommand.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/VdsServerWrapper.java 4 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/93/40193/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetStorageDeviceListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetStorageDeviceListVDSCommand.java index 55eb09a..fa1794e 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetStorageDeviceListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetStorageDeviceListVDSCommand.java @@ -13,7 +13,7 @@ @Override protected void executeVdsBrokerCommand() { - result = getBroker().getStorageDeviceList(); + result = getBroker().glusterStorageDeviceList(); proceedProxyReturnValue(); setReturnValue(result.getStorageDevices()); 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 8cd1fb9..2c79f95 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 @@ -1768,9 +1768,9 @@ } @Override - public StorageDeviceListReturnForXmlRpc getStorageDeviceList() { + public StorageDeviceListReturnForXmlRpc glusterStorageDeviceList() { JsonRpcRequest request = new RequestBuilder("GlusterHost.storageDevicesList").build(); - Map<String, Object> response = new FutureMap(this.client, request).withResponseKey("deviceInfo"); + Map<String, Object> response = new FutureMap(this.client, request).withIgnoreResponseKey(); return new StorageDeviceListReturnForXmlRpc(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 dece28d..d8ef0e9 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 @@ -154,7 +154,6 @@ LUNListReturnForXmlRpc getDeviceList(int storageType); - StorageDeviceListReturnForXmlRpc getStorageDeviceList(); DevicesVisibilityMapReturnForXmlRpc getDevicesVisibility(String[] devicesList); @@ -388,4 +387,6 @@ Map<String, Object> raidParams, String fsType, String[] storageDevices); + + StorageDeviceListReturnForXmlRpc glusterStorageDeviceList(); } 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 755debd..20f79f1 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 @@ -1732,7 +1732,7 @@ } @Override - public StorageDeviceListReturnForXmlRpc getStorageDeviceList() { + public StorageDeviceListReturnForXmlRpc glusterStorageDeviceList() { try { Map<String, Object> xmlRpcReturnValue = vdsServer.glusterStorageDevicesList(); StorageDeviceListReturnForXmlRpc wrapper = new StorageDeviceListReturnForXmlRpc(xmlRpcReturnValue); -- To view, visit https://gerrit.ovirt.org/40193 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia053fd11c2c8b8ef3faddcfb1660c55a1cbf56bf Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5-gluster Gerrit-Owner: Ramesh N <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
