Change in vdsm[master]: vdsClient: hibernate now sends required hiberVolHandle

Martin Polednik has uploaded a new change for review.

Change subject: vdsClient: hibernate now sends required hiberVolHandle
......................................................................

vdsClient: hibernate now sends required hiberVolHandle

- vdsClient did not pass hiberVolHandle, causing it to fail any attempt
to hibernate
- BindigsXMLRPC defaulted required parameter to None

Change-Id: Id703a349bac7d75d3acb7e124392ac05d25e2869
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=802446
Signed-off-by: Martin Polednik <mpoledni(a)redhat.com&gt;
---
M client/vdsClient.py
M vdsm/BindingXMLRPC.py
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/80/18280/1

diff --git a/client/vdsClient.py b/client/vdsClient.py
index c52256a..cf93f00 100644
--- a/client/vdsClient.py
+++ b/client/vdsClient.py
@@ -382,8 +382,8 @@
         return self.ExecAndExit(self.s.sendkeys(vmId, args[1:]))
 
     def hibernate(self, args):
-        vmId = args[0]
-        response = self.s.hibernate(vmId)
+        vmId, hiberVolHandle = args[0], args[1]
+        response = self.s.hibernate(vmId, hiberVolHandle)
         print response['status']['message']
         sys.exit(response['status']['code'])
 
diff --git a/vdsm/BindingXMLRPC.py b/vdsm/BindingXMLRPC.py
index fb65ad4..20aaee1 100644
--- a/vdsm/BindingXMLRPC.py
+++ b/vdsm/BindingXMLRPC.py
@@ -360,7 +360,7 @@
         vm = API.VM(vmId)
         return vm.desktopSendHcCommand(message)
 
-    def vmHibernate(self, vmId, hiberVolHandle=None):
+    def vmHibernate(self, vmId, hiberVolHandle):
         vm = API.VM(vmId)
         return vm.hibernate(hiberVolHandle)
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id703a349bac7d75d3acb7e124392ac05d25e2869
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpoledni(a)redhat.com&gt;

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: vdsClient: hibernate now sends required hiberVolHandle
......................................................................


Patch Set 1:

Build Successful 

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

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/3922/ : SUCCESS

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Id703a349bac7d75d3acb7e124392ac05d25e2869
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Michal Skrivanek has posted comments on this change.

Change subject: vdsClient: hibernate now sends required hiberVolHandle
......................................................................


Patch Set 1:

(1 comment)

....................................................
File client/vdsClient.py
Line 2401:                       ('<vmId> <message>',
Line 2402:                        'Sends a message to a specific VM through Hypercall
'
Line 2403:                        'channel'
Line 2404:                        )),
Line 2405:         'hibernate': (serv.hibernate,
missed it;-)
Line 2406:                       ('<vmId>',
Line 2407:                        'Hibernates the desktop'
Line 2408:                        )),
Line 2409:         'monitorCommand': (serv.monitorCommand,


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

Gerrit-MessageType: comment
Gerrit-Change-Id: Id703a349bac7d75d3acb7e124392ac05d25e2869
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: vdsClient: hibernate now sends required hiberVolHandle
......................................................................


Patch Set 2:

Build Successful 

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

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

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/3928/ : SUCCESS

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Id703a349bac7d75d3acb7e124392ac05d25e2869
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Martin Polednik has posted comments on this change.

Change subject: vdsClient: hibernate now sends required hiberVolHandle
......................................................................


Patch Set 2: Verified+1

verified through functional tests - hiberVolHandle gets correctly passed to migrate() api
call

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Id703a349bac7d75d3acb7e124392ac05d25e2869
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Martin Polednik has posted comments on this change.

Change subject: vdsClient: hibernate now sends required hiberVolHandle
......................................................................


Patch Set 2: -Verified

keeping this open for S3/S4 sleep implementation

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Id703a349bac7d75d3acb7e124392ac05d25e2869
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: vdsClient: hibernate now sends required hiberVolHandle
......................................................................


Patch Set 2: Code-Review+2

(1 comment)

....................................................
File vdsm/BindingXMLRPC.py
Line 359:     def vmDesktopSendHcCommand(self, vmId, message):
Line 360:         vm = API.VM(vmId)
Line 361:         return vm.desktopSendHcCommand(message)
Line 362: 
Line 363:     def vmHibernate(self, vmId, hiberVolHandle):
This is fine as hibervolhandle is always sent in cluster level  3.x.
Line 364:         vm = API.VM(vmId)
Line 365:         return vm.hibernate(hiberVolHandle)
Line 366: 
Line 367:     def vmMonitorCommand(self, vmId, cmd):


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

Gerrit-MessageType: comment
Gerrit-Change-Id: Id703a349bac7d75d3acb7e124392ac05d25e2869
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Better Saggi <bettersaggi(a)gmail.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes

Martin Polednik has posted comments on this change.

Change subject: vdsClient: hibernate now sends required hiberVolHandle
......................................................................


Patch Set 2: Verified+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Id703a349bac7d75d3acb7e124392ac05d25e2869
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Better Saggi <bettersaggi(a)gmail.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: vdsClient: hibernate now sends required hiberVolHandle
......................................................................


Patch Set 2:

Fixes a small vdsClient bug.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Id703a349bac7d75d3acb7e124392ac05d25e2869
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Better Saggi <bettersaggi(a)gmail.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: vdsClient: hibernate now sends required hiberVolHandle
......................................................................


vdsClient: hibernate now sends required hiberVolHandle

- vdsClient did not pass hiberVolHandle, causing it to fail any attempt
to hibernate
- BindigsXMLRPC defaulted required parameter to None

Change-Id: Id703a349bac7d75d3acb7e124392ac05d25e2869
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=802446
Signed-off-by: Martin Polednik <mpoledni(a)redhat.com&gt;
Reviewed-on: http://gerrit.ovirt.org/18280
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M client/vdsClient.py
M vdsm/BindingXMLRPC.py
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Dan Kenigsberg: Looks good to me, approved
  Martin Polednik: Verified



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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id703a349bac7d75d3acb7e124392ac05d25e2869
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Better Saggi <bettersaggi(a)gmail.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server