Change in vdsm[master]: hsm: encapsulate devPath in appropriateDevice

Daniel Erez has uploaded a new change for review.

Change subject: hsm: encapsulate devPath in appropriateDevice
......................................................................

hsm: encapsulate devPath in appropriateDevice

As a continuation of Ie0d4d805ca333990ea1f612eb03a87f4a505f4a8,
appropriateDevice method now returns devPath as well.

Change-Id: Iaf8f53999bde70eb4b2b1b0a927c9412d4597134
Signed-off-by: Daniel Erez 
---
M vdsm/clientIF.py
M vdsm/storage/hsm.py
2 files changed, 2 insertions(+), 2 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/24406/1

diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index 464d6e1..fe339bb 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -271,7 +271,7 @@
                 drive["truesize"] = res['truesize']
                 drive["apparentsize"] = res['apparentsize']

-                volPath = os.path.join("/dev/mapper", drive["GUID"])
+                volPath = res['devPath']

# UUID drive format
             elif "UUID" in drive:
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 9420931..18e6555 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -3112,7 +3112,7 @@
         # that use it to overcome xmlrpc integer size limitation issues.
         size = str(multipath.getDeviceSize(devicemapper.getDmId(guid)))

-        return dict(truesize=size, apparentsize=size)
+        return dict(truesize=size, apparentsize=size, devPath=devPath)

@public
     def inappropriateDevices(self, thiefId):

Daniel Erez has posted comments on this change.

Change subject: hsm: encapsulate devPath in appropriateDevice
......................................................................

Patch Set 1: Verified+1

[Nir Soffer]

Nir Soffer has posted comments on this change.

Change subject: hsm: encapsulate devPath in appropriateDevice
......................................................................

Patch Set 1:

(1 comment)

http://gerrit.ovirt.org/#/c/24406/1/vdsm/clientIF.py
File vdsm/clientIF.py:

Line 270:                 # Update size for LUN volume
Line 271:                 drive["truesize"] = res['truesize']
Line 272:                 drive["apparentsize"] = res['apparentsize']
Line 273: 
Line 274:                 volPath = res['devPath']
Why not use "path" - just like prepareImage used for PDIV format?

We want to unify the names (appropriateDevice -> prepareDevice), and having both methods return a "path" key will make them more consistent and easier to use.
Line 275: 
Line 276:             # UUID drive format
Line 277:             elif "UUID" in drive:
Line 278:                 volPath = self._getUUIDSpecPath(drive["UUID"])

Daniel Erez has posted comments on this change.

Change subject: hsm: encapsulate devPath in appropriateDevice
......................................................................

Patch Set 1:

(1 comment)

http://gerrit.ovirt.org/#/c/24406/1/vdsm/clientIF.py
File vdsm/clientIF.py:

Line 270:                 # Update size for LUN volume
Line 271:                 drive["truesize"] = res['truesize']
Line 272:                 drive["apparentsize"] = res['apparentsize']
Line 273: 
Line 274:                 volPath = res['devPath']
> Why not use "path" - just like prepareImage used for PDIV format?

Done
Line 275: 
Line 276:             # UUID drive format
Line 277:             elif "UUID" in drive:
Line 278:                 volPath = self._getUUIDSpecPath(drive["UUID"])

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: hsm: encapsulate devPath in appropriateDevice
......................................................................

Patch Set 2:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7223/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6333/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7117/ : SUCCESS

Daniel Erez has posted comments on this change.

Change subject: hsm: encapsulate devPath in appropriateDevice
......................................................................

Patch Set 2: Verified+1

[Nir Soffer]

Nir Soffer has posted comments on this change.

Change subject: hsm: encapsulate devPath in appropriateDevice
......................................................................

Patch Set 2:

(2 comments)

The commit message should be updated.

http://gerrit.ovirt.org/#/c/24406/2//COMMIT_MSG
Commit Message:

Line 3: AuthorDate: 2014-02-12 18:02:49 +0200
Line 4: Commit:     Daniel Erez 
Line 5: CommitDate: 2014-02-13 08:15:52 +0200
Line 6: 
Line 7: hsm: encapsulate devPath in appropriateDevice
devPath -> path
Line 8: 
Line 9: As a continuation of Ie0d4d805ca333990ea1f612eb03a87f4a505f4a8,
Line 10: appropriateDevice method now returns devPath as well.
Line 11:

Line 6: 
Line 7: hsm: encapsulate devPath in appropriateDevice
Line 8: 
Line 9: As a continuation of Ie0d4d805ca333990ea1f612eb03a87f4a505f4a8,
Line 10: appropriateDevice method now returns devPath as well.
devPath -> path
Line 11: 
Line 12: Change-Id: Iaf8f53999bde70eb4b2b1b0a927c9412d4597134

Change in vdsm[master]: hsm: encapsulate path in appropriateDevice

[Federico Simoncelli]

Federico Simoncelli has posted comments on this change.

Change subject: hsm: encapsulate path in appropriateDevice
......................................................................

Patch Set 4: Code-Review+2

Neat.

Change in vdsm[master]: hsm: encapsulate path in appropriateDevice

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: hsm: encapsulate path in appropriateDevice
......................................................................

Patch Set 4: Code-Review+1

Change in vdsm[master]: hsm: encapsulate path in appropriateDevice

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: hsm: encapsulate path in appropriateDevice
......................................................................

Patch Set 3:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7227/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6337/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7121/ : SUCCESS

Change in vdsm[master]: hsm: encapsulate path in appropriateDevice

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: hsm: encapsulate path in appropriateDevice
......................................................................

Patch Set 4:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7228/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6338/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7122/ : SUCCESS

Change in vdsm[master]: hsm: encapsulate path in appropriateDevice

[Nir Soffer]

Nir Soffer has posted comments on this change.

Change subject: hsm: encapsulate path in appropriateDevice
......................................................................

Patch Set 4: Code-Review+1

Change in vdsm[master]: hsm: encapsulate path in appropriateDevice

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: hsm: encapsulate path in appropriateDevice
......................................................................

hsm: encapsulate path in appropriateDevice

As a continuation of Ie0d4d805ca333990ea1f612eb03a87f4a505f4a8,
appropriateDevice method now returns 'path' as well.

Change-Id: Iaf8f53999bde70eb4b2b1b0a927c9412d4597134
Signed-off-by: Daniel Erez 
Reviewed-on: http://gerrit.ovirt.org/24406
Reviewed-by: Federico Simoncelli 
Reviewed-by: Dan Kenigsberg 
Reviewed-by: Nir Soffer 
---
M vdsm/clientIF.py
M vdsm/storage/hsm.py
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Nir Soffer: Looks good to me, but someone else must approve
  Federico Simoncelli: Looks good to me, approved
  Daniel Erez: Verified
  Dan Kenigsberg: Looks good to me, but someone else must approve