aboutsummaryrefslogtreecommitdiffstats
path: root/feature-lifecycle
diff options
context:
space:
mode:
authorjhh <jorge.hernandez-herrero@att.com>2020-02-06 15:17:20 -0600
committerjhh <jorge.hernandez-herrero@att.com>2020-02-06 15:17:20 -0600
commitea6425417a0abfcf9ca9c8271fafdcb7b8047903 (patch)
tree5db53c0b8f08d33a45b33d6f6b6f1d8de17e19d0 /feature-lifecycle
parenta297614df3eabf991f6da0f4a0bb52173742051d (diff)
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
Diffstat (limited to 'feature-lifecycle')
-rw-r--r--feature-lifecycle/src/main/resources/schemas/onap.policies.drools.Controller-1.0.0.schema.json5
-rw-r--r--feature-lifecycle/src/test/resources/schemas/onap.policies.controlloop.Operational-1.0.0.schema.json (renamed from feature-lifecycle/src/main/resources/schemas/onap.policies.controlloop.Operational-1.0.0.schema.json)0
-rw-r--r--feature-lifecycle/src/test/resources/schemas/onap.policies.controlloop.operational.common.Drools-1.0.0.schema.json (renamed from feature-lifecycle/src/main/resources/schemas/onap.policies.controlloop.operational.common.Drools-1.0.0.schema.json)25
3 files changed, 18 insertions, 12 deletions
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 e07a3e1e..d638e3b9 100644
--- 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
index e89238d7..e89238d7 100644
--- 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
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
index 8548f7f7..dea42a17 100644
--- 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",