openstack
/
openstacksdk
Code Issues Proposed changes

Fix error in node action 

Related-Bug:1622822
Fix error in node action

Change-Id: I8ff18e653c669ed72f309b8b5063de7297f0d7a9
This commit is contained in:
miaohb 2016-09-13 11:40:26 +08:00
parent b01d9deffb
commit 61bc6fce83
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack/cluster/v1/node.py
View File

@ -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.

8
openstack/tests/unit/cluster/v1/test_node.py
View File

@ -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,