Change in vdsm[master]: tests: Add a live merge functional test

2016-07-02 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: tests: Add a live merge functional test
..


Patch Set 1:

* Update tracker: IGNORE, no Bug-Url found

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Idd5a2f7eedaef9e90981256de66fc3ed21658e89
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Allon Mureinik 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Jenkins CI RO
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Yoav Kleinberger 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: tests: Add a live merge functional test

2016-07-02 Thread Jenkins CI RO 
Jenkins CI RO has abandoned this change.

Change subject: tests: Add a live merge functional test
..


Abandoned

Abandoned due to no activity - please restore if still relevant

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: Idd5a2f7eedaef9e90981256de66fc3ed21658e89
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Allon Mureinik 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Jenkins CI RO
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Yoav Kleinberger 
Gerrit-Reviewer: gerrit-hooks 
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: tests: Add a live merge functional test

2015-12-11 Thread alitke 
Adam Litke has restored this change.

Change subject: tests: Add a live merge functional test
..


Restored

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

Gerrit-MessageType: restore
Gerrit-Change-Id: Idd5a2f7eedaef9e90981256de66fc3ed21658e89
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Allon Mureinik 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Jenkins CI RO
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Yoav Kleinberger 
Gerrit-Reviewer: gerrit-hooks 
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: tests: Add a live merge functional test

2015-10-19 Thread Jenkins CI RO 
Jenkins CI RO has abandoned this change.

Change subject: tests: Add a live merge functional test
..


Abandoned

Abandoned due to no activity - please restore if still relevant

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: Idd5a2f7eedaef9e90981256de66fc3ed21658e89
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Allon Mureinik 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Jenkins CI RO
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Yoav Kleinberger 
Gerrit-Reviewer: automat...@ovirt.org
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: tests: Add a live merge functional test

2015-10-19 Thread automation 
automat...@ovirt.org has posted comments on this change.

Change subject: tests: Add a live merge functional test
..


Patch Set 1:

* Update tracker::IGNORE, no Bug-Url found

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Idd5a2f7eedaef9e90981256de66fc3ed21658e89
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Allon Mureinik 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Jenkins CI RO
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Yoav Kleinberger 
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: tests: Add a live merge functional test

2015-10-19 Thread Jenkins CI RO 
Jenkins CI RO has posted comments on this change.

Change subject: tests: Add a live merge functional test
..


Patch Set 1:

Abandoned due to no activity - please restore if still relevant

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Idd5a2f7eedaef9e90981256de66fc3ed21658e89
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Allon Mureinik 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Jenkins CI RO
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Yoav Kleinberger 
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: tests: Add a live merge functional test

2015-10-19 Thread nsoffer 
Nir Soffer has posted comments on this change.

Change subject: tests: Add a live merge functional test
..


Patch Set 1:

Please restore, we need such tests

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Idd5a2f7eedaef9e90981256de66fc3ed21658e89
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Allon Mureinik 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Jenkins CI RO
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Yoav Kleinberger 
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: tests: Add a live merge functional test

2014-07-14 Thread ykleinbe 
Yoav Kleinberger has posted comments on this change.

Change subject: tests: Add a live merge functional test
..


Patch Set 1:

(2 comments)

http://gerrit.ovirt.org/#/c/29824/1/tests/functional/utils.py
File tests/functional/utils.py:

Line 238: result = self.vdscli.getVolumeInfo(sdId, spId, imgId, volId)
Line 239: return result['status']['code'], result['status']['message'],\
Line 240: result['info']
Line 241: 
Line 242: def createVolume(self, sdId, spId, imgId, size, volFormat, 
preallocate,
OK Nir, I agree.
Line 243:  diskType, volId, desc, baseImgId, baseVolId):
Line 244: result = self.vdscli.createVolume(sdId, spId, imgId, size, 
volFormat,
Line 245:   preallocate, diskType, 
volId, desc,
Line 246:   baseImgId, baseVolId)


http://gerrit.ovirt.org/#/c/29824/1/tests/functional/virtTests.py
File tests/functional/virtTests.py:

