Piotr Kliczewski has submitted this change and it was merged. Change subject: core: Use the hosted storage domain id instead of name when importing it ...................................................................... core: Use the hosted storage domain id instead of name when importing it When importing hosted storage domain the system relied on a hardcoded name: "hosted_storage". Instead of using that constant to find and import the domain the code is now using the domain id that is reported by vdsm in the vm data. The system verifies that a hosted engine VM is running on a storage domain to determine if that domain is a hosted engine domain. Change-Id: Iad7c5f4e5557e4c861e5a2317c79bc3fae874e70 Bug-Url: https://bugzilla.redhat.com/1301105 Signed-off-by: Jenny Tokar <jtokar@redhat.com> (cherry picked from commit 31d8036) --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HostedEngineImporter.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostedengine/HostedEngineHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/GetStorageDomainsWithAttachedStoragePoolGuidQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/ImportHostedEngineStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/StorageDomainCommandBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/domain/AddExistingBlockStorageDomainCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/domain/AddExistingFileStorageDomainCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/domain/GetStorageDomainsWithAttachedStoragePoolGuidQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/domain/ImportHostedEngineStorageDomainCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/domain/StorageDomainCommandBaseTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/StorageConstants.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java A packaging/dbscripts/upgrade/04_00_0800_remove_hosted_engine_storage_domain_name_config_value.sql M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql M packaging/etc/engine-config/engine-config.properties 16 files changed, 106 insertions(+), 116 deletions(-) Approvals: Jenkins CI: Passed CI tests Roy Golan: Looks good to me, approved Jenny Tokar: Verified -- To view, visit https://gerrit.ovirt.org/60255 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad7c5f4e5557e4c861e5a2317c79bc3fae874e70 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-4.0 Gerrit-Owner: Jenny Tokar <jtokar@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar@redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski@gmail.com> Gerrit-Reviewer: Roy Golan <rgolan@redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>