Minor changes in Operational schemas

Moved as test resources, these schemas will go together with
its control loop application in the drools-applications
repo, to keep separation between control loop apps and core
drools.

Issue-ID: POLICY-2345
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I4d78474eedd2f2981907388936312c436e1cb70b

diff --git a/feature-lifecycle/src/main/resources/schemas/onap.policies.drools.Controller-1.0.0.schema.json b/feature-lifecycle/src/main/resources/schemas/onap.policies.drools.Controller-1.0.0.schema.json
index e07a3e1..d638e3b 100644 (file)
--- a/feature-lifecycle/src/main/resources/schemas/onap.policies.drools.Controller-1.0.0.schema.json
+++ b/feature-lifecycle/src/main/resources/schemas/onap.policies.drools.Controller-1.0.0.schema.json
@@ -266,7 +266,10 @@
                 "customConfig": {
                     "$id": "#/properties/properties/properties/customConfig",
                     "type": "object",
-                    "title": "other Configuration"
+                    "title": "other Configuration",
+                    "additionalProperties": {
+                        "type": "string"
+                    }
                 }
             }
         }

diff --git a/feature-lifecycle/src/main/resources/schemas/onap.policies.controlloop.Operational-1.0.0.schema.json b/feature-lifecycle/src/test/resources/schemas/onap.policies.controlloop.Operational-1.0.0.schema.json
similarity index 100%
rename from feature-lifecycle/src/main/resources/schemas/onap.policies.controlloop.Operational-1.0.0.schema.json
rename to feature-lifecycle/src/test/resources/schemas/onap.policies.controlloop.Operational-1.0.0.schema.json

diff --git a/feature-lifecycle/src/main/resources/schemas/onap.policies.controlloop.operational.common.Drools-1.0.0.schema.json b/feature-lifecycle/src/test/resources/schemas/onap.policies.controlloop.operational.common.Drools-1.0.0.schema.json
similarity index 94%
rename from feature-lifecycle/src/main/resources/schemas/onap.policies.controlloop.operational.common.Drools-1.0.0.schema.json
rename to feature-lifecycle/src/test/resources/schemas/onap.policies.controlloop.operational.common.Drools-1.0.0.schema.json
index 8548f7f..dea42a1 100644 (file)
--- a/feature-lifecycle/src/main/resources/schemas/onap.policies.controlloop.operational.common.Drools-1.0.0.schema.json
+++ b/feature-lifecycle/src/test/resources/schemas/onap.policies.controlloop.operational.common.Drools-1.0.0.schema.json
@@ -132,16 +132,11 @@
                         "uniqueItems": true,
                         "required": [
                             "id",
-                            "description",
                             "operation",
                             "timeout",
                             "retries",
                             "success",
-                            "failure",
-                            "failure_timeout",
-                            "failure_retries",
-                            "failure_exception",
-                            "failure_guard"
+                            "failure"
                         ],
                         "properties": {
                             "id": {
@@ -168,7 +163,7 @@
                                 "title": "Operation",
                                 "required": [
                                     "actor",
-                                    "recipe",
+                                    "operation",
                                     "target"
                                 ],
                                 "properties": {
@@ -181,10 +176,10 @@
                                         ],
                                         "pattern": "^(.+)$"
                                     },
-                                    "recipe": {
-                                        "$id": "#/properties/properties/properties/operations/items/properties/operation/properties/recipe",
+                                    "operation": {
+                                        "$id": "#/properties/properties/properties/operations/items/properties/operation/properties/operation",
                                         "type": "string",
-                                        "title": "Recipe",
+                                        "title": "Operation Name",
                                         "examples": [
                                             "Restart"
                                         ],
@@ -208,6 +203,14 @@
                                                 "pattern": "^(.+)$"
                                             }
                                         }
+                                    },
+                                    "payload": {
+                                        "$id": "#/properties/properties/properties/operations/items/properties/operation/properties/payload",
+                                        "type": "object",
+                                        "title": "Payload",
+                                        "additionalProperties": {
+                                            "type": "string"
+                                        }
                                     }
                                 }
                             },
@@ -266,7 +269,7 @@
                             "failure_retries": {
                                 "$id": "#/properties/properties/properties/operations/items/properties/failure_retries",
                                 "type": "string",
-                                "title": "Failure Retries Treatment",
+                                "title": "Failure Retry Treatment",
                                 "default": "final_failure_retries",
                                 "examples": [
                                     "final_failure_retries",