Line 552:   jobId)
Line 553: jobIds.append(jobId)
Line 554: self._waitBlockJobs(vmId, jobIds)
Line 555: actual = self._getVolumeChains(vmId)
Line 556: self.assertEquals(chains, actual)
 The chance that you can sneak into the machines running this  test and inst
No one is going to mock VDSM. My point is that this doesn't really check what 
it should. On the other hand, all the other functional tests are the same. 
Waiting to hear what Adam has to say.


-- 
To view, visit http://gerrit.ovirt.org/29824
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idd5a2f7eedaef9e90981256de66fc3ed21658e89
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke ali...@redhat.com
Gerrit-Reviewer: Allon Mureinik amure...@redhat.com
Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com
Gerrit-Reviewer: Nir Soffer nsof...@redhat.com
Gerrit-Reviewer: Yoav Kleinberger yklei...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: tests: Add a live merge functional test

2014-07-14 Thread alitke 
Adam Litke has posted comments on this change.

Change subject: tests: Add a live merge functional test
..


Patch Set 1:

(3 comments)

http://gerrit.ovirt.org/#/c/29824/1/tests/functional/utils.py
File tests/functional/utils.py:

Line 238: result = self.vdscli.getVolumeInfo(sdId, spId, imgId, volId)
Line 239: return result['status']['code'], result['status']['message'],\
Line 240: result['info']
Line 241: 
Line 242: def createVolume(self, sdId, spId, imgId, size, volFormat, 
preallocate,
 OK Nir, I agree.
Yeah, personally I do not like this proxy at all.  I don't think it adds any 
value at all.  But I am using it because someone did like it this way and 
apparently some reviewers did at the time too.  I'd like to see it refactored 
and simplified once the cli switches to jsonRPC where we can also start 
verifying that the data returned actually conforms to the documented API schema.

Another battle for another day.
Line 243:  diskType, volId, desc, baseImgId, baseVolId):
Line 244: result = self.vdscli.createVolume(sdId, spId, imgId, size, 
volFormat,
Line 245:   preallocate, diskType, 
volId, desc,
Line 246:   baseImgId, baseVolId)


http://gerrit.ovirt.org/#/c/29824/1/tests/functional/virtTests.py
File tests/functional/virtTests.py:

Line 240: 
Line 241: @requireKVM
Line 242: @permutations([['localfs'], ['iscsi'], ['nfs']])
Line 243: def testVmWithStorage(self, backendType):
Line 244: disk = storageTests.StorageTest()
 Yea, this is a bit extreme. The common part should move to utils instead of
Agreed.  I just built on what other tests in this file are currently doing.  In 
a future revision I will try to factor it out a bit better.
Line 245: disk.setUp()
Line 246: conf = storageTests.storageLayouts[backendType]
Line 247: drives = disk.generateDriveConf(conf)
Line 248: customization = {'vmId': 
'----',


Line 552:   jobId)
Line 553: jobIds.append(jobId)
Line 554: self._waitBlockJobs(vmId, jobIds)
Line 555: actual = self._getVolumeChains(vmId)
Line 556: self.assertEquals(chains, actual)
 No one is going to mock VDSM. My point is that this doesn't really check wh
I agree that we should actually confirm that the operations have done what we 
expect by using qemu-io.  I just didn't get that far during the hackathon when 
I created this test.


-- 
To view, visit http://gerrit.ovirt.org/29824
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idd5a2f7eedaef9e90981256de66fc3ed21658e89
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke ali...@redhat.com
Gerrit-Reviewer: Adam Litke ali...@redhat.com
Gerrit-Reviewer: Allon Mureinik amure...@redhat.com
Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com
Gerrit-Reviewer: Nir Soffer nsof...@redhat.com
Gerrit-Reviewer: Yoav Kleinberger yklei...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: tests: Add a live merge functional test

2014-07-14 Thread ykleinbe 
Yoav Kleinberger has posted comments on this change.

Change subject: tests: Add a live merge functional test
..


Patch Set 1: -Code-Review

-- 
To view, visit http://gerrit.ovirt.org/29824
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idd5a2f7eedaef9e90981256de66fc3ed21658e89
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke ali...@redhat.com
Gerrit-Reviewer: Adam Litke ali...@redhat.com
Gerrit-Reviewer: Allon Mureinik amure...@redhat.com
Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com
Gerrit-Reviewer: Nir Soffer nsof...@redhat.com
Gerrit-Reviewer: Yoav Kleinberger yklei...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: tests: Add a live merge functional test

2014-07-13 Thread ykleinbe 
Yoav Kleinberger has posted comments on this change.

Change subject: tests: Add a live merge functional test
..


Patch Set 1: Code-Review-1

(3 comments)

http://gerrit.ovirt.org/#/c/29824/1/tests/functional/utils.py
File tests/functional/utils.py:

Line 237: def getVolumeInfo(self, sdId, spId, imgId, volId):
Line 238: result = self.vdscli.getVolumeInfo(sdId, spId, imgId, volId)
Line 239: return result['status']['code'], result['status']['message'],\
Line 240: result['info']
Line 241: 
quite a bit of code duplication. Usually I don't like metaprogramming, but 
perhaps introduce something like this:

class VDSMMethod:
_vdsm = VDSCli()
def __init__(self, returnKey):
self._returnKey = returnKey

def __call__(self, func):
this = self
def _decorated(self, *args, **kwargs):
methodName = func.__name__
method = getattr(this._vdsm, methodName)
result = method(*args, **kwargs)
return result['status']['code'], result['status']['message'], 
result[this._returnKey]

return _decorated

Now use this in VDSProxy

class VDSProxy(object):
@VDSMMethod(returnKey='uuid')
def createVolume(self): pass

@VDSMMethod(returnKey='uuid')
def deleteVolume(self): pass

@VDSMMethod(returnKey='vmList')
def list(self): pass
Line 242: def createVolume(self, sdId, spId, imgId, size, volFormat, 
preallocate,
Line 243:  diskType, volId, desc, baseImgId, baseVolId):
Line 244: result = self.vdscli.createVolume(sdId, spId, imgId, size, 
volFormat,
Line 245:   preallocate, diskType, 
volId, desc,


http://gerrit.ovirt.org/#/c/29824/1/tests/functional/virtTests.py
File tests/functional/virtTests.py:

Line 240: 
Line 241: @requireKVM
Line 242: @permutations([['localfs'], ['iscsi'], ['nfs']])
Line 243: def testVmWithStorage(self, backendType):
Line 244: disk = storageTests.StorageTest()
why is a StorageTest instance called a disk?

looks to me quite convoluted, using a test-case from a different test as a 
library for another test.
Line 245: disk.setUp()
Line 246: conf = storageTests.storageLayouts[backendType]
Line 247: drives = disk.generateDriveConf(conf)
Line 248: customization = {'vmId': 
'----',


Line 552:   jobId)
Line 553: jobIds.append(jobId)
Line 554: self._waitBlockJobs(vmId, jobIds)
Line 555: actual = self._getVolumeChains(vmId)
Line 556: self.assertEquals(chains, actual)
Looks like you assert that VDSM reports the result you expect. If this is true, 
this test does not actually check that anything happened - only that VDSM says 
it did.

In principle, I could shutdown VDSM, and install a fake server that tells this 
test what it wants to hear - and the test will pass, with no VDSM even running. 
Am I wrong?


-- 
To view, visit http://gerrit.ovirt.org/29824
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idd5a2f7eedaef9e90981256de66fc3ed21658e89
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke ali...@redhat.com
Gerrit-Reviewer: Allon Mureinik amure...@redhat.com
Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com
Gerrit-Reviewer: Nir Soffer nsof...@redhat.com
Gerrit-Reviewer: Yoav Kleinberger yklei...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: tests: Add a live merge functional test

2014-07-13 Thread nsoffer 
Nir Soffer has posted comments on this change.

Change subject: tests: Add a live merge functional test
..


Patch Set 1:

(1 comment)

Partial review

http://gerrit.ovirt.org/#/c/29824/1/tests/functional/utils.py
File tests/functional/utils.py:

Line 237: def getVolumeInfo(self, sdId, spId, imgId, volId):
Line 238: result = self.vdscli.getVolumeInfo(sdId, spId, imgId, volId)
Line 239: return result['status']['code'], result['status']['message'],\
Line 240: result['info']
Line 241: 
 quite a bit of code duplication. Usually I don't like metaprogramming, but 
There is indeed code duplication here, but Adam is trying to add a test, not 
fix the world.

The change you suggest or similar change should be fixed in a separate patch 
fixing all the utilities in this file, not only the few new calls added by this 
patch.

Please don't block important test just because it can be better.
Line 242: def createVolume(self, sdId, spId, imgId, size, volFormat, 
preallocate,
Line 243:  diskType, volId, desc, baseImgId, baseVolId):
Line 244: result = self.vdscli.createVolume(sdId, spId, imgId, size, 
volFormat,
Line 245:   preallocate, diskType, 
volId, desc,


-- 
To view, visit http://gerrit.ovirt.org/29824
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idd5a2f7eedaef9e90981256de66fc3ed21658e89
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke ali...@redhat.com
Gerrit-Reviewer: Allon Mureinik amure...@redhat.com
Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com
Gerrit-Reviewer: Nir Soffer nsof...@redhat.com
Gerrit-Reviewer: Yoav Kleinberger yklei...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: tests: Add a live merge functional test

2014-07-13 Thread nsoffer 
Nir Soffer has posted comments on this change.

Change subject: tests: Add a live merge functional test
..


Patch Set 1:

(2 comments)

http://gerrit.ovirt.org/#/c/29824/1/tests/functional/virtTests.py
File tests/functional/virtTests.py:

Line 240: 
Line 241: @requireKVM
Line 242: @permutations([['localfs'], ['iscsi'], ['nfs']])
Line 243: def testVmWithStorage(self, backendType):
Line 244: disk = storageTests.StorageTest()
 why is a StorageTest instance called a disk?
Yea, this is a bit extreme. The common part should move to utils instead of 
reusing a test.
Line 245: disk.setUp()
Line 246: conf = storageTests.storageLayouts[backendType]
Line 247: drives = disk.generateDriveConf(conf)
Line 248: customization = {'vmId': 
'----',


Line 552:   jobId)
Line 553: jobIds.append(jobId)
Line 554: self._waitBlockJobs(vmId, jobIds)
Line 555: actual = self._getVolumeChains(vmId)
Line 556: self.assertEquals(chains, actual)
 Looks like you assert that VDSM reports the result you expect. If this is t
The chance that you can sneak into the machines running this  test and install 
your fake vdsm is quite small :-)


-- 
To view, visit http://gerrit.ovirt.org/29824
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idd5a2f7eedaef9e90981256de66fc3ed21658e89
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke ali...@redhat.com
Gerrit-Reviewer: Allon Mureinik amure...@redhat.com
Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com
Gerrit-Reviewer: Nir Soffer nsof...@redhat.com
Gerrit-Reviewer: Yoav Kleinberger yklei...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: tests: Add a live merge functional test

2014-07-09 Thread alitke 
Adam Litke has uploaded a new change for review.

Change subject: tests: Add a live merge functional test
..

tests: Add a live merge functional test

Test whether we can successfully merge the active layer.  Uses lots of
the functional test infrastructure!  Only runs if vdsm says it can
support live merge.

Change-Id: Idd5a2f7eedaef9e90981256de66fc3ed21658e89
Signed-off-by: Adam Litke ali...@redhat.com
---
M tests/functional/utils.py
M tests/functional/virtTests.py
2 files changed, 185 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/24/29824/1

diff --git a/tests/functional/utils.py b/tests/functional/utils.py
index 494be98..e3cdba6 100644
--- a/tests/functional/utils.py
+++ b/tests/functional/utils.py
@@ -228,3 +228,41 @@
 def updateVmPolicy(self, vmId, vcpuLimit):
 result = self.vdscli.updateVmPolicy([vmId, vcpuLimit])
 return result['status']['code'], result['status']['message']
+
+def getTaskStatus(self, taskId):
+result = self.vdscli.getTaskStatus(taskId)
+return result['status']['code'], result['status']['message'],\
+result['taskStatus']
+
+def getVolumeInfo(self, sdId, spId, imgId, volId):
+result = self.vdscli.getVolumeInfo(sdId, spId, imgId, volId)
+return result['status']['code'], result['status']['message'],\
+result['info']
+
+def createVolume(self, sdId, spId, imgId, size, volFormat, preallocate,
+ diskType, volId, desc, baseImgId, baseVolId):
+result = self.vdscli.createVolume(sdId, spId, imgId, size, volFormat,
+  preallocate, diskType, volId, desc,
+  baseImgId, baseVolId)
+return result['status']['code'], result['status']['message'],\
+result['uuid']
+
+def deleteVolume(self, sdId, spId, imgId, volIds, postZero=False,
+ force=False):
+result = self.vdscli.deleteVolume(sdId, spId, imgId, volIds, postZero,
+  force)
+return result['status']['code'], result['status']['message'],\
+result['uuid']
+
+def snapshot(self, vmId, snapDrives, snapMemVolHandle=''):
+result = self.vdscli.snapshot(vmId, snapDrives, snapMemVolHandle)
+return result['status']['code'], result['status']['message']
+
+def merge(self, vmId, drive, base, top, bandwidth, jobId):
+result = self.vdscli.merge(vmId, drive, base, top, bandwidth, jobId)
+return result['status']['code'], result['status']['message']
+
+def list(self, fullStatus=False, vmList=()):
+result = self.vdscli.list(fullStatus, vmList)
+return result['status']['code'], result['status']['message'], \
+result['vmList']
diff --git a/tests/functional/virtTests.py b/tests/functional/virtTests.py
index 94ce240..b811b92 100644
--- a/tests/functional/virtTests.py
+++ b/tests/functional/virtTests.py
@@ -22,6 +22,7 @@
 import math
 import tempfile
 import logging
+import uuid
 from stat import S_IROTH
 from functools import partial, wraps
 
@@ -32,7 +33,8 @@
 from testrunner import temporaryPath
 
 from vdsm.utils import CommandPath, RollbackContext
-import storageTests as storage
+import storageTests
+import storage
 from storage.misc import execCmd
 
 from utils import VdsProxy, SUCCESS
@@ -109,6 +111,18 @@
 return method(self, *args, **kwargs)
 else:
 raise SkipTest('KVM is not enabled')
+return wrapped
+
+
+def requireLiveMerge(method):
+@wraps(method)
+def wrapped(self, *args, **kwargs):
+status, msg, result = self.vdsm.getVdsCapabilities()
+self.assertEqual(status, SUCCESS, msg)
+if result.get('liveMerge') == 'true':
+return method(self, *args, **kwargs)
+else:
+raise SkipTest('Live Merge is not available')
 return wrapped
 
 
@@ -227,9 +241,9 @@
 @requireKVM
 @permutations([['localfs'], ['iscsi'], ['nfs']])
 def testVmWithStorage(self, backendType):
-disk = storage.StorageTest()
+disk = storageTests.StorageTest()
 disk.setUp()
-conf = storage.storageLayouts[backendType]
+conf = storageTests.storageLayouts[backendType]
 drives = disk.generateDriveConf(conf)
 customization = {'vmId': '----',
  'vmName': 'testVmWithStorage' + backendType,
@@ -247,8 +261,8 @@
 def testVmWithDevice(self, *devices):
 customization = {'vmId': '----',
  'vmName': 'testVm', 'devices': [], 'display': 'vnc'}
-storageLayout = storage.storageLayouts['localfs']
-diskSpecs = storage.StorageTest.generateDriveConf(storageLayout)
+storageLayout = storageTests.storageLayouts['localfs']
+

Change in vdsm[master]: tests: Add a live merge functional test

2014-07-09 Thread oVirt Jenkins CI Server 
oVirt Jenkins CI Server has posted comments on this change.

Change subject: tests: Add a live merge functional test
..


Patch Set 1:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/10117/ : SUCCESS

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

http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/1208/ : 
There was an infra issue, please contact in...@ovirt.org

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/11059/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/1618/ 
: There was an infra issue, please contact in...@ovirt.org

-- 
To view, visit http://gerrit.ovirt.org/29824
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idd5a2f7eedaef9e90981256de66fc3ed21658e89
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke ali...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches