Change in vdsm[master]: Migration cancellation replies wrong message format

[Vinzenz Feenstra]

Vinzenz Feenstra has uploaded a new change for review.

Change subject: Migration cancellation replies wrong message format
......................................................................

Migration cancellation replies wrong message format

The message currently returns:

{'status': {'message': 'Migration canceled',
            'code': { 'status': { 'message': 'Migration not in
progress',
                      'code': 47}}},
            'progress': 1}

The content of code is wrong. This commit fixes it so the message will
look like this:

{'status': {'message': 'Migration canceled', 'code': 47},
'progress': 1}

Change-Id: I17a2463154e9f67191a818f137a4e7158a74dbbb
Bug-Url: https://bugzilla.redhat.com/1015887
Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
---
M vdsm/vm.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/21250/1

diff --git a/vdsm/vm.py b/vdsm/vm.py
index fe45d1b..50681c8 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -290,7 +290,7 @@
                 self._finishSuccessfully()
             except libvirt.libvirtError as e:
                 if e.get_error_code() == libvirt.VIR_ERR_OPERATION_ABORTED:
-                    self.status['status']['code'] =
errCode['migCancelErr']
+                    self.status = errCode['migCancelErr']
                     self.status['status']['message'] = 'Migration
canceled'
                 raise
             finally:


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I17a2463154e9f67191a818f137a4e7158a74dbbb
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;

Michal Skrivanek has posted comments on this change.

Change subject: Migration cancellation replies wrong message format
......................................................................


Patch Set 3: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I17a2463154e9f67191a818f137a4e7158a74dbbb
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Migration cancellation replies wrong message format
......................................................................


Patch Set 3:

Build Successful 

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

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

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I17a2463154e9f67191a818f137a4e7158a74dbbb
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Vinzenz Feenstra]

Vinzenz Feenstra has posted comments on this change.

Change subject: Migration cancellation replies wrong message format
......................................................................


Patch Set 3: Verified+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I17a2463154e9f67191a818f137a4e7158a74dbbb
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Migration cancellation replies wrong message format
......................................................................


Patch Set 2:

Build Successful 

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

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

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I17a2463154e9f67191a818f137a4e7158a74dbbb
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Migration cancellation replies wrong message format
......................................................................


Patch Set 1:

Build Successful 

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

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

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I17a2463154e9f67191a818f137a4e7158a74dbbb
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(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: Migration cancellation replies wrong message format
......................................................................


Patch Set 4:

Vinzenz, I'd like to see this in ovirt-3.3 branch, too.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I17a2463154e9f67191a818f137a4e7158a74dbbb
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(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: Migration cancellation replies wrong message format
......................................................................


Migration cancellation replies wrong message format

The message currently returns:

{'status': {'message': 'Migration canceled',
            'code': { 'status': { 'message': 'Migration not in
progress',
                      'code': 47}}},
            'progress': 1}

The content of code is wrong. This commit fixes it so the message will
look like this:

{'status': {'message': 'Migration canceled', 'code': 47},
'progress': 1}

Change-Id: I17a2463154e9f67191a818f137a4e7158a74dbbb
Bug-Url: https://bugzilla.redhat.com/1015887
Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Reviewed-on: http://gerrit.ovirt.org/21250
Reviewed-by: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M vdsm/vm.py
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Vinzenz Feenstra: Verified
  Dan Kenigsberg: Looks good to me, approved
  Michal Skrivanek: Looks good to me, but someone else must approve



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I17a2463154e9f67191a818f137a4e7158a74dbbb
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Migration cancellation replies wrong message format
......................................................................


Patch Set 3: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I17a2463154e9f67191a818f137a4e7158a74dbbb
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No