From 893bbd7a522c5ef68cc440fd6f1e0e489e7900a9 Mon Sep 17 00:00:00 2001 From: Vincent Francoise Date: Thu, 10 Mar 2016 10:40:28 +0100 Subject: [PATCH] Renamed 'TRIGGERED' state to 'PENDING' Following the change in Watcher, this patchset updates the Watcher Dashboard to support this change. Change-Id: I3be475d3659dea2d427ffe3906637ddfbdd716c3 Closes-Bug: #1548377 --- watcher_dashboard/api/watcher.py | 4 ++-- watcher_dashboard/test/api_tests/watcher_tests.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/watcher_dashboard/api/watcher.py b/watcher_dashboard/api/watcher.py index f90e4ca..06caf37 100644 --- a/watcher_dashboard/api/watcher.py +++ b/watcher_dashboard/api/watcher.py @@ -343,7 +343,7 @@ class ActionPlan(base.APIResourceWrapper): :type action_plan_id: int """ patch = [] - patch.append({'op': 'replace', 'path': '/state', 'value': 'TRIGGERED'}) + patch.append({'op': 'replace', 'path': '/state', 'value': 'PENDING'}) watcherclient(request).action_plan.update(action_plan_id, patch) @property @@ -422,7 +422,7 @@ class Action(base.APIResourceWrapper): :type action_id: int """ patch = [] - patch.append({'op': 'replace', 'path': '/state', 'value': 'TRIGGERED'}) + patch.append({'op': 'replace', 'path': '/state', 'value': 'PENDING'}) watcherclient(request).action.update(action_id, patch) @property diff --git a/watcher_dashboard/test/api_tests/watcher_tests.py b/watcher_dashboard/test/api_tests/watcher_tests.py index d9601ba..9558379 100644 --- a/watcher_dashboard/test/api_tests/watcher_tests.py +++ b/watcher_dashboard/test/api_tests/watcher_tests.py @@ -207,7 +207,7 @@ class WatcherAPITests(test.APITestCase): def test_action_plan_start(self): action_plan_id = self.api_action_plans.first()['id'] patch = [] - patch.append({'path': '/state', 'value': 'TRIGGERED', 'op': 'replace'}) + patch.append({'path': '/state', 'value': 'PENDING', 'op': 'replace'}) watcherclient = self.stub_watcherclient() watcherclient.action_plan = self.mox.CreateMockAnything()