Maor Lipchuk has uploaded a new change for review. Change subject: restapi: Query FCP unregistered Storage Domains ......................................................................
restapi: Query FCP unregistered Storage Domains If the user does not apply iscsi address then we assume that we want to query FCP Storage Change-Id: Iafe2f2afcd0e6e68adbbbb2054c857388acc30a7 Bug-Url: https://bugzilla.redhat.com/ Signed-off-by: Maor Lipchuk <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java 1 file changed, 12 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/38512/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java index 19116f3..2b9eacf 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java @@ -283,19 +283,24 @@ @Override public Response unregisteredStorageDomainsDiscover(Action action) { - validateParameters(action, "iscsi.address"); + StorageType storageType = StorageType.ISCSI; + IscsiDetails iscsiDetails = action.getIscsi(); + if ((iscsiDetails != null) && (iscsiDetails.getAddress() != null)) { + storageType = StorageType.FCP; + } // Validate if the Host exists. getEntity(); List<StorageServerConnections> storageServerConnections = new ArrayList<>(); - for (String iscsiTarget : action.getIscsiTargets()) { - StorageServerConnections connectionDetails = getInitializedConnectionIscsiDetails(action); - connectionDetails.setiqn(iscsiTarget); - storageServerConnections.add(connectionDetails); + if (storageType == StorageType.ISCSI) { + for (String iscsiTarget : action.getIscsiTargets()) { + StorageServerConnections connectionDetails = getInitializedConnectionIscsiDetails(action); + connectionDetails.setiqn(iscsiTarget); + storageServerConnections.add(connectionDetails); + } } GetUnregisteredBlockStorageDomainsParameters unregisteredBlockStorageDomainsParameters = - new GetUnregisteredBlockStorageDomainsParameters(guid, StorageType.ISCSI, storageServerConnections); - + new GetUnregisteredBlockStorageDomainsParameters(guid, storageType, storageServerConnections); try { Pair<List<StorageDomain>, List<StorageServerConnections>> pair = getEntity(Pair.class, -- To view, visit https://gerrit.ovirt.org/38512 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iafe2f2afcd0e6e68adbbbb2054c857388acc30a7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
