diff options
Diffstat (limited to 'testsuites/integration/integration-uservice-test/src/test/resources')
2 files changed, 2 insertions, 63 deletions
diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/policies/executionproperties/logic/TaskFetchHttpCode.js b/testsuites/integration/integration-uservice-test/src/test/resources/policies/executionproperties/logic/TaskFetchHttpCode.js index b60e2acee..f4d979d1f 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/policies/executionproperties/logic/TaskFetchHttpCode.js +++ b/testsuites/integration/integration-uservice-test/src/test/resources/policies/executionproperties/logic/TaskFetchHttpCode.js @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2021 Bell Canada. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,11 +23,7 @@ executor.logger.debug(executor.getSubject().getId()); executor.logger.debug("executionProperties: " + executor.getExecutionProperties()); -if (executor.getExecutionProperties().get("HTTP_CODE_STATUS") == "500") - executor.outFields.put("testToRun", "CodeFilterSet"); -else - executor.outFields.put("testToRun", "CodeFilterDefault"); - +executor.outFields.put("testToRun", "CodeFilterSet"); executor.logger.debug("testToRun: " + executor.outFields.get("testToRun")); true; diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTHttpCodeFilterSetToTagUrlOK.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTHttpCodeFilterSetToTagUrlOK.json deleted file mode 100644 index 22ab9e3bb..000000000 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTHttpCodeFilterSetToTagUrlOK.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12561, - "engineParameters": { - "executorParameters": { - "JAVASCRIPT": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" - } - } - } - }, - "eventInputParameters": { - "GetCodeConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTCLIENT", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters", - "parameters": { - "url": "http://localhost:32801/TestExecutionRest/apex/event/FetchHttpCode", - "httpMethod": "GET", - "httpHeaders" : [ - ], - "httpCodeFilter" : "[1-5][0][0-5]" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON", - "parameters": { - "testToRun": "FetchHttpCode" - } - }, - "eventName": "Event0200" - } - }, - "eventOutputParameters": { - "FirstProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTCLIENT", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters", - "parameters": { - "url": "http://localhost:32801/TestExecutionRest/apex/event/{tagId}", - "httpMethod": "PUT", - "httpHeaders" : [ - ["Content-Type", "application/json"], - ["Date", "Tue, 24 Jul 2019 14:57:12 GMT"] - ] - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "eventName": "Event0201" - } - } -} |