From ecf13ac6af0c9d388261e7b20422fb423b695d3c Mon Sep 17 00:00:00 2001 From: "Vladimir Sharshov (warpc)" Date: Fri, 25 Mar 2016 20:24:03 +0300 Subject: [PATCH] Use new tasks API: transactions Old API '/tasks' from 9.0 is depricated. At nom moment only, but big differents: new transactions API show all tasks including marked as deleted by UI. Change-Id: I0ae44bc527552e7a0e2295c194e0a2a3a614d2e6 Implements: blueprint store-deployment-tasks-history --- fuelclient/objects/task.py | 6 +++--- fuelclient/tests/functional/v1/test_client.py | 8 ++++---- fuelclient/tests/unit/v2/lib/test_task.py | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/fuelclient/objects/task.py b/fuelclient/objects/task.py index 388a5d87..c410c489 100644 --- a/fuelclient/objects/task.py +++ b/fuelclient/objects/task.py @@ -21,12 +21,12 @@ from fuelclient.objects.base import BaseObject class Task(BaseObject): - class_api_path = "tasks/" - instance_api_path = "tasks/{0}/" + class_api_path = "transactions/" + instance_api_path = "transactions/{0}/" def delete(self, force=False): return self.connection.delete_request( - "tasks/{0}/?force={1}".format( + "transactions/{0}/?force={1}".format( self.id, int(force), )) diff --git a/fuelclient/tests/functional/v1/test_client.py b/fuelclient/tests/functional/v1/test_client.py index a8ada80c..44e1aea4 100644 --- a/fuelclient/tests/functional/v1/test_client.py +++ b/fuelclient/tests/functional/v1/test_client.py @@ -192,7 +192,7 @@ class TestHandlers(base.BaseTestCase): "task --task-id 1 --debug", [ "GET http://127.0.0.1", - "/api/v1/tasks/1/" + "/api/v1/transactions/1/" ], check_errors=False ) @@ -200,7 +200,7 @@ class TestHandlers(base.BaseTestCase): "task --task-id 1 --delete --debug", [ "DELETE http://127.0.0.1", - "/api/v1/tasks/1/?force=0" + "/api/v1/transactions/1/?force=0" ], check_errors=False ) @@ -208,7 +208,7 @@ class TestHandlers(base.BaseTestCase): "task --task-id 1 --delete --force --debug", [ "DELETE http://127.0.0.1", - "/api/v1/tasks/1/?force=1" + "/api/v1/transactions/1/?force=1" ], check_errors=False ) @@ -216,7 +216,7 @@ class TestHandlers(base.BaseTestCase): "task --tid 1 --delete --debug", [ "DELETE http://127.0.0.1", - "/api/v1/tasks/1/?force=0" + "/api/v1/transactions/1/?force=0" ], check_errors=False ) diff --git a/fuelclient/tests/unit/v2/lib/test_task.py b/fuelclient/tests/unit/v2/lib/test_task.py index 84a40e5c..0784baca 100644 --- a/fuelclient/tests/unit/v2/lib/test_task.py +++ b/fuelclient/tests/unit/v2/lib/test_task.py @@ -25,7 +25,8 @@ class TestTaskFacade(test_api.BaseLibTest): super(TestTaskFacade, self).setUp() self.version = 'v1' - self.res_uri = '/api/{version}/tasks/'.format(version=self.version) + self.res_uri = '/api/{version}/transactions/'\ + .format(version=self.version) self.fake_task = utils.get_fake_task() self.fake_tasks = [utils.get_fake_task() for _ in range(10)]