From 61bc6fce83bb828f94397855b4e26167f0eba913 Mon Sep 17 00:00:00 2001 From: miaohb Date: Tue, 13 Sep 2016 11:40:26 +0800 Subject: [PATCH] Fix error in node action Related-Bug:1622822 Fix error in node action Change-Id: I8ff18e653c669ed72f309b8b5063de7297f0d7a9 --- openstack/cluster/v1/node.py | 2 +- openstack/tests/unit/cluster/v1/test_node.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openstack/cluster/v1/node.py b/openstack/cluster/v1/node.py index d6c9c3d6b..895a3a8dd 100644 --- a/openstack/cluster/v1/node.py +++ b/openstack/cluster/v1/node.py @@ -84,7 +84,7 @@ class Node(resource.Resource): """ url = utils.urljoin(self.base_path, self.id, 'actions') resp = session.post(url, endpoint_filter=self.service, json=body) - return resp.json + return resp.json() def check(self, session, **params): """An action procedure for the node to check its health status. diff --git a/openstack/tests/unit/cluster/v1/test_node.py b/openstack/tests/unit/cluster/v1/test_node.py index 8e5838147..4639d189a 100644 --- a/openstack/tests/unit/cluster/v1/test_node.py +++ b/openstack/tests/unit/cluster/v1/test_node.py @@ -89,10 +89,10 @@ class TestNode(testtools.TestCase): sot = node.Node(**FAKE) resp = mock.Mock() - resp.json = {'action': '1234-5678-abcd'} + resp.json = mock.Mock(return_value='') sess = mock.Mock() sess.post = mock.Mock(return_value=resp) - self.assertEqual(resp.json, sot.check(sess)) + self.assertEqual('', sot.check(sess)) url = 'nodes/%s/actions' % sot.id body = {'check': {}} sess.post.assert_called_once_with(url, endpoint_filter=sot.service, @@ -102,10 +102,10 @@ class TestNode(testtools.TestCase): sot = node.Node(**FAKE) resp = mock.Mock() - resp.json = {'action': '2345-6789-bbbb'} + resp.json = mock.Mock(return_value='') sess = mock.Mock() sess.post = mock.Mock(return_value=resp) - self.assertEqual(resp.json, sot.recover(sess)) + self.assertEqual('', sot.recover(sess)) url = 'nodes/%s/actions' % sot.id body = {'recover': {}} sess.post.assert_called_once_with(url, endpoint_filter=sot.service,