Merge "Notifications Changes Multiple Global Efficacy"

2017-12-01 09:26:15 +00:00
parent bc4a58d2d7 e41a90d7ad
commit 0745d904fc
18 changed files with 69 additions and 62 deletions
--- a/doc/notification_samples/action-cancel-end.json
+++ b/doc/notification_samples/action-cancel-end.json
@@ -20,7 +20,7 @@
        "watcher_object.name": "TerseActionPlanPayload",
        "watcher_object.data": {
          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": {},
+          "global_efficacy": [],
          "created_at": "2016-10-18T09:52:05Z",
          "updated_at": null,
          "state": "CANCELLING",
--- a/doc/notification_samples/action-cancel-error.json
+++ b/doc/notification_samples/action-cancel-error.json
@@ -30,7 +30,7 @@
        "watcher_object.name": "TerseActionPlanPayload",
        "watcher_object.data": {
          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": {},
+          "global_efficacy": [],
          "created_at": "2016-10-18T09:52:05Z",
          "updated_at": null,
          "state": "CANCELLING",
--- a/doc/notification_samples/action-cancel-start.json
+++ b/doc/notification_samples/action-cancel-start.json
@@ -20,7 +20,7 @@
        "watcher_object.name": "TerseActionPlanPayload",
        "watcher_object.data": {
          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": {},
+          "global_efficacy": [],
          "created_at": "2016-10-18T09:52:05Z",
          "updated_at": null,
          "state": "CANCELLING",
--- a/doc/notification_samples/action-execution-end.json
+++ b/doc/notification_samples/action-execution-end.json
@@ -20,7 +20,7 @@
        "watcher_object.name": "TerseActionPlanPayload",
        "watcher_object.data": {
          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": {},
+          "global_efficacy": [],
          "created_at": "2016-10-18T09:52:05Z",
          "updated_at": null,
          "state": "ONGOING",
--- a/doc/notification_samples/action-execution-error.json
+++ b/doc/notification_samples/action-execution-error.json
@@ -30,7 +30,7 @@
        "watcher_object.name": "TerseActionPlanPayload",
        "watcher_object.data": {
          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": {},
+          "global_efficacy":[],
          "created_at": "2016-10-18T09:52:05Z",
          "updated_at": null,
          "state": "ONGOING",
--- a/doc/notification_samples/action-execution-start.json
+++ b/doc/notification_samples/action-execution-start.json
@@ -20,7 +20,7 @@
        "watcher_object.name": "TerseActionPlanPayload",
        "watcher_object.data": {
          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": {},
+          "global_efficacy": [],
          "created_at": "2016-10-18T09:52:05Z",
          "updated_at": null,
          "state": "ONGOING",
--- a/doc/notification_samples/action_plan-cancel-end.json
+++ b/doc/notification_samples/action_plan-cancel-end.json
@@ -29,7 +29,7 @@
      "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
      "fault": null,
      "state": "CANCELLED",
-      "global_efficacy": {},
+      "global_efficacy": [],
      "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
      "strategy": {
        "watcher_object.namespace": "watcher",
--- a/doc/notification_samples/action_plan-cancel-error.json
+++ b/doc/notification_samples/action_plan-cancel-error.json
@@ -57,7 +57,7 @@
          "state": "SUCCEEDED"
        }
      },
-      "global_efficacy": {},
+      "global_efficacy": [],
      "state": "CANCELLING"
    }
  },
--- a/doc/notification_samples/action_plan-cancel-start.json
+++ b/doc/notification_samples/action_plan-cancel-start.json
@@ -29,7 +29,7 @@
      "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
      "fault": null,
      "state": "CANCELLING",
-      "global_efficacy": {},
+      "global_efficacy": [],
      "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
      "strategy": {
        "watcher_object.namespace": "watcher",
--- a/doc/notification_samples/action_plan-execution-end.json
+++ b/doc/notification_samples/action_plan-execution-end.json
@@ -30,7 +30,7 @@
      "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
      "fault": null,
      "state": "ONGOING",
-      "global_efficacy": {},
+      "global_efficacy": [],
      "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
      "strategy": {
        "watcher_object.namespace": "watcher",
--- a/doc/notification_samples/action_plan-execution-error.json
+++ b/doc/notification_samples/action_plan-execution-error.json
@@ -58,7 +58,7 @@
          "state": "PENDING"
        }
      },
-      "global_efficacy": {},
+      "global_efficacy": [],
      "state": "ONGOING"
    }
  },
--- a/doc/notification_samples/action_plan-execution-start.json
+++ b/doc/notification_samples/action_plan-execution-start.json
@@ -30,7 +30,7 @@
      "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
      "fault": null,
      "state": "ONGOING",
-      "global_efficacy": {},
+      "global_efficacy": [],
      "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
      "strategy": {
        "watcher_object.namespace": "watcher",
--- a/doc/source/image_src/plantuml/watcher_db_schema_diagram.txt
+++ b/doc/source/image_src/plantuml/watcher_db_schema_diagram.txt
@@ -75,7 +75,7 @@ table(action_plans) {
    foreign_key("strategy_id : Integer")
    uuid : String[36]
    state : String[20], nullable
-    global_efficacy : JSONEncodedDict, nullable
+    global_efficacy : JSONEncodedList, nullable

    created_at : DateTime
    updated_at : DateTime