Change in vdsm[master]: tests: incorporate pool id in file domain path

nsoffer at redhat.com nsoffer at redhat.com
Mon Mar 14 19:39:40 UTC 2016


Nir Soffer has submitted this change and it was merged.

Change subject: tests: incorporate pool id in file domain path
......................................................................


tests: incorporate pool id in file domain path

In real environments, an image 'A' in a file domain would appear in the
following directory path:

    /<storage-repo>/<pool-id>/<domain-id>/images/A

Prior to this patch the helper function make_filesd_manifest was
creating the structure:

    /<storage-repo>/<domain-id>/images/A

This obviously doesn't agree and needs to be fixed.  The solution is to
generate a spuuid in make_filesd_manifest and construct the metadata
appropriately and then initialize the domain manifest with the path that
includes the pool id.

To make sure this works for all callers, prohibit callers from passing
in their own domain metadata.  Only one test needed to be fixed to make
this change.

Change-Id: I1bac433a081b058eec4e1897ea85e698850abb2f
Signed-off-by: Adam Litke <alitke at redhat.com>
Reviewed-on: https://gerrit.ovirt.org/54565
Continuous-Integration: Jenkins CI
Reviewed-by: Nir Soffer <nsoffer at redhat.com>
---
M tests/domain_manifest_test.py
M tests/storagetestlib.py
2 files changed, 13 insertions(+), 9 deletions(-)

Approvals:
  Adam Litke: Verified
  Nir Soffer: Looks good to me, approved
  Jenkins CI: Passed CI tests



-- 
To view, visit https://gerrit.ovirt.org/54565
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1bac433a081b058eec4e1897ea85e698850abb2f
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <alitke at redhat.com>
Gerrit-Reviewer: Adam Litke <alitke at redhat.com>
Gerrit-Reviewer: Ala Hino <ahino at redhat.com>
Gerrit-Reviewer: Amit Aviram <aaviram at redhat.com>
Gerrit-Reviewer: Daniel Erez <derez at redhat.com>
Gerrit-Reviewer: Freddy Rolland <frolland at redhat.com>
Gerrit-Reviewer: Idan Shaby <ishaby at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Maor Lipchuk <mlipchuk at redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer at redhat.com>
Gerrit-Reviewer: Vered Volansky <vvolansk at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>


More information about the vdsm-patches mailing list