aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2020-02-03 15:16:46 +0000
committerGerrit Code Review <gerrit@onap.org>2020-02-03 15:16:46 +0000
commitd789d26741b22fca83168ab209e517fbfbcefcc6 (patch)
tree63fc08b5aeba4c49fb9db4c4ca7fd54822c09689
parentf6ef29e667a4e4b66a1feb2f6643f1c0abd5d19a (diff)
parent624bdb9bdc0d6dc972c0c8eeab4935d55becca1e (diff)
Merge "name + consistent case in drools policies"
-rw-r--r--models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json2
-rw-r--r--models-examples/src/main/resources/policytypes/onap.policies.drools.Controller.yaml2
-rw-r--r--models-examples/src/main/resources/policytypes/onap.policies.native.Drools.yaml12
3 files changed, 8 insertions, 8 deletions
diff --git a/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json b/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json
index 793334e4e..6f3545b9b 100644
--- a/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json
@@ -42,4 +42,4 @@
}
]
}
-} \ No newline at end of file
+}
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.drools.Controller.yaml b/models-examples/src/main/resources/policytypes/onap.policies.drools.Controller.yaml
index 74db20205..63f8fd6ed 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.drools.Controller.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.drools.Controller.yaml
@@ -45,7 +45,7 @@ data_types:
onap.datatypes.dmaap.serialization:
derived_from: tosca.datatypes.Root
properties:
- eventCanonicalName:
+ eventClass:
type: string
required: true
description: the event canonical class for serialization
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.native.Drools.yaml b/models-examples/src/main/resources/policytypes/onap.policies.native.Drools.yaml
index 39b9c7f28..c36796e8a 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.native.Drools.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.native.Drools.yaml
@@ -9,8 +9,8 @@ policy_types:
description: a policy type for native drools policies
version: 1.0.0
properties:
- rule_artifact:
- type: onap.datatypes.native.rule_artifact
+ rulesArtifact:
+ type: onap.datatypes.native.rules_artifact
required: true
description: the GAV information of the maven artifact
controller:
@@ -19,7 +19,7 @@ policy_types:
description: the drools controller to which the current native policy is assigned
data_types:
- onap.datatypes.native.rule_artifact:
+ onap.datatypes.native.rules_artifact:
derived_from: tosca.datatypes.Root
properties:
groupId:
@@ -37,11 +37,11 @@ data_types:
onap.datatypes.drools.controller.relation:
derived_from: tosca.datatypes.Root
properties:
- controllerPolicyName:
+ controllerName:
type: string
required: true
description: the name of drools controller policy
- controllerPolicyVersion:
+ controllerVersion:
type: string
- required: true
+ required: false
description: the version of drools controller policy \ No newline at end of file