openstack/python-mistralclient
Code Issues Proposed changes

Merge "Adding to_dict() method to Resource class"

Browse Source
This commit is contained in:
Jenkins
2015-08-05 14:08:45 +00:00
committed by Gerrit Code Review
parent 91acc75151 58ac8f3d16
commit 0c1ca19066
6 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mistralclient/api/base.py
View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import copy
import json import json
import logging import logging
@@ -41,6 +42,9 @@ class Resource(object):
# In this case we already defined the attribute on the class # In this case we already defined the attribute on the class
pass pass
def to_dict(self):
return copy.deepcopy(self._data)
def __str__(self): def __str__(self):
vals = ", ".join(["%s='%s'" % (n, v) vals = ", ".join(["%s='%s'" % (n, v)
for n, v in self._data.items()]) for n, v in self._data.items()])

8
mistralclient/tests/unit/v2/test_action_executions.py
View File

@@ -46,7 +46,7 @@ class TestActionExecutions(base.BaseClientV2Test):
self.assertIsNotNone(action_execution) self.assertIsNotNone(action_execution)
self.assertEqual(action_executions.ActionExecution( self.assertEqual(action_executions.ActionExecution(
self.action_executions, ACTION_EXEC self.action_executions, ACTION_EXEC
).__dict__, action_execution.__dict__) ).to_dict(), action_execution.to_dict())
mock.assert_called_once_with( mock.assert_called_once_with(
URL_TEMPLATE, json.dumps(body)) URL_TEMPLATE, json.dumps(body))
@@ -65,7 +65,7 @@ class TestActionExecutions(base.BaseClientV2Test):
self.assertIsNotNone(action_execution) self.assertIsNotNone(action_execution)
self.assertEqual(action_executions.ActionExecution( self.assertEqual(action_executions.ActionExecution(
self.action_executions, ACTION_EXEC self.action_executions, ACTION_EXEC
).__dict__, action_execution.__dict__) ).to_dict(), action_execution.to_dict())
mock.assert_called_once_with( mock.assert_called_once_with(
URL_TEMPLATE_ID % ACTION_EXEC['id'], json.dumps(body)) URL_TEMPLATE_ID % ACTION_EXEC['id'], json.dumps(body))
@@ -82,7 +82,7 @@ class TestActionExecutions(base.BaseClientV2Test):
self.assertEqual(action_executions.ActionExecution( self.assertEqual(action_executions.ActionExecution(
self.action_executions, ACTION_EXEC self.action_executions, ACTION_EXEC
).__dict__, action_execution.__dict__) ).to_dict(), action_execution.to_dict())
mock.assert_called_once_with(URL_TEMPLATE) mock.assert_called_once_with(URL_TEMPLATE)
@@ -93,7 +93,7 @@ class TestActionExecutions(base.BaseClientV2Test):
self.assertEqual(action_executions.ActionExecution( self.assertEqual(action_executions.ActionExecution(
self.action_executions, ACTION_EXEC self.action_executions, ACTION_EXEC
).__dict__, action_execution.__dict__) ).to_dict(), action_execution.to_dict())
mock.assert_called_once_with( mock.assert_called_once_with(
URL_TEMPLATE_ID % ACTION_EXEC['id']) URL_TEMPLATE_ID % ACTION_EXEC['id'])

8
mistralclient/tests/unit/v2/test_environments.py
View File

@@ -69,8 +69,8 @@ class TestEnvironmentsV2(base.BaseClientV2Test):
env = environment_list[0] env = environment_list[0]
self.assertDictEqual( self.assertDictEqual(
environments.Environment(self.environments, ENVIRONMENT).__dict__, environments.Environment(self.environments, ENVIRONMENT).to_dict(),
env.__dict__ env.to_dict()
) )
mock.assert_called_once_with(URL_TEMPLATE) mock.assert_called_once_with(URL_TEMPLATE)
@@ -82,8 +82,8 @@ class TestEnvironmentsV2(base.BaseClientV2Test):
self.assertIsNotNone(env) self.assertIsNotNone(env)
self.assertDictEqual( self.assertDictEqual(
environments.Environment(self.environments, ENVIRONMENT).__dict__, environments.Environment(self.environments, ENVIRONMENT).to_dict(),
env.__dict__ env.to_dict()
) )
mock.assert_called_once_with(URL_TEMPLATE_NAME % 'env') mock.assert_called_once_with(URL_TEMPLATE_NAME % 'env')

16
mistralclient/tests/unit/v2/test_executions.py
View File

