Change in vdsm[ovirt-3.6]: virt: Correct disconnectAction parameter extraction
Francesco Romani has submitted this change and it was merged. Change subject: virt: Correct disconnectAction parameter extraction .. virt: Correct disconnectAction parameter extraction The disconnectAction has previously never been passed to the _setTicketForGraphicDev method. This patch fixes this oversight. Bug-Url: https://bugzilla.redhat.com/1371264 Change-Id: Ia1695a56d3f7e68f8f9b8d2a929775edc4570985 Signed-off-by: Vinzenz Feenstra Reviewed-on: https://gerrit.ovirt.org/59692 Reviewed-by: Milan Zamazal Continuous-Integration: Jenkins CI Reviewed-by: Francesco Romani Reviewed-on: https://gerrit.ovirt.org/63974 --- M vdsm/virt/vm.py 1 file changed, 7 insertions(+), 6 deletions(-) Approvals: Jenkins CI: Passed CI tests Vinzenz Feenstra: Verified Francesco Romani: Looks good to me, approved Milan Zamazal: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/63974 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia1695a56d3f7e68f8f9b8d2a929775edc4570985 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Vinzenz Feenstra Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Milan Zamazal Gerrit-Reviewer: Vinzenz Feenstra Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-3.6]: virt: Correct disconnectAction parameter extraction
gerrit-hooks has posted comments on this change. Change subject: virt: Correct disconnectAction parameter extraction .. Patch Set 5: * #1371264::Update tracker: OK * Set MODIFIED::bug 1371264#1371264OK -- To view, visit https://gerrit.ovirt.org/63974 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia1695a56d3f7e68f8f9b8d2a929775edc4570985 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Vinzenz Feenstra Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Milan Zamazal Gerrit-Reviewer: Vinzenz Feenstra Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-3.6]: virt: Correct disconnectAction parameter extraction
Vinzenz Feenstra has posted comments on this change. Change subject: virt: Correct disconnectAction parameter extraction .. Patch Set 4: - Made RPMS on el7 from the this 'branch' and installed those RPMS - Started a VM with guest agent (@WinXP) on this host - In the admin portal set Console / Console Disconnect Action (CDA) to 'Logout user' - Connect via Spice to vm and login, start some application - Close spice console - Reopen spice console => login again (And the started application won't be there) - Close spice console - In the admin portal set Console / Console Disconnect Action (CDA) to 'Lock screen' - Connect via Spice to vm and login, start some application - Close spice console - Reopen spice console => Re-enter credentials application still running (Was locked) -- To view, visit https://gerrit.ovirt.org/63974 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia1695a56d3f7e68f8f9b8d2a929775edc4570985 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Vinzenz Feenstra Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Milan Zamazal Gerrit-Reviewer: Vinzenz Feenstra Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-3.6]: virt: Correct disconnectAction parameter extraction
Vinzenz Feenstra has posted comments on this change. Change subject: virt: Correct disconnectAction parameter extraction .. Patch Set 4: Verified+1 -- To view, visit https://gerrit.ovirt.org/63974 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia1695a56d3f7e68f8f9b8d2a929775edc4570985 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Vinzenz Feenstra Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Milan Zamazal Gerrit-Reviewer: Vinzenz Feenstra Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-3.6]: virt: Correct disconnectAction parameter extraction
gerrit-hooks has posted comments on this change. Change subject: virt: Correct disconnectAction parameter extraction .. Patch Set 4: * #1371264::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1371264::OK, public bug * Check Product::#1371264::OK, Correct product Red Hat Enterprise Virtualization Manager * Check TM::#1371264::OK, correct target milestone ovirt-3.6.10 * Check merged to previous::OK, change not open on any previous branch -- To view, visit https://gerrit.ovirt.org/63974 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia1695a56d3f7e68f8f9b8d2a929775edc4570985 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Vinzenz Feenstra Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Milan Zamazal Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[ovirt-3.6]: virt: Correct disconnectAction parameter extraction
Milan Zamazal has posted comments on this change. Change subject: virt: Correct disconnectAction parameter extraction .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/63974 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia1695a56d3f7e68f8f9b8d2a929775edc4570985 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Vinzenz Feenstra Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Milan Zamazal 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[ovirt-3.6]: virt: Correct disconnectAction parameter extraction
Francesco Romani has posted comments on this change. Change subject: virt: Correct disconnectAction parameter extraction .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/63974 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia1695a56d3f7e68f8f9b8d2a929775edc4570985 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Vinzenz Feenstra Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Milan Zamazal 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[ovirt-3.6]: virt: Correct disconnectAction parameter extraction
gerrit-hooks has posted comments on this change. Change subject: virt: Correct disconnectAction parameter extraction .. Patch Set 3: * #1371264::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1371264::OK, public bug * Check Product::#1371264::OK, Correct product Red Hat Enterprise Virtualization Manager * Check TM::#1371264::OK, correct target milestone ovirt-3.6.10 * Check merged to previous::OK, change not open on any previous branch -- To view, visit https://gerrit.ovirt.org/63974 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia1695a56d3f7e68f8f9b8d2a929775edc4570985 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Vinzenz Feenstra Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Milan Zamazal 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[ovirt-3.6]: virt: Correct disconnectAction parameter extraction
Jenkins CI has posted comments on this change. Change subject: virt: Correct disconnectAction parameter extraction .. Patch Set 2: Continuous-Integration-1 Propagate review hook: Continuous Integration value inherited from patch 1 -- To view, visit https://gerrit.ovirt.org/63974 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia1695a56d3f7e68f8f9b8d2a929775edc4570985 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Vinzenz Feenstra Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Milan Zamazal 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[ovirt-3.6]: virt: Correct disconnectAction parameter extraction
gerrit-hooks has posted comments on this change. Change subject: virt: Correct disconnectAction parameter extraction .. Patch Set 2: * update_tracker: OK * Check Bug-Url::OK * Check Public Bug::#1371264::ERROR, private bug * Check Public Bug::WARN, no public bug url found * Check merged to previous::OK, change not open on any previous branch -- To view, visit https://gerrit.ovirt.org/63974 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia1695a56d3f7e68f8f9b8d2a929775edc4570985 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Vinzenz Feenstra Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Milan Zamazal 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[ovirt-3.6]: virt: Correct disconnectAction parameter extraction
gerrit-hooks has posted comments on this change. Change subject: virt: Correct disconnectAction parameter extraction .. Patch Set 1: * #1349383::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1349383::OK, public bug * Check Public Bug::#1371264::ERROR, private bug * Check merged to previous::OK, change not open on any previous branch -- To view, visit https://gerrit.ovirt.org/63974 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia1695a56d3f7e68f8f9b8d2a929775edc4570985 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Vinzenz Feenstra Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Milan Zamazal 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[ovirt-3.6]: virt: Correct disconnectAction parameter extraction
Hello Francesco Romani, Milan Zamazal,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/63974
to review the following change.
Change subject: virt: Correct disconnectAction parameter extraction
..
virt: Correct disconnectAction parameter extraction
The disconnectAction has previously never been passed to the
_setTicketForGraphicDev method. This patch fixes this oversight.
Backport-To: 4.0
Bug-Url: https://bugzilla.redhat.com/1349383
Bug-Url: https://bugzilla.redhat.com/1371264
Change-Id: Ia1695a56d3f7e68f8f9b8d2a929775edc4570985
Signed-off-by: Vinzenz Feenstra
Reviewed-on: https://gerrit.ovirt.org/59692
Reviewed-by: Milan Zamazal
Continuous-Integration: Jenkins CI
Reviewed-by: Francesco Romani
---
M vdsm/virt/vm.py
1 file changed, 7 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/74/63974/1
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 4a4fa91..3bc775c 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -2261,7 +2261,8 @@
if graphics:
result = self._setTicketForGraphicDev(
graphics, params['password'], params['ttl'],
-params['existingConnAction'], params['params'])
+params.get('existingConnAction'),
+params.get('disconnectAction'), params['params'])
if result['status']['code'] == 0:
result['vmList'] = self.status()
return result
@@ -3729,9 +3730,10 @@
return response.error('ticketErr',
'no graphics devices configured')
return self._setTicketForGraphicDev(
-graphics, otp, seconds, connAct, params)
+graphics, otp, seconds, connAct, None, params)
-def _setTicketForGraphicDev(self, graphics, otp, seconds, connAct, params):
+def _setTicketForGraphicDev(self, graphics, otp, seconds, connAct,
+disconnectAction, params):
graphics.setAttribute('passwd', otp.value)
if int(seconds) > 0:
validto = time.strftime('%Y-%m-%dT%H:%M:%S',
@@ -3742,9 +3744,8 @@
hooks.before_vm_set_ticket(self._domain.xml, self.conf, params)
try:
self._dom.updateDeviceFlags(graphics.toxml(), 0)
-disconnectAction = params.get('disconnectAction',
- ConsoleDisconnectAction.LOCK_SCREEN)
-self._consoleDisconnectAction = disconnectAction
+self._consoleDisconnectAction = disconnectAction or \
+ConsoleDisconnectAction.LOCK_SCREEN
except virdomain.TimeoutError as tmo:
res = response.error('ticketErr', unicode(tmo))
else:
--
To view, visit https://gerrit.ovirt.org/63974
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1695a56d3f7e68f8f9b8d2a929775edc4570985
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Vinzenz Feenstra
Gerrit-Reviewer: Francesco Romani
Gerrit-Reviewer: Milan Zamazal
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
