Maor Lipchuk has uploaded a new change for review. Change subject: core: Use GetExistingStorageDomainList to fetch all type of Storages ......................................................................
core: Use GetExistingStorageDomainList to fetch all type of Storages Use GetExistingStorageDomainList to fetch different tpye of storage type, so user can manipulate the Storage Domain type while importing it. Change-Id: If3a082e0bddaad745788b9b166f2b17eff0fbd17 Bug-Url: https://bugzilla.redhat.com/1157240 Signed-off-by: Maor Lipchuk <[email protected]> --- 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/HSMGetStorageDomainsListVDSCommand.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 5 files changed, 10 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/35109/1 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 59c249c..e14877c 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 @@ -659,7 +659,7 @@ @Override public StorageDomainListReturnForXmlRpc getStorageDomainsList(String spUUID, int domainType, - int poolType, + String poolType, String path) { JsonRpcRequest request = new RequestBuilder("Host.getStorageDomains").withParameter("storagepoolID", spUUID) diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainsListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainsListVDSCommand.java index cd387b0..81e4b5d 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainsListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainsListVDSCommand.java @@ -14,9 +14,12 @@ @Override protected void executeVdsBrokerCommand() { - _result = getBroker().getStorageDomainsList(getParameters().getStoragePoolId().toString(), - getParameters().getStorageDomainType().getValue(), getParameters().getStorageType().getValue(), - ((getParameters().getPath()) != null) ? getParameters().getPath() : ""); + _result = + getBroker().getStorageDomainsList(getParameters().getStoragePoolId().toString(), + getParameters().getStorageDomainType().getValue(), + getParameters().getStorageType() != null ? Integer.valueOf(getParameters().getStorageType() + .getValue()).toString() : "", + ((getParameters().getPath()) != null) ? getParameters().getPath() : ""); proceedProxyReturnValue(); ArrayList<Guid> domains = new ArrayList<Guid>(); 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 839efd4..89f3404 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 @@ -130,7 +130,7 @@ OneStorageDomainInfoReturnForXmlRpc getStorageDomainInfo(String sdUUID); - StorageDomainListReturnForXmlRpc getStorageDomainsList(String spUUID, int domainType, int poolType, String path); + StorageDomainListReturnForXmlRpc getStorageDomainsList(String spUUID, int domainType, String poolType, String path); FileStatsReturnForXmlRpc getIsoList(String spUUID); 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..cc778ae 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 @@ -112,7 +112,7 @@ public Map<String, Object> getStorageDomainInfo(String sdUUID); - public Map<String, Object> getStorageDomainsList(String spUUID, int domainType, int poolType, String path); + public Map<String, Object> getStorageDomainsList(String spUUID, int domainType, String poolType, String path); public Map<String, Object> getIsoList(String spUUID); 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 14e49c1..5f43faf 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 @@ -576,7 +576,7 @@ } @Override - public StorageDomainListReturnForXmlRpc getStorageDomainsList(String sdUUID, int domainType, int poolType, + public StorageDomainListReturnForXmlRpc getStorageDomainsList(String sdUUID, int domainType, String poolType, String path) { try { Map<String, Object> xmlRpcReturnValue = vdsServer.getStorageDomainsList(sdUUID, domainType, poolType, path); -- To view, visit http://gerrit.ovirt.org/35109 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If3a082e0bddaad745788b9b166f2b17eff0fbd17 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