@@ -52,8 +52,8 @@ class TestExecutionsV2(base.BaseClientV2Test):
EXEC['input']) EXEC['input'])
self.assertIsNotNone(ex) self.assertIsNotNone(ex)
self.assertEqual(executions.Execution(self.executions, EXEC).__dict__, self.assertEqual(executions.Execution(self.executions, EXEC).to_dict(),
ex.__dict__) ex.to_dict())
mock.assert_called_once_with(URL_TEMPLATE, json.dumps(body)) mock.assert_called_once_with(URL_TEMPLATE, json.dumps(body))
@unittest2.expectedFailure @unittest2.expectedFailure
@@ -76,8 +76,8 @@ class TestExecutionsV2(base.BaseClientV2Test):
ex = self.executions.update(EXEC['id'], EXEC['state']) ex = self.executions.update(EXEC['id'], EXEC['state'])
self.assertIsNotNone(ex) self.assertIsNotNone(ex)
self.assertEqual(executions.Execution(self.executions, EXEC).__dict__, self.assertEqual(executions.Execution(self.executions, EXEC).to_dict(),
ex.__dict__) ex.to_dict())
mock.assert_called_once_with( mock.assert_called_once_with(
URL_TEMPLATE_ID % EXEC['id'], json.dumps(body)) URL_TEMPLATE_ID % EXEC['id'], json.dumps(body))
@@ -89,8 +89,8 @@ class TestExecutionsV2(base.BaseClientV2Test):
self.assertEqual(1, len(execution_list)) self.assertEqual(1, len(execution_list))
ex = execution_list[0] ex = execution_list[0]
self.assertEqual(executions.Execution(self.executions, EXEC).__dict__, self.assertEqual(executions.Execution(self.executions, EXEC).to_dict(),
ex.__dict__) ex.to_dict())
mock.assert_called_once_with(URL_TEMPLATE) mock.assert_called_once_with(URL_TEMPLATE)
def test_get(self): def test_get(self):
@@ -98,8 +98,8 @@ class TestExecutionsV2(base.BaseClientV2Test):
ex = self.executions.get(EXEC['id']) ex = self.executions.get(EXEC['id'])
self.assertEqual(executions.Execution(self.executions, EXEC).__dict__, self.assertEqual(executions.Execution(self.executions, EXEC).to_dict(),
ex.__dict__) ex.to_dict())
mock.assert_called_once_with(URL_TEMPLATE_ID % EXEC['id']) mock.assert_called_once_with(URL_TEMPLATE_ID % EXEC['id'])
def test_delete(self): def test_delete(self):

10
mistralclient/tests/unit/v2/test_tasks.py
View File

@@ -41,7 +41,10 @@ class TestTasksV2(base.BaseClientV2Test):
self.assertEqual(1, len(task_list)) self.assertEqual(1, len(task_list))
task = task_list[0] task = task_list[0]
self.assertEqual(tasks.Task(self.tasks, TASK).__dict__, task.__dict__) self.assertEqual(
tasks.Task(self.tasks, TASK).to_dict(),
task.to_dict()
)
mock.assert_called_once_with(URL_TEMPLATE) mock.assert_called_once_with(URL_TEMPLATE)
def test_get(self): def test_get(self):
@@ -49,6 +52,9 @@ class TestTasksV2(base.BaseClientV2Test):
task = self.tasks.get(TASK['id']) task = self.tasks.get(TASK['id'])
self.assertEqual(tasks.Task(self.tasks, TASK).__dict__, task.__dict__) self.assertEqual(
tasks.Task(self.tasks, TASK).to_dict(),
task.to_dict()
)
mock.assert_called_once_with( mock.assert_called_once_with(
URL_TEMPLATE_ID % TASK['id']) URL_TEMPLATE_ID % TASK['id'])

8
mistralclient/tests/unit/v2/test_workbooks.py
View File

@@ -103,8 +103,8 @@ class TestWorkbooksV2(base.BaseClientV2Test):
wb = workbook_list[0] wb = workbook_list[0]
self.assertEqual( self.assertEqual(
workbooks.Workbook(self.workbooks, WORKBOOK).__dict__, workbooks.Workbook(self.workbooks, WORKBOOK).to_dict(),
wb.__dict__ wb.to_dict()
) )
mock.assert_called_once_with(URL_TEMPLATE) mock.assert_called_once_with(URL_TEMPLATE)
@@ -116,8 +116,8 @@ class TestWorkbooksV2(base.BaseClientV2Test):
self.assertIsNotNone(wb) self.assertIsNotNone(wb)
self.assertEqual( self.assertEqual(
workbooks.Workbook(self.workbooks, WORKBOOK).__dict__, workbooks.Workbook(self.workbooks, WORKBOOK).to_dict(),
wb.__dict__ wb.to_dict()
) )
mock.assert_called_once_with(URL_TEMPLATE_NAME % 'wb') mock.assert_called_once_with(URL_TEMPLATE_NAME % 'wb')