diff options
author | liamfallon <liam.fallon@ericsson.com> | 2018-11-06 12:02:46 +0000 |
---|---|---|
committer | liamfallon <liam.fallon@ericsson.com> | 2018-11-07 12:41:09 +0000 |
commit | 53d8916cc60d97e2ce7ae345f8cc25f5602567da (patch) | |
tree | ee2f3a8e543c31993c51a58257354ccffb648dfe /testsuites/integration/integration-uservice-test/src/test/resources/prodcons | |
parent | 9dc414a0cabc9074e87a7c9cd5c3e5ceee733e5a (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>
Diffstat (limited to 'testsuites/integration/integration-uservice-test/src/test/resources/prodcons')
40 files changed, 68 insertions, 1190 deletions
diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Context_AvroEventAlbum_file2file.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Context_AvroEventAlbum_file2file.json index 431b05a1e..9c6a746c0 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Context_AvroEventAlbum_file2file.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Context_AvroEventAlbum_file2file.json @@ -27,7 +27,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "src/test/resources/events/Context_AvroEventAlbum_EventOut.json" + "fileName": "target/Context_AvroEventAlbum_EventOut.json" } }, "eventProtocolParameters": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Context_JavaEventAlbum_file2file.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Context_JavaEventAlbum_file2file.json index 54f1a9332..4205f0317 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Context_JavaEventAlbum_file2file.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Context_JavaEventAlbum_file2file.json @@ -19,7 +19,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "src/test/resources/events/Context_JavaEventAlbum_EventOut.json" + "fileName": "target/Context_JavaEventAlbum_EventOut.json" } }, "eventProtocolParameters": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2FileFilteredInJsonEvent.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2FileFilteredInJsonEvent.json deleted file mode 100644 index 209e94fea..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2FileFilteredInJsonEvent.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12545, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - } - } - }, - "eventInputParameters": { - "inputZero": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "src/test/resources/events/EventsIn.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "eventNameFilter": "^E[Vv][Ee][Nn][Tt][0-9]000$" - } - }, - "eventOutputParameters": { - "outputZero": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "src/test/resources/events/Events0004Out.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - } -} diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2FileFilteredInOutJsonEvent.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2FileFilteredInOutJsonEvent.json deleted file mode 100644 index 10544c45e..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2FileFilteredInOutJsonEvent.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12545, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - } - } - }, - "eventInputParameters": { - "inputZero": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "src/test/resources/events/EventsIn.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "eventNameFilter": "^E[Vv][Ee][Nn][Tt][0-9]000$" - }, - "inputOne": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "src/test/resources/events/EventsIn.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "eventNameFilter": "^E[Vv][Ee][Nn][Tt][0-9]100$" - } - }, - "eventOutputParameters": { - "outputZero": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "src/test/resources/events/Events0004Out.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "eventNameFilter": "^E[Vv][Ee][Nn][Tt][0-9]004$" - }, - "outputOne": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "src/test/resources/events/Events0104Out.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "eventNameFilter": "^E[Vv][Ee][Nn][Tt][0-9]104$" - } - } -} diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2FileFilteredOutJsonEvent.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2FileFilteredOutJsonEvent.json deleted file mode 100644 index 99b7c6684..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2FileFilteredOutJsonEvent.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12545, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - } - } - }, - "eventInputParameters": { - "inputZero": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "src/test/resources/events/EventsIn.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - }, - "eventOutputParameters": { - "outputZero": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "src/test/resources/events/Events0004Out.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "eventNameFilter": "^E[Vv][Ee][Nn][Tt][0-9]004$" - }, - "outputOne": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "src/test/resources/events/Events0104Out.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "eventNameFilter": "^E[Vv][Ee][Nn][Tt][0-9]104$" - } - } -} diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2FileJsonEvent.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2FileJsonEvent.json deleted file mode 100644 index fb42942d7..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2FileJsonEvent.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12545, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "aProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "src/test/resources/events/EventsOut.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - }, - "eventInputParameters": { - "aConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "src/test/resources/events/EventsIn.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - } -} diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2FileXmlEvent.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2FileXmlEvent.json deleted file mode 100644 index 4b3adfaae..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2FileXmlEvent.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12546, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "aProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "src/test/resources/events/EventsOut.xmlfile" - } - }, - "eventProtocolParameters": { - "eventProtocol": "XML", - "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters" - } - } - }, - "eventInputParameters": { - "aConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "src/test/resources/events/EventsIn.xmlfile" - } - }, - "eventProtocolParameters": { - "eventProtocol": "XML", - "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters" - } - } - } -} diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventBadHTTPMethod.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventBadHTTPMethod.json index 9ce0bb348..f290320a5 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventBadHTTPMethod.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventBadHTTPMethod.json @@ -5,11 +5,11 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" } } } @@ -34,7 +34,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "src/test/resources/events/EventsIn.json" + "fileName": "target/examples/events/SampleDomain/EventsIn.json" } }, "eventProtocolParameters": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventBadURL.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventBadURL.json index 639b7c677..0dca6bb0a 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventBadURL.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventBadURL.json @@ -5,11 +5,11 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" } } } @@ -33,7 +33,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "src/test/resources/events/EventsIn.json" + "fileName": "target/examples/events/SampleDomain/EventsIn.json" } }, "eventProtocolParameters": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventNoURL.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventNoURL.json index 2dcedf7fd..be9ab2ad7 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventNoURL.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventNoURL.json @@ -5,11 +5,11 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" } } } @@ -30,7 +30,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "src/test/resources/events/EventsIn.json" + "fileName": "target/examples/events/SampleDomain/EventsIn.json" } }, "eventProtocolParameters": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventPost.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventPost.json deleted file mode 100644 index 1fa52d055..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventPost.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "FirstProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTCLIENT", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters", - "parameters": { - "url": "http://localhost:32801/TestFile2Rest/apex/event/PostEvent" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - }, - "eventInputParameters": { - "FirstConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "src/test/resources/events/EventsIn.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - } -} diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventPostBadResponse.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventPostBadResponse.json index e196d8999..6523d510c 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventPostBadResponse.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventPostBadResponse.json @@ -5,11 +5,11 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" } } } @@ -33,7 +33,7 @@ "carrierTechnologyParameters": { "carrierTechnology": "FILE", "parameters": { - "fileName": "src/test/resources/events/EventsIn.json" + "fileName": "target/examples/events/SampleDomain/EventsIn.json" } }, "eventProtocolParameters": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventPut.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventPut.json deleted file mode 100644 index 641c0c97e..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventPut.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "FirstProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTCLIENT", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters", - "parameters": { - "url": "http://localhost:32801/TestFile2Rest/apex/event/PutEvent", - "httpMethod": "PUT" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - }, - "eventInputParameters": { - "FirstConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "src/test/resources/events/EventsIn.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - } -} diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/JMS2JMSJsonEvent.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/JMS2JMSJsonEvent.json deleted file mode 100644 index f8479969b..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/JMS2JMSJsonEvent.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12553, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "aProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "JMS", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.jms.JmsCarrierTechnologyParameters", - "parameters": { - "initialContextFactory": "org.onap.policy.apex.testsuites.integration.uservice.adapt.jms.TestInitialContextFactory", - "connectionFactory": "ConnectionFactory", - "providerURL": "remote://localhost:5445", - "securityPrincipal": "guest", - "securityCredentials": "IAmAGuest", - "producerTopic": "jms/topic/apexOut", - "objectMessageSending": "false" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JMSTEXT", - "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.jms.JmsTextEventProtocolParameters" - } - } - }, - "eventInputParameters": { - "aConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "JMS", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.jms.JmsCarrierTechnologyParameters", - "parameters": { - "initialContextFactory": "org.onap.policy.apex.testsuites.integration.uservice.adapt.jms.TestInitialContextFactory", - "connectionFactory": "ConnectionFactory", - "providerURL": "remote://localhost:5445", - "securityPrincipal": "guest", - "securityCredentials": "IAmAGuest", - "consumerTopic": "jms/topic/apexIn" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JMSTEXT", - "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.jms.JmsTextEventProtocolParameters" - } - } - } -} - diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/JMS2JMSObjectEvent.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/JMS2JMSObjectEvent.json deleted file mode 100644 index 8fea3346b..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/JMS2JMSObjectEvent.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12553, - "policyModelFileName": "src/test/resources/policymodels/JMSTestModel.json", - "engineParameters": { - "executorParameters": { - "JAVASCRIPT": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "aProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "JMS", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.jms.JmsCarrierTechnologyParameters", - "parameters": { - "initialContextFactory": "org.onap.policy.apex.testsuites.integration.uservice.adapt.jms.TestInitialContextFactory", - "connectionFactory": "ConnectionFactory", - "providerURL": "remote://localhost:5445", - "securityPrincipal": "guest", - "securityCredentials": "IAmAGuest", - "producerTopic": "jms/topic/apexOut" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JMSOBJECT", - "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.jms.JmsObjectEventProtocolParameters" - } - } - }, - "eventInputParameters": { - "aConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "JMS", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.jms.JmsCarrierTechnologyParameters", - "parameters": { - "initialContextFactory": "org.onap.policy.apex.testsuites.integration.uservice.adapt.jms.TestInitialContextFactory", - "connectionFactory": "ConnectionFactory", - "providerURL": "remote://localhost:5445", - "securityPrincipal": "guest", - "securityCredentials": "IAmAGuest", - "consumerTopic": "jms/topic/apexIn" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JMSOBJECT", - "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.jms.JmsObjectEventProtocolParameters" - } - } - } -} - diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Kafka2KafkaJsonEvent.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Kafka2KafkaJsonEvent.json deleted file mode 100644 index f861c27bc..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Kafka2KafkaJsonEvent.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12547, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "aProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "KAFKA", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.kafka.KafkaCarrierTechnologyParameters", - "parameters": { - "bootstrapServers": "localhost:39902", - "acks": "all", - "retries": 0, - "batchSize": 16384, - "lingerTime": 1, - "bufferMemory": 33554432, - "producerTopic": "apex-out-json", - "keySerializer": "org.apache.kafka.common.serialization.StringSerializer", - "valueSerializer": "org.apache.kafka.common.serialization.StringSerializer" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - }, - "eventInputParameters": { - "aConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "KAFKA", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.kafka.KafkaCarrierTechnologyParameters", - "parameters": { - "bootstrapServers": "localhost:39902", - "groupId": "apex-group", - "enableAutoCommit": true, - "autoCommitTime": 1000, - "sessionTimeout": 30000, - "consumerPollTime": 100, - "consumerTopicList": [ - "apex-in-json" - ], - "keyDeserializer": "org.apache.kafka.common.serialization.StringDeserializer", - "valueDeserializer": "org.apache.kafka.common.serialization.StringDeserializer" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - } -} diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Kafka2KafkaXmlEvent.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Kafka2KafkaXmlEvent.json deleted file mode 100644 index f18ecc2ed..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Kafka2KafkaXmlEvent.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 3, - "deploymentPort": 12548, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "aProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "KAFKA", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.kafka.KafkaCarrierTechnologyParameters", - "parameters": { - "bootstrapServers": "localhost:39902", - "acks": "all", - "retries": 0, - "batchSize": 16384, - "lingerTime": 1, - "bufferMemory": 33554432, - "producerTopic": "apex-out-xml", - "keySerializer": "org.apache.kafka.common.serialization.StringSerializer", - "valueSerializer": "org.apache.kafka.common.serialization.StringSerializer" - } - }, - "eventProtocolParameters": { - "eventProtocol": "XML", - "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters" - } - } - }, - "eventInputParameters": { - "aConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "KAFKA", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.kafka.KafkaCarrierTechnologyParameters", - "parameters": { - "bootstrapServers": "localhost:39902", - "groupId": "apex-group", - "enableAutoCommit": true, - "autoCommitTime": 1000, - "sessionTimeout": 30000, - "consumerPollTime": 100, - "consumerTopicList": [ - "apex-in-xml" - ], - "keyDeserializer": "org.apache.kafka.common.serialization.StringDeserializer", - "valueDeserializer": "org.apache.kafka.common.serialization.StringDeserializer" - } - }, - "eventProtocolParameters": { - "eventProtocol": "XML", - "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters" - } - } - } -} diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/LBPolicy_ExecModel_file2kafka.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/LBPolicy_ExecModel_file2kafka.json index 7b4127d53..8296485f4 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/LBPolicy_ExecModel_file2kafka.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/LBPolicy_ExecModel_file2kafka.json @@ -5,11 +5,11 @@ "id": 102, "instanceCount": 1, "deploymentPort": 12549, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMvel.json", + "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" } } } diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEmptyEvents.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEmptyEvents.json index 804b91e9f..fae8987ac 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEmptyEvents.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEmptyEvents.json @@ -5,11 +5,11 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" } } } diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEvent.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEvent.json deleted file mode 100644 index 6424e52e1..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEvent.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - } - } - }, - "eventInputParameters": { - "FirstConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTCLIENT", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters", - "parameters": { - "url": "http://localhost:32801/TestRest2File/apex/event/GetEvent" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - }, - "eventOutputParameters": { - "FirstProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "src/test/resources/events/EventsOut.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - } -} diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEventBadHTTPMethod.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEventBadHTTPMethod.json index 227c20a0e..8b779668d 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEventBadHTTPMethod.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEventBadHTTPMethod.json @@ -5,11 +5,11 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" } } } diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEventBadResponse.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEventBadResponse.json index f365a9631..fb79d6536 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEventBadResponse.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEventBadResponse.json @@ -5,11 +5,11 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" } } } diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEventBadURL.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEventBadURL.json index 852e69194..8a188799c 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEventBadURL.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEventBadURL.json @@ -5,11 +5,11 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" } } } diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEventNoURL.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEventNoURL.json index 877ca47ba..65ddb2583 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEventNoURL.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/REST2FileJsonEventNoURL.json @@ -5,11 +5,11 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" } } } diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEvent.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEvent.json deleted file mode 100644 index f482bc9b2..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEvent.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - } - } - }, - "eventInputParameters": { - "FirstConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTSERVER", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters", - "parameters": { - "standalone": true, - "host": "localhost", - "port": 23324 - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "synchronousMode": true, - "synchronousPeer": "FirstProducer", - "synchronousTimeout": 500 - } - }, - "eventOutputParameters": { - "FirstProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTSERVER", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters" - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "synchronousMode": true, - "synchronousPeer": "FirstConsumer", - "synchronousTimeout": 500 - } - } -} diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventConsumerNotSync.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventConsumerNotSync.json index 0b325a08d..0b6c8f182 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventConsumerNotSync.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventConsumerNotSync.json @@ -5,11 +5,11 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" } } } @@ -41,7 +41,7 @@ }, "synchronousMode": true, "synchronousPeer": "FirstConsumer", - "synchronousTimeout": 500 + "synchronousTimeout": 2000 } } } diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventConsumerStandaloneNoHost.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventConsumerStandaloneNoHost.json index 40943e794..999384435 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventConsumerStandaloneNoHost.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventConsumerStandaloneNoHost.json @@ -5,11 +5,11 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" } } } @@ -28,7 +28,7 @@ }, "synchronousMode": true, "synchronousPeer": "FirstProducer", - "synchronousTimeout": 500 + "synchronousTimeout": 2000 } }, "eventOutputParameters": { @@ -42,7 +42,7 @@ }, "synchronousMode": true, "synchronousPeer": "FirstConsumer", - "synchronousTimeout": 500 + "synchronousTimeout": 2000 } } } diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventConsumerStandaloneNoPort.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventConsumerStandaloneNoPort.json index 85e33ef54..7eaaacd83 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventConsumerStandaloneNoPort.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventConsumerStandaloneNoPort.json @@ -5,11 +5,11 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" } } } @@ -29,7 +29,7 @@ }, "synchronousMode": true, "synchronousPeer": "FirstProducer", - "synchronousTimeout": 500 + "synchronousTimeout": 2000 } }, "eventOutputParameters": { @@ -43,7 +43,7 @@ }, "synchronousMode": true, "synchronousPeer": "FirstConsumer", - "synchronousTimeout": 500 + "synchronousTimeout": 2000 } } } diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventContextAvro.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventContextAvro.json deleted file mode 100644 index 2cd373810..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventContextAvro.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/VPNPolicyModelAvro.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - }, - "contextParameters": { - "parameterClassName": "org.onap.policy.apex.context.parameters.ContextParameters", - "schemaParameters": { - "Avro": { - "parameterClassName": "org.onap.policy.apex.plugins.context.schema.avro.AvroSchemaHelperParameters" - } - } - } - } - }, - "eventInputParameters": { - "FirstConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTSERVER", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters", - "parameters": { - "standalone": true, - "host": "localhost", - "port": 23324 - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "synchronousMode": true, - "synchronousPeer": "FirstProducer", - "synchronousTimeout": 500 - } - }, - "eventOutputParameters": { - "FirstProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTSERVER", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters" - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "synchronousMode": true, - "synchronousPeer": "FirstConsumer", - "synchronousTimeout": 500 - } - } -} diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventContextJava.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventContextJava.json deleted file mode 100644 index 193c259b5..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventContextJava.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/VPNPolicyModelJava.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - }, - "contextParameters": { - "parameterClassName": "org.onap.policy.apex.context.parameters.ContextParameters", - "schemaParameters": { - "Avro": { - "parameterClassName": "org.onap.policy.apex.plugins.context.schema.avro.AvroSchemaHelperParameters" - } - } - } - } - }, - "eventInputParameters": { - "FirstConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTSERVER", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters", - "parameters": { - "standalone": true, - "host": "localhost", - "port": 23324 - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "synchronousMode": true, - "synchronousPeer": "FirstProducer", - "synchronousTimeout": 500 - } - }, - "eventOutputParameters": { - "FirstProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTSERVER", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters" - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "synchronousMode": true, - "synchronousPeer": "FirstConsumer", - "synchronousTimeout": 500 - } - } -} diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventDivideByZero.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventDivideByZero.json deleted file mode 100644 index d4b6d19b5..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventDivideByZero.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVELDivideByZero.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - } - } - }, - "eventInputParameters": { - "FirstConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTSERVER", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters", - "parameters": { - "standalone": true, - "host": "localhost", - "port": 23324 - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "synchronousMode": true, - "synchronousPeer": "FirstProducer", - "synchronousTimeout": 500 - } - }, - "eventOutputParameters": { - "FirstProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTSERVER", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters" - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "synchronousMode": true, - "synchronousPeer": "FirstConsumer", - "synchronousTimeout": 500 - } - } -} diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventMultiIn.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventMultiIn.json deleted file mode 100644 index b34a85d32..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventMultiIn.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - } - } - }, - "eventInputParameters": { - "FirstConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTSERVER", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters", - "parameters": { - "standalone": true, - "host": "localhost", - "port": 23324 - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "synchronousMode": true, - "synchronousPeer": "FirstProducer", - "synchronousTimeout": 500 - }, - "SecondConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTSERVER", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters", - "parameters": { - "standalone": true, - "host": "localhost", - "port": 23325 - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "synchronousMode": true, - "synchronousPeer": "SecondProducer", - "synchronousTimeout": 500 - } - }, - "eventOutputParameters": { - "FirstProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTSERVER", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters" - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "synchronousMode": true, - "synchronousPeer": "FirstConsumer", - "synchronousTimeout": 500 - }, - "SecondProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTSERVER", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters" - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "synchronousMode": true, - "synchronousPeer": "SecondConsumer", - "synchronousTimeout": 500 - } - } -} diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerHost.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerHost.json index 2c73fc3de..5ecde66a8 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerHost.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerHost.json @@ -5,11 +5,11 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" } } } @@ -30,7 +30,7 @@ }, "synchronousMode": true, "synchronousPeer": "FirstProducer", - "synchronousTimeout": 500 + "synchronousTimeout": 2000 } }, "eventOutputParameters": { @@ -47,7 +47,7 @@ }, "synchronousMode": true, "synchronousPeer": "FirstConsumer", - "synchronousTimeout": 500 + "synchronousTimeout": 2000 } } } diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerNotSync.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerNotSync.json index 8c55d158d..5662e656f 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerNotSync.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerNotSync.json @@ -5,11 +5,11 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" } } } diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerPort.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerPort.json index da08cf569..e12d63ffe 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerPort.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerPort.json @@ -5,11 +5,11 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" } } } @@ -30,7 +30,7 @@ }, "synchronousMode": true, "synchronousPeer": "FirstProducer", - "synchronousTimeout": 500 + "synchronousTimeout": 2000 } }, "eventOutputParameters": { @@ -47,7 +47,7 @@ }, "synchronousMode": true, "synchronousPeer": "FirstConsumer", - "synchronousTimeout": 500 + "synchronousTimeout": 2000 } } } diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerStandalone.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerStandalone.json index a2626dcf1..e74156b14 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerStandalone.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerStandalone.json @@ -5,11 +5,11 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" } } } @@ -30,7 +30,7 @@ }, "synchronousMode": true, "synchronousPeer": "FirstProducer", - "synchronousTimeout": 500 + "synchronousTimeout": 2000 } }, "eventOutputParameters": { @@ -47,7 +47,7 @@ }, "synchronousMode": true, "synchronousPeer": "FirstConsumer", - "synchronousTimeout": 500 + "synchronousTimeout": 2000 } } } diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Ws2WsClientJsonEvent.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Ws2WsClientJsonEvent.json deleted file mode 100644 index 7caa8b264..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Ws2WsClientJsonEvent.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12552, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "aProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "WEBSOCKET", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WebSocketCarrierTechnologyParameters", - "parameters": { - "host": "localhost", - "port": 42453 - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - }, - "eventInputParameters": { - "aConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "WEBSOCKET", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WebSocketCarrierTechnologyParameters", - "parameters": { - "host": "localhost", - "port": 42451 - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - } -} diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Ws2WsClientXMLEvent.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Ws2WsClientXMLEvent.json deleted file mode 100644 index 8883d2fa7..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Ws2WsClientXMLEvent.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12553, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "aProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "WEBSOCKET", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WebSocketCarrierTechnologyParameters", - "parameters": { - "host": "localhost", - "port": 42453 - } - }, - "eventProtocolParameters": { - "eventProtocol": "XML", - "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters" - } - } - }, - "eventInputParameters": { - "aConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "WEBSOCKET", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WebSocketCarrierTechnologyParameters", - "parameters": { - "host": "localhost", - "port": 42451 - } - }, - "eventProtocolParameters": { - "eventProtocol": "XML", - "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters" - } - } - } -} diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Ws2WsServerJsonEvent.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Ws2WsServerJsonEvent.json deleted file mode 100644 index e7b1943c1..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Ws2WsServerJsonEvent.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12554, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "aProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "WEBSOCKET", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WebSocketCarrierTechnologyParameters", - "parameters": { - "wsClient": false, - "port": 42452 - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - }, - "eventInputParameters": { - "aConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "WEBSOCKET", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WebSocketCarrierTechnologyParameters", - "parameters": { - "wsClient": false, - "port": 42450 - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - } -} diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Ws2WsServerXMLEvent.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Ws2WsServerXMLEvent.json deleted file mode 100644 index 5cd7945c2..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Ws2WsServerXMLEvent.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12555, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "aProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "WEBSOCKET", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WebSocketCarrierTechnologyParameters", - "parameters": { - "wsClient": false, - "port": 42452 - } - }, - "eventProtocolParameters": { - "eventProtocol": "XML", - "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters" - } - } - }, - "eventInputParameters": { - "aConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "WEBSOCKET", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WebSocketCarrierTechnologyParameters", - "parameters": { - "wsClient": false, - "port": 42450 - } - }, - "eventProtocolParameters": { - "eventProtocol": "XML", - "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters" - } - } - } -} |