From 624bdb9bdc0d6dc972c0c8eeab4935d55becca1e Mon Sep 17 00:00:00 2001 From: jhh Date: Fri, 31 Jan 2020 08:50:57 -0600 Subject: [PATCH] name + consistent case in drools policies Issue-ID: POLICY-2345 Signed-off-by: jhh Change-Id: Ibf54e6bac3d53daf0e23256ff0c2e8108b82cd9f Signed-off-by: jhh --- .../policies/vCPE.policy.operational.input.tosca.json | 2 +- .../policytypes/onap.policies.drools.Controller.yaml | 2 +- .../resources/policytypes/onap.policies.native.Drools.yaml | 12 ++++++------ 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 -- 2.16.6