Liron Aravot has uploaded a new change for review. Change subject: core: when vds isn't in storage pool, send all connection params ......................................................................
core: when vds isn't in storage pool, send all connection params when vds isn't a part of storage pool, not all connection parameters were sent which didn't allow to connect to the storage server. Change-Id: I67ae1418a7b879a3f0b57426d0574fcb673b2e26 Bug-Url: https://bugzilla.redhat.com/903276 Signed-off-by: Liron Aravot <lara...@redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java 1 file changed, 3 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/11528/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java index 0ce1a89..c76785e 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java @@ -61,11 +61,9 @@ con.put("user", connection.getuser_name(), ""); con.put("password", connection.getpassword(), ""); - // storage_pool can be null when discovering iscsi send targets - if (storage_pool == null) { - con.putIfNotEmpty("vfs_type", connection.getVfsType()); - } - else if (Config.<Boolean> GetValue(ConfigValues.AdvancedNFSOptionsEnabled, + // storage_pool can be null when discovering iscsi send targets or when connecting + // through vds which has no storage pool + if (storage_pool == null || Config.<Boolean> GetValue(ConfigValues.AdvancedNFSOptionsEnabled, storage_pool.getcompatibility_version().getValue())) { // For mnt_options, vfs_type, and protocol_version - if they are null // or empty we should not send a key with an empty value -- To view, visit http://gerrit.ovirt.org/11528 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I67ae1418a7b879a3f0b57426d0574fcb673b2e26 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Aravot <lara...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
