diff options
| author |   liamfallon <liam.fallon@ericsson.com> | 2018-11-06 12:02:46 +0000 |
|---|---|---|
| committer | Liam Fallon <liam.fallon@ericsson.com> | 2018-11-08 17:54:13 +0000 |
| commit | cad452cdb6d999f822fe11dc4fdd232cce30ff6a (patch) | |
| tree | a2fdfb5a689d7c2a6f045424a9f078a44ea36f4d /services/services-engine/src/test/resources/parameters | |
| parent | ad6efc439440e991df30694ef2da17d640f20bdf (diff) | |
Refactor unit test data
There were many copies of test policies and examples
strewn through the Apex unit tests. This change cleans
up the unit tests so that a single version of all example
policies is used in all tests.
Also added a new relative file root command line parameter
to Apex to allow the root of relative paths in configuration
files to be set.
Apologies for the size of this review but unfortunately
all of this must be done in one shot.
Issue-ID: POLICY-1252
Change-Id: Ibbb18fbf18e3897a1c61301d0a65e62bc643a0e9
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
(cherry picked from commit 53d8916cc60d97e2ce7ae345f8cc25f5602567da)
Diffstat (limited to 'services/services-engine/src/test/resources/parameters')
50 files changed, 280 insertions, 152 deletions
diff --git a/services/services-engine/src/test/resources/parameters/badParamsModelNotFile.json b/services/services-engine/src/test/resources/parameters/badParamsModelNotFile.json new file mode 100644 index 000000000..8dec995be --- /dev/null +++ b/services/services-engine/src/test/resources/parameters/badParamsModelNotFile.json @@ -0,0 +1,64 @@ +{ + "engineServiceParameters": { + "name": "MyApexEngine", + "version": "0.0.1", + "id": 45, + "instanceCount": 19, + "deploymentPort": 65522, + "policyModelFileName": "src/test", + "engineParameters": { + "executorParameters": { + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" + } + } + } + }, + "eventOutputParameters": { + "FirstProducer": { + "carrierTechnologyParameters": { + "carrierTechnology": "FILE", + "parameters": { + "fileName": "target/aaa.json" + } + }, + "eventProtocolParameters": { + "eventProtocol": "JSON" + } + }, + "MyOtherProducer": { + "eventProtocolParameters": { + "eventProtocol": "JSON" + }, + "carrierTechnologyParameters": { + "carrierTechnology": "FILE", + "parameters": { + "fileName": "target/aaa.json" + } + } + } + }, + "eventInputParameters": { + "TheFileConsumer1": { + "carrierTechnologyParameters": { + "carrierTechnology": "FILE", + "parameters": { + "fileName": "target/bbb.json" + } + }, + "eventProtocolParameters": { + "eventProtocol": "JSON" + } + }, + "MySuperDooperConsumer1": { + "carrierTechnologyParameters": { + "carrierTechnology": "SUPER_DOOPER", + "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperCarrierTechnologyParameters" + }, + "eventProtocolParameters": { + "eventProtocol": "SUPER_TOK_DEL", + "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperTokenDelimitedEventProtocolParameters" + } + } + } +}
\ No newline at end of file diff --git a/services/services-engine/src/test/resources/parameters/factoryGoodParams.json b/services/services-engine/src/test/resources/parameters/factoryGoodParams.json index 54b58ce00..87448f5e7 100644 --- a/services/services-engine/src/test/resources/parameters/factoryGoodParams.json +++ b/services/services-engine/src/test/resources/parameters/factoryGoodParams.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -30,7 +30,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -43,7 +43,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/bbb.json" + "fileName": "target/bbb.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/goodParams.json b/services/services-engine/src/test/resources/parameters/goodParams.json index c470f3eea..f323b0b51 100644 --- a/services/services-engine/src/test/resources/parameters/goodParams.json +++ b/services/services-engine/src/test/resources/parameters/goodParams.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -33,7 +33,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } } } @@ -43,7 +43,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/bbb.json" + "fileName": "target/bbb.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/goodParamsRelative.json b/services/services-engine/src/test/resources/parameters/goodParamsRelative.json new file mode 100644 index 000000000..b3d193111 --- /dev/null +++ b/services/services-engine/src/test/resources/parameters/goodParamsRelative.json @@ -0,0 +1,64 @@ +{ + "engineServiceParameters": { + "name": "MyApexEngine", + "version": "0.0.1", + "id": 45, + "instanceCount": 19, + "deploymentPort": 65522, + "policyModelFileName": "policymodels/SmallModel.json", + "engineParameters": { + "executorParameters": { + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" + } + } + } + }, + "eventOutputParameters": { + "FirstProducer": { + "carrierTechnologyParameters": { + "carrierTechnology": "FILE", + "parameters": { + "fileName": "aaa.json" + } + }, + "eventProtocolParameters": { + "eventProtocol": "JSON" + } + }, + "MyOtherProducer": { + "eventProtocolParameters": { + "eventProtocol": "JSON" + }, + "carrierTechnologyParameters": { + "carrierTechnology": "FILE", + "parameters": { + "fileName": "aaa.json" + } + } + } + }, + "eventInputParameters": { + "TheFileConsumer1": { + "carrierTechnologyParameters": { + "carrierTechnology": "FILE", + "parameters": { + "fileName": "bbb.json" + } + }, + "eventProtocolParameters": { + "eventProtocol": "JSON" + } + }, + "MySuperDooperConsumer1": { + "carrierTechnologyParameters": { + "carrierTechnology": "SUPER_DOOPER", + "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperCarrierTechnologyParameters" + }, + "eventProtocolParameters": { + "eventProtocol": "SUPER_TOK_DEL", + "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperTokenDelimitedEventProtocolParameters" + } + } + } +}
\ No newline at end of file diff --git a/services/services-engine/src/test/resources/parameters/prodConsBadCTParClass.json b/services/services-engine/src/test/resources/parameters/prodConsBadCTParClass.json index bb431279e..48c2dc905 100644 --- a/services/services-engine/src/test/resources/parameters/prodConsBadCTParClass.json +++ b/services/services-engine/src/test/resources/parameters/prodConsBadCTParClass.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/prodConsBadEPParClass.json b/services/services-engine/src/test/resources/parameters/prodConsBadEPParClass.json index 7b1f1c099..51e9c3972 100644 --- a/services/services-engine/src/test/resources/parameters/prodConsBadEPParClass.json +++ b/services/services-engine/src/test/resources/parameters/prodConsBadEPParClass.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/prodConsBadFileName.json b/services/services-engine/src/test/resources/parameters/prodConsBadFileName.json index 2dc506561..38fba4480 100644 --- a/services/services-engine/src/test/resources/parameters/prodConsBadFileName.json +++ b/services/services-engine/src/test/resources/parameters/prodConsBadFileName.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } diff --git a/services/services-engine/src/test/resources/parameters/prodConsMismatchCTParClass.json b/services/services-engine/src/test/resources/parameters/prodConsMismatchCTParClass.json index e8d1a9632..42c3e69ee 100644 --- a/services/services-engine/src/test/resources/parameters/prodConsMismatchCTParClass.json +++ b/services/services-engine/src/test/resources/parameters/prodConsMismatchCTParClass.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/prodConsMismatchEPParClass.json b/services/services-engine/src/test/resources/parameters/prodConsMismatchEPParClass.json index 89e905c3a..1bb893218 100644 --- a/services/services-engine/src/test/resources/parameters/prodConsMismatchEPParClass.json +++ b/services/services-engine/src/test/resources/parameters/prodConsMismatchEPParClass.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/prodConsNoCT.json b/services/services-engine/src/test/resources/parameters/prodConsNoCT.json index cbd9957c8..e94f05a5b 100644 --- a/services/services-engine/src/test/resources/parameters/prodConsNoCT.json +++ b/services/services-engine/src/test/resources/parameters/prodConsNoCT.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/prodConsNoCTParClass.json b/services/services-engine/src/test/resources/parameters/prodConsNoCTParClass.json index 9c8723a81..07d50b30f 100644 --- a/services/services-engine/src/test/resources/parameters/prodConsNoCTParClass.json +++ b/services/services-engine/src/test/resources/parameters/prodConsNoCTParClass.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/prodConsNoEP.json b/services/services-engine/src/test/resources/parameters/prodConsNoEP.json index 92c089225..bdb780f4a 100644 --- a/services/services-engine/src/test/resources/parameters/prodConsNoEP.json +++ b/services/services-engine/src/test/resources/parameters/prodConsNoEP.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventParameters": { diff --git a/services/services-engine/src/test/resources/parameters/prodConsNoEPParClass.json b/services/services-engine/src/test/resources/parameters/prodConsNoEPParClass.json index 8aea0ea3e..f39173ff8 100644 --- a/services/services-engine/src/test/resources/parameters/prodConsNoEPParClass.json +++ b/services/services-engine/src/test/resources/parameters/prodConsNoEPParClass.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/prodConsOKFileName.json b/services/services-engine/src/test/resources/parameters/prodConsOKFileName.json index b2424043e..938c318a7 100644 --- a/services/services-engine/src/test/resources/parameters/prodConsOKFileName.json +++ b/services/services-engine/src/test/resources/parameters/prodConsOKFileName.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/prodConsWrongTypeCTParClass.json b/services/services-engine/src/test/resources/parameters/prodConsWrongTypeCTParClass.json index 6bfab6a99..adbda5c13 100644 --- a/services/services-engine/src/test/resources/parameters/prodConsWrongTypeCTParClass.json +++ b/services/services-engine/src/test/resources/parameters/prodConsWrongTypeCTParClass.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/prodConsWrongTypeEPParClass.json b/services/services-engine/src/test/resources/parameters/prodConsWrongTypeEPParClass.json index d72139de8..bbc50bde6 100644 --- a/services/services-engine/src/test/resources/parameters/prodConsWrongTypeEPParClass.json +++ b/services/services-engine/src/test/resources/parameters/prodConsWrongTypeEPParClass.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/serviceContextBadClassDistParams.json b/services/services-engine/src/test/resources/parameters/serviceContextBadClassDistParams.json index 6468e10a4..12f22c1eb 100644 --- a/services/services-engine/src/test/resources/parameters/serviceContextBadClassDistParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceContextBadClassDistParams.json @@ -5,7 +5,7 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "contextParameters": { "parameterClassName": "org.onap.policy.apex.context.parameters.ContextParameters", diff --git a/services/services-engine/src/test/resources/parameters/serviceContextBadClassLockParams.json b/services/services-engine/src/test/resources/parameters/serviceContextBadClassLockParams.json index 57a38024d..00e6ca64a 100644 --- a/services/services-engine/src/test/resources/parameters/serviceContextBadClassLockParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceContextBadClassLockParams.json @@ -5,7 +5,7 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "contextParameters": { "parameterClassName": "org.onap.policy.apex.context.parameters.ContextParameters", @@ -14,7 +14,7 @@ } }, "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } diff --git a/services/services-engine/src/test/resources/parameters/serviceContextBadClassParams.json b/services/services-engine/src/test/resources/parameters/serviceContextBadClassParams.json index a2920303a..c10172d23 100644 --- a/services/services-engine/src/test/resources/parameters/serviceContextBadClassParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceContextBadClassParams.json @@ -5,7 +5,7 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "contextParameters": { "parameterClassName": "java.lang.Integer" diff --git a/services/services-engine/src/test/resources/parameters/serviceContextBadClassPersistParams.json b/services/services-engine/src/test/resources/parameters/serviceContextBadClassPersistParams.json index 598c20bd7..8c2331e32 100644 --- a/services/services-engine/src/test/resources/parameters/serviceContextBadClassPersistParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceContextBadClassPersistParams.json @@ -5,7 +5,7 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "contextParameters": { "parameterClassName": "org.onap.policy.apex.context.parameters.ContextParameters", @@ -14,7 +14,7 @@ } }, "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } diff --git a/services/services-engine/src/test/resources/parameters/serviceContextBadParams.json b/services/services-engine/src/test/resources/parameters/serviceContextBadParams.json index d850ba290..abb6b18cf 100644 --- a/services/services-engine/src/test/resources/parameters/serviceContextBadParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceContextBadParams.json @@ -5,7 +5,7 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "contextParameters": { "parameterClassName": "hello" diff --git a/services/services-engine/src/test/resources/parameters/serviceContextBadPluginClassParams.json b/services/services-engine/src/test/resources/parameters/serviceContextBadPluginClassParams.json index beb049069..1083f18b1 100644 --- a/services/services-engine/src/test/resources/parameters/serviceContextBadPluginClassParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceContextBadPluginClassParams.json @@ -5,7 +5,7 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "contextParameters": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" diff --git a/services/services-engine/src/test/resources/parameters/serviceContextBadPluginNameParams.json b/services/services-engine/src/test/resources/parameters/serviceContextBadPluginNameParams.json index d152809fa..7d9d8900c 100644 --- a/services/services-engine/src/test/resources/parameters/serviceContextBadPluginNameParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceContextBadPluginNameParams.json @@ -5,7 +5,7 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "contextParameters": { "parameterClassNamelooby": "" diff --git a/services/services-engine/src/test/resources/parameters/serviceContextNoParams.json b/services/services-engine/src/test/resources/parameters/serviceContextNoParams.json index 2d6cb4d85..44c53bb29 100644 --- a/services/services-engine/src/test/resources/parameters/serviceContextNoParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceContextNoParams.json @@ -5,7 +5,7 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "contextParameters": { diff --git a/services/services-engine/src/test/resources/parameters/serviceContextOKDefaultParams.json b/services/services-engine/src/test/resources/parameters/serviceContextOKDefaultParams.json index 56294a3c7..f4fee9fa9 100644 --- a/services/services-engine/src/test/resources/parameters/serviceContextOKDefaultParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceContextOKDefaultParams.json @@ -5,13 +5,13 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "contextParameters": { "parameterClassName": "org.onap.policy.apex.context.parameters.ContextParameters" }, "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -22,7 +22,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/serviceContextOKDistParams.json b/services/services-engine/src/test/resources/parameters/serviceContextOKDistParams.json index 1aa2abb0b..5aff80d94 100644 --- a/services/services-engine/src/test/resources/parameters/serviceContextOKDistParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceContextOKDistParams.json @@ -5,7 +5,7 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "contextParameters": { "parameterClassName": "org.onap.policy.apex.context.parameters.ContextParameters", @@ -14,7 +14,7 @@ } }, "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -25,7 +25,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/serviceContextOKFlushParams.json b/services/services-engine/src/test/resources/parameters/serviceContextOKFlushParams.json index 7d9eb6f2e..8bae50523 100644 --- a/services/services-engine/src/test/resources/parameters/serviceContextOKFlushParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceContextOKFlushParams.json @@ -5,7 +5,7 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "contextParameters": { "parameterClassName": "org.onap.policy.apex.context.parameters.ContextParameters", @@ -15,7 +15,7 @@ } }, "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -26,7 +26,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/serviceContextOKFullParams.json b/services/services-engine/src/test/resources/parameters/serviceContextOKFullParams.json index edbcb07df..24544d2ab 100644 --- a/services/services-engine/src/test/resources/parameters/serviceContextOKFullParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceContextOKFullParams.json @@ -5,7 +5,7 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "contextParameters": { "parameterClassName": "org.onap.policy.apex.context.parameters.ContextParameters", @@ -25,7 +25,7 @@ } }, "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -36,7 +36,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/serviceExecutorBadParams.json b/services/services-engine/src/test/resources/parameters/serviceExecutorBadParams.json index 839694af3..f9f50ee07 100644 --- a/services/services-engine/src/test/resources/parameters/serviceExecutorBadParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceExecutorBadParams.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" }, "ZOOBY": "hello" diff --git a/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginNameParams.json b/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginNameParams.json index 5a28d8985..4a28d58aa 100644 --- a/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginNameParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginNameParams.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" }, "ZOOBY": { diff --git a/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginValueBlankParams.json b/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginValueBlankParams.json index c70fa4c8b..7dd74ea34 100644 --- a/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginValueBlankParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginValueBlankParams.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" }, "ZOOBY": { diff --git a/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginValueObjectParams.json b/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginValueObjectParams.json index 200d8f1a5..2f7219f46 100644 --- a/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginValueObjectParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginValueObjectParams.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" }, "ZOOBY": { diff --git a/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginValueParams.json b/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginValueParams.json index b96a27409..39618055f 100644 --- a/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginValueParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginValueParams.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" }, "ZOOBY": { diff --git a/services/services-engine/src/test/resources/parameters/serviceExecutorEmptyParams.json b/services/services-engine/src/test/resources/parameters/serviceExecutorEmptyParams.json index f07eaff9d..3927740e3 100644 --- a/services/services-engine/src/test/resources/parameters/serviceExecutorEmptyParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceExecutorEmptyParams.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" }, "ZOOBY": { diff --git a/services/services-engine/src/test/resources/parameters/serviceExecutorNoExecutorParams.json b/services/services-engine/src/test/resources/parameters/serviceExecutorNoExecutorParams.json index 44d643cd2..0c6618f2e 100644 --- a/services/services-engine/src/test/resources/parameters/serviceExecutorNoExecutorParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceExecutorNoExecutorParams.json @@ -5,7 +5,7 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "someParameter": "someValue" } diff --git a/services/services-engine/src/test/resources/parameters/serviceExecutorNoParams.json b/services/services-engine/src/test/resources/parameters/serviceExecutorNoParams.json index 751ac2171..4eb6fe024 100644 --- a/services/services-engine/src/test/resources/parameters/serviceExecutorNoParams.json +++ b/services/services-engine/src/test/resources/parameters/serviceExecutorNoParams.json @@ -5,7 +5,7 @@ "id": 45, "instanceCount": 345, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { @@ -17,7 +17,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/syncBadParamsBadPeers.json b/services/services-engine/src/test/resources/parameters/syncBadParamsBadPeers.json index 6393d4864..355531417 100644 --- a/services/services-engine/src/test/resources/parameters/syncBadParamsBadPeers.json +++ b/services/services-engine/src/test/resources/parameters/syncBadParamsBadPeers.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -32,7 +32,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -47,7 +47,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/bbb.json" + "fileName": "target/bbb.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/syncBadParamsBadTimeout.json b/services/services-engine/src/test/resources/parameters/syncBadParamsBadTimeout.json index a6de63f30..7a04a439a 100644 --- a/services/services-engine/src/test/resources/parameters/syncBadParamsBadTimeout.json +++ b/services/services-engine/src/test/resources/parameters/syncBadParamsBadTimeout.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -33,7 +33,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "synchronousTimeout": 12345 @@ -44,7 +44,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/bbb.json" + "fileName": "target/bbb.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/syncBadParamsInvalidTimeout.json b/services/services-engine/src/test/resources/parameters/syncBadParamsInvalidTimeout.json index ac24c8231..6a4270b27 100644 --- a/services/services-engine/src/test/resources/parameters/syncBadParamsInvalidTimeout.json +++ b/services/services-engine/src/test/resources/parameters/syncBadParamsInvalidTimeout.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -34,7 +34,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -55,7 +55,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/bbb.json" + "fileName": "target/bbb.json" } } }, diff --git a/services/services-engine/src/test/resources/parameters/syncBadParamsNoSyncWithPeer.json b/services/services-engine/src/test/resources/parameters/syncBadParamsNoSyncWithPeer.json index 98840912f..8c6910a13 100644 --- a/services/services-engine/src/test/resources/parameters/syncBadParamsNoSyncWithPeer.json +++ b/services/services-engine/src/test/resources/parameters/syncBadParamsNoSyncWithPeer.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -31,7 +31,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -46,7 +46,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/bbb.json" + "fileName": "target/bbb.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/syncBadParamsNotSyncWithPeer.json b/services/services-engine/src/test/resources/parameters/syncBadParamsNotSyncWithPeer.json index 477bf8639..e1ed8316a 100644 --- a/services/services-engine/src/test/resources/parameters/syncBadParamsNotSyncWithPeer.json +++ b/services/services-engine/src/test/resources/parameters/syncBadParamsNotSyncWithPeer.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -32,7 +32,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -47,7 +47,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/bbb.json" + "fileName": "target/bbb.json" } }, "eventProtocolParameters": { diff --git a/services/services-engine/src/test/resources/parameters/syncBadParamsUnpairedTimeout.json b/services/services-engine/src/test/resources/parameters/syncBadParamsUnpairedTimeout.json index 93c998b29..9e24926b9 100644 --- a/services/services-engine/src/test/resources/parameters/syncBadParamsUnpairedTimeout.json +++ b/services/services-engine/src/test/resources/parameters/syncBadParamsUnpairedTimeout.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -34,7 +34,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -55,7 +55,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/bbb.json" + "fileName": "target/bbb.json" } } }, diff --git a/services/services-engine/src/test/resources/parameters/syncGoodParams.json b/services/services-engine/src/test/resources/parameters/syncGoodParams.json index b2980aaed..2a29254de 100644 --- a/services/services-engine/src/test/resources/parameters/syncGoodParams.json +++ b/services/services-engine/src/test/resources/parameters/syncGoodParams.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -33,7 +33,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -52,7 +52,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/bbb.json" + "fileName": "target/bbb.json" } } }, diff --git a/services/services-engine/src/test/resources/parameters/syncGoodParamsBothTimeout.json b/services/services-engine/src/test/resources/parameters/syncGoodParamsBothTimeout.json index 68626958d..1988b76bd 100644 --- a/services/services-engine/src/test/resources/parameters/syncGoodParamsBothTimeout.json +++ b/services/services-engine/src/test/resources/parameters/syncGoodParamsBothTimeout.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "synchronousTimeout": 12345, @@ -35,7 +35,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -55,7 +55,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/bbb.json" + "fileName": "target/bbb.json" } } }, diff --git a/services/services-engine/src/test/resources/parameters/syncGoodParamsConsumerTimeout.json b/services/services-engine/src/test/resources/parameters/syncGoodParamsConsumerTimeout.json index d849040ac..b294a22f7 100644 --- a/services/services-engine/src/test/resources/parameters/syncGoodParamsConsumerTimeout.json +++ b/services/services-engine/src/test/resources/parameters/syncGoodParamsConsumerTimeout.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -33,7 +33,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -53,7 +53,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/bbb.json" + "fileName": "target/bbb.json" } } }, diff --git a/services/services-engine/src/test/resources/parameters/syncGoodParamsProducerTimeout.json b/services/services-engine/src/test/resources/parameters/syncGoodParamsProducerTimeout.json index b248259a4..824f0f6c2 100644 --- a/services/services-engine/src/test/resources/parameters/syncGoodParamsProducerTimeout.json +++ b/services/services-engine/src/test/resources/parameters/syncGoodParamsProducerTimeout.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -20,7 +20,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -34,7 +34,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -54,7 +54,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/bbb.json" + "fileName": "target/bbb.json" } } }, diff --git a/services/services-engine/src/test/resources/parameters/syncMismatchedPeers.json b/services/services-engine/src/test/resources/parameters/syncMismatchedPeers.json index 9e5399d4f..4ca73fc74 100644 --- a/services/services-engine/src/test/resources/parameters/syncMismatchedPeers.json +++ b/services/services-engine/src/test/resources/parameters/syncMismatchedPeers.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -33,7 +33,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -52,7 +52,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/bbb.json" + "fileName": "target/bbb.json" } } }, diff --git a/services/services-engine/src/test/resources/parameters/syncMismatchedTimeout.json b/services/services-engine/src/test/resources/parameters/syncMismatchedTimeout.json index 378106825..e4f9ea335 100644 --- a/services/services-engine/src/test/resources/parameters/syncMismatchedTimeout.json +++ b/services/services-engine/src/test/resources/parameters/syncMismatchedTimeout.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -33,7 +33,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -53,7 +53,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/bbb.json" + "fileName": "target/bbb.json" } } }, diff --git a/services/services-engine/src/test/resources/parameters/syncUnusedConsumerPeers.json b/services/services-engine/src/test/resources/parameters/syncUnusedConsumerPeers.json index 71337f340..3f2c8c555 100644 --- a/services/services-engine/src/test/resources/parameters/syncUnusedConsumerPeers.json +++ b/services/services-engine/src/test/resources/parameters/syncUnusedConsumerPeers.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -33,7 +33,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -52,7 +52,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/bbb.json" + "fileName": "target/bbb.json" } } }, diff --git a/services/services-engine/src/test/resources/parameters/syncUnusedProducerPeers.json b/services/services-engine/src/test/resources/parameters/syncUnusedProducerPeers.json index 4fe58bacc..c377ea6fc 100644 --- a/services/services-engine/src/test/resources/parameters/syncUnusedProducerPeers.json +++ b/services/services-engine/src/test/resources/parameters/syncUnusedProducerPeers.json @@ -5,10 +5,10 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { - "MVEL": { + "JAVASCRIPT": { "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters" } } @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -33,7 +33,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/aaa.json" + "fileName": "target/aaa.json" } }, "eventProtocolParameters": { @@ -52,7 +52,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "/tmp/bbb.json" + "fileName": "target/bbb.json" } } }, |