diff options
94 files changed, 2 insertions, 95 deletions
diff --git a/auth/cli-editor/src/test/resources/tosca/ApexConfig.json b/auth/cli-editor/src/test/resources/tosca/ApexConfig.json index 21a159c0d..6a2c13465 100644 --- a/auth/cli-editor/src/test/resources/tosca/ApexConfig.json +++ b/auth/cli-editor/src/test/resources/tosca/ApexConfig.json @@ -5,7 +5,6 @@ "id": 101, "instanceCount": 4, "deploymentPort": 12345, - "policyModelFileName": "examples/models/MyFirstPolicy/1/MyFirstPolicyModel_0.0.1.json", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/auth/cli-editor/src/test/resources/tosca/ToscaPolicyOutput_compare.json b/auth/cli-editor/src/test/resources/tosca/ToscaPolicyOutput_compare.json index 7a7ce15af..955181e4e 100644 --- a/auth/cli-editor/src/test/resources/tosca/ToscaPolicyOutput_compare.json +++ b/auth/cli-editor/src/test/resources/tosca/ToscaPolicyOutput_compare.json @@ -1 +1 @@ -{"tosca_definitions_version":"tosca_simple_yaml_1_0_0","topology_template":{"policies":[{"operational.sampledomain":{"type":"onap.policies.controlloop.Operational","typeVersion":"1.0.0","name":"onap.policies.controlloop.Operational.apex.sampledomain","version":"1.0.0","properties":{"engineServiceParameters":{"name":"MyFirstPolicyApexEngine","version":"0.0.1","id":101,"instanceCount":4,"deploymentPort":12345,"policyModelFileName":"examples/models/MyFirstPolicy/1/MyFirstPolicyModel_0.0.1.json","engineParameters":{"executorParameters":{"MVEL":{"parameterClassName":"org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters"},"JAVASCRIPT":{"parameterClassName":"org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"}}},"policy_type_impl":{"apexPolicyModel":{"key":{"name":"MyFirstPolicyModel","version":"0.0.1"},"keyInformation":{"key":{"name":"MyFirstPolicyModel_KeyInfo","version":"0.0.1"},"keyInfoMap":{"entry":[{"key":{"name":"MorningBoozeCheck","version":"0.0.1"},"value":{"key":{"name":"MorningBoozeCheck","version":"0.0.1"},"UUID":"3351b0f4-cf06-4fa2-8823-edf67bd30223","description":"This task checks if the sales request is for an item that contains alcohol. \nIf the local time is between 00:00:00 and 11:30:00 then the sale is not authorised. Otherwise the sale is authorised. \nIn this implementation we assume that all items with item_ID values between 1000 and 2000 contain alcohol :-)"}},{"key":{"name":"MyFirstPolicy","version":"0.0.1"},"value":{"key":{"name":"MyFirstPolicy","version":"0.0.1"},"UUID":"6c5e410f-489a-46ff-964e-982ce6e8b6d0","description":"This is my first Apex policy. It checks if a sale should be authorised or not."}},{"key":{"name":"MyFirstPolicyModel","version":"0.0.1"},"value":{"key":{"name":"MyFirstPolicyModel","version":"0.0.1"},"UUID":"540226fb-55ee-4f0e-a444-983a0494818e","description":"This is my first Apex Policy Model."}},{"key":{"name":"MyFirstPolicyModel_Events","version":"0.0.1"},"value":{"key":{"name":"MyFirstPolicyModel_Events","version":"0.0.1"},"UUID":"ef281318-5ac9-3ef0-8db3-8f9c4e4a81e2","description":"Generated description for concept referred to by key \"MyFirstPolicyModel_Events:0.0.1\""}},{"key":{"name":"MyFirstPolicyModel_KeyInfo","version":"0.0.1"},"value":{"key":{"name":"MyFirstPolicyModel_KeyInfo","version":"0.0.1"},"UUID":"d9248c6f-7c00-38df-8251-611463ba4065","description":"Generated description for concept referred to by key \"MyFirstPolicyModel_KeyInfo:0.0.1\""}},{"key":{"name":"MyFirstPolicyModel_Policies","version":"0.0.1"},"value":{"key":{"name":"MyFirstPolicyModel_Policies","version":"0.0.1"},"UUID":"77c01a6b-510c-3aa9-b640-b4db356aa03b","description":"Generated description for concept referred to by key \"MyFirstPolicyModel_Policies:0.0.1\""}},{"key":{"name":"MyFirstPolicyModel_Schemas","version":"0.0.1"},"value":{"key":{"name":"MyFirstPolicyModel_Schemas","version":"0.0.1"},"UUID":"d0cc3aa0-ea69-3a43-80ff-a0dbb0ebd885","description":"Generated description for concept referred to by key \"MyFirstPolicyModel_Schemas:0.0.1\""}},{"key":{"name":"MyFirstPolicyModel_Tasks","version":"0.0.1"},"value":{"key":{"name":"MyFirstPolicyModel_Tasks","version":"0.0.1"},"UUID":"b02a7e02-2cd0-39e6-b3cb-946fa83a8f08","description":"Generated description for concept referred to by key \"MyFirstPolicyModel_Tasks:0.0.1\""}},{"key":{"name":"SALE_AUTH","version":"0.0.1"},"value":{"key":{"name":"SALE_AUTH","version":"0.0.1"},"UUID":"c4500941-3f98-4080-a9cc-5b9753ed050b","description":"An event emitted by the Policy to indicate whether the sale of an item has been authorised"}},{"key":{"name":"SALE_INPUT","version":"0.0.1"},"value":{"key":{"name":"SALE_INPUT","version":"0.0.1"},"UUID":"4f04aa98-e917-4f4a-882a-c75ba5a99374","description":"An event raised by the PoS system each time an item is scanned for purchase"}},{"key":{"name":"assistant_ID_type","version":"0.0.1"},"value":{"key":{"name":"assistant_ID_type","version":"0.0.1"},"UUID":"36df4c71-9616-4206-8b53-976a5cd4bd87","description":"A type for 'assistant_ID' values"}},{"key":{"name":"authorised_type","version":"0.0.1"},"value":{"key":{"name":"authorised_type","version":"0.0.1"},"UUID":"d48b619e-d00d-4008-b884-02d76ea4350b","description":"A type for 'authorised' values"}},{"key":{"name":"branch_ID_type","version":"0.0.1"},"value":{"key":{"name":"branch_ID_type","version":"0.0.1"},"UUID":"6468845f-4122-4128-8e49-0f52c26078b5","description":"A type for 'branch_ID' values"}},{"key":{"name":"item_ID_type","version":"0.0.1"},"value":{"key":{"name":"item_ID_type","version":"0.0.1"},"UUID":"4f227ff1-aee0-453a-b6b6-9a4b2e0da932","description":"A type for 'item_ID' values"}},{"key":{"name":"message_type","version":"0.0.1"},"value":{"key":{"name":"message_type","version":"0.0.1"},"UUID":"ad1431bb-3155-4e73-b5a3-b89bee498749","description":"A type for 'message' values"}},{"key":{"name":"notes_type","version":"0.0.1"},"value":{"key":{"name":"notes_type","version":"0.0.1"},"UUID":"eecfde90-896c-4343-8f9c-2603ced94e2d","description":"A type for 'notes' values"}},{"key":{"name":"price_type","version":"0.0.1"},"value":{"key":{"name":"price_type","version":"0.0.1"},"UUID":"52c2fc45-fd8c-463c-bd6f-d91b0554aea7","description":"A type for 'amount'/'price' values"}},{"key":{"name":"quantity_type","version":"0.0.1"},"value":{"key":{"name":"quantity_type","version":"0.0.1"},"UUID":"ac3d9842-80af-4a98-951c-bd79a431c613","description":"A type for 'quantity' values"}},{"key":{"name":"sale_ID_type","version":"0.0.1"},"value":{"key":{"name":"sale_ID_type","version":"0.0.1"},"UUID":"cca47d74-7754-4a61-b163-ca31f66b157b","description":"A type for 'sale_ID' values"}},{"key":{"name":"timestamp_type","version":"0.0.1"},"value":{"key":{"name":"timestamp_type","version":"0.0.1"},"UUID":"fd594e88-411d-4a94-b2be-697b3a0d7adf","description":"A type for 'time' values"}}]}},"policies":{"key":{"name":"MyFirstPolicyModel_Policies","version":"0.0.1"},"policyMap":{"entry":[{"key":{"name":"MyFirstPolicy","version":"0.0.1"},"value":{"policyKey":{"name":"MyFirstPolicy","version":"0.0.1"},"template":"FREEFORM","state":{"entry":[{"key":"BoozeAuthDecide","value":{"stateKey":{"parentKeyName":"MyFirstPolicy","parentKeyVersion":"0.0.1","parentLocalName":"NULL","localName":"BoozeAuthDecide"},"trigger":{"name":"SALE_INPUT","version":"0.0.1"},"stateOutputs":{"entry":[{"key":"MorningBoozeCheck_Output_Direct","value":{"key":{"parentKeyName":"MyFirstPolicy","parentKeyVersion":"0.0.1","parentLocalName":"BoozeAuthDecide","localName":"MorningBoozeCheck_Output_Direct"},"outgoingEvent":{"name":"SALE_AUTH","version":"0.0.1"},"nextState":{"parentKeyName":"NULL","parentKeyVersion":"0.0.0","parentLocalName":"NULL","localName":"NULL"}}}]},"contextAlbumReference":[],"taskSelectionLogic":{"key":"NULL","logicFlavour":"UNDEFINED","logic":""},"stateFinalizerLogicMap":{"entry":[]},"defaultTask":{"name":"MorningBoozeCheck","version":"0.0.1"},"taskReferences":{"entry":[{"key":{"name":"MorningBoozeCheck","version":"0.0.1"},"value":{"key":{"parentKeyName":"MyFirstPolicy","parentKeyVersion":"0.0.1","parentLocalName":"BoozeAuthDecide","localName":"MorningBoozeCheck"},"outputType":"DIRECT","output":{"parentKeyName":"MyFirstPolicy","parentKeyVersion":"0.0.1","parentLocalName":"BoozeAuthDecide","localName":"MorningBoozeCheck_Output_Direct"}}}]}}}]},"firstState":"BoozeAuthDecide"}}]}},"tasks":{"key":{"name":"MyFirstPolicyModel_Tasks","version":"0.0.1"},"taskMap":{"entry":[{"key":{"name":"MorningBoozeCheck","version":"0.0.1"},"value":{"key":{"name":"MorningBoozeCheck","version":"0.0.1"},"inputFields":{"entry":[{"key":"amount","value":{"key":"amount","fieldSchemaKey":{"name":"price_type","version":"0.0.1"},"optional":false}},{"key":"assistant_ID","value":{"key":"assistant_ID","fieldSchemaKey":{"name":"assistant_ID_type","version":"0.0.1"},"optional":false}},{"key":"branch_ID","value":{"key":"branch_ID","fieldSchemaKey":{"name":"branch_ID_type","version":"0.0.1"},"optional":false}},{"key":"item_ID","value":{"key":"item_ID","fieldSchemaKey":{"name":"item_ID_type","version":"0.0.1"},"optional":false}},{"key":"notes","value":{"key":"notes","fieldSchemaKey":{"name":"notes_type","version":"0.0.1"},"optional":true}},{"key":"quantity","value":{"key":"quantity","fieldSchemaKey":{"name":"quantity_type","version":"0.0.1"},"optional":false}},{"key":"sale_ID","value":{"key":"sale_ID","fieldSchemaKey":{"name":"sale_ID_type","version":"0.0.1"},"optional":false}},{"key":"time","value":{"key":"time","fieldSchemaKey":{"name":"timestamp_type","version":"0.0.1"},"optional":false}}]},"outputFields":{"entry":[{"key":"amount","value":{"key":"amount","fieldSchemaKey":{"name":"price_type","version":"0.0.1"},"optional":false}},{"key":"assistant_ID","value":{"key":"assistant_ID","fieldSchemaKey":{"name":"assistant_ID_type","version":"0.0.1"},"optional":false}},{"key":"authorised","value":{"key":"authorised","fieldSchemaKey":{"name":"authorised_type","version":"0.0.1"},"optional":false}},{"key":"branch_ID","value":{"key":"branch_ID","fieldSchemaKey":{"name":"branch_ID_type","version":"0.0.1"},"optional":false}},{"key":"item_ID","value":{"key":"item_ID","fieldSchemaKey":{"name":"item_ID_type","version":"0.0.1"},"optional":false}},{"key":"message","value":{"key":"message","fieldSchemaKey":{"name":"message_type","version":"0.0.1"},"optional":true}},{"key":"notes","value":{"key":"notes","fieldSchemaKey":{"name":"notes_type","version":"0.0.1"},"optional":true}},{"key":"quantity","value":{"key":"quantity","fieldSchemaKey":{"name":"quantity_type","version":"0.0.1"},"optional":false}},{"key":"sale_ID","value":{"key":"sale_ID","fieldSchemaKey":{"name":"sale_ID_type","version":"0.0.1"},"optional":false}},{"key":"time","value":{"key":"time","fieldSchemaKey":{"name":"timestamp_type","version":"0.0.1"},"optional":false}}]},"taskParameters":{"entry":[]},"contextAlbumReference":[],"taskLogic":{"key":"TaskLogic","logicFlavour":"MVEL","logic":"/*\n * ============LICENSE_START=======================================================\n * Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * Modifications Copyright (C) 2019 Nordix Foundation.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\nimport java.util.Date;\nimport java.util.Calendar;\nimport java.util.TimeZone;\nimport java.text.SimpleDateFormat;\n\nlogger.info(\"Task Execution: '\"+subject.id+\"'. Input Fields: '\"+inFields+\"'\");\n\noutFields.put(\"amount\" , inFields.get(\"amount\"));\noutFields.put(\"assistant_ID\", inFields.get(\"assistant_ID\"));\noutFields.put(\"notes\" , inFields.get(\"notes\"));\noutFields.put(\"quantity\" , inFields.get(\"quantity\"));\noutFields.put(\"branch_ID\" , inFields.get(\"branch_ID\"));\noutFields.put(\"item_ID\" , inFields.get(\"item_ID\"));\noutFields.put(\"time\" , inFields.get(\"time\"));\noutFields.put(\"sale_ID\" , inFields.get(\"sale_ID\"));\n\nitem_id = inFields.get(\"item_ID\");\n\n//The events used later to test this task use GMT timezone!\ngmt = TimeZone.getTimeZone(\"GMT\");\ntimenow = Calendar.getInstance(gmt);\ndf = new SimpleDateFormat(\"HH:mm:ss z\");\ndf.setTimeZone(gmt);\ntimenow.setTimeInMillis(inFields.get(\"time\"));\n\nmidnight = timenow.clone();\nmidnight.set(\n timenow.get(Calendar.YEAR),timenow.get(Calendar.MONTH),\n timenow.get(Calendar.DATE),0,0,0);\neleven30 = timenow.clone();\neleven30.set(\n timenow.get(Calendar.YEAR),timenow.get(Calendar.MONTH),\n timenow.get(Calendar.DATE),11,30,0);\n\nitemisalcohol = false;\nif(item_id != null && item_id >=1000 && item_id < 2000)\n itemisalcohol = true;\n\nif( itemisalcohol\n && timenow.after(midnight) && timenow.before(eleven30)){\n outFields.put(\"authorised\", false);\n outFields.put(\"message\", \"Sale not authorised by policy task \"+subject.taskName+\n \" for time \"+df.format(timenow.getTime())+\n \". Alcohol can not be sold between \"+df.format(midnight.getTime())+\n \" and \"+df.format(eleven30.getTime()));\n return true;\n}\nelse{\n outFields.put(\"authorised\", true);\n outFields.put(\"message\", \"Sale authorised by policy task \"+subject.taskName+\n \" for time \"+df.format(timenow.getTime()));\n return true;\n}\n\n/*\nThis task checks if a sale request is for an item that is an alcoholic drink.\nIf the local time is between 00:00:00 GMT and 11:30:00 GMT then the sale is not\nauthorised. Otherwise the sale is authorised.\nIn this implementation we assume that items with item_ID value between 1000 and\n2000 are all alcoholic drinks :-)\n*/"}}}]}},"events":{"key":{"name":"MyFirstPolicyModel_Events","version":"0.0.1"},"eventMap":{"entry":[{"key":{"name":"SALE_AUTH","version":"0.0.1"},"value":{"key":{"name":"SALE_AUTH","version":"0.0.1"},"nameSpace":"com.hyperm","source":"APEX","target":"POS","parameter":{"entry":[{"key":"amount","value":{"key":"amount","fieldSchemaKey":{"name":"price_type","version":"0.0.1"},"optional":false}},{"key":"assistant_ID","value":{"key":"assistant_ID","fieldSchemaKey":{"name":"assistant_ID_type","version":"0.0.1"},"optional":false}},{"key":"authorised","value":{"key":"authorised","fieldSchemaKey":{"name":"authorised_type","version":"0.0.1"},"optional":false}},{"key":"branch_ID","value":{"key":"branch_ID","fieldSchemaKey":{"name":"branch_ID_type","version":"0.0.1"},"optional":false}},{"key":"item_ID","value":{"key":"item_ID","fieldSchemaKey":{"name":"item_ID_type","version":"0.0.1"},"optional":false}},{"key":"message","value":{"key":"message","fieldSchemaKey":{"name":"message_type","version":"0.0.1"},"optional":true}},{"key":"notes","value":{"key":"notes","fieldSchemaKey":{"name":"notes_type","version":"0.0.1"},"optional":true}},{"key":"quantity","value":{"key":"quantity","fieldSchemaKey":{"name":"quantity_type","version":"0.0.1"},"optional":false}},{"key":"sale_ID","value":{"key":"sale_ID","fieldSchemaKey":{"name":"sale_ID_type","version":"0.0.1"},"optional":false}},{"key":"time","value":{"key":"time","fieldSchemaKey":{"name":"timestamp_type","version":"0.0.1"},"optional":false}}]}}},{"key":{"name":"SALE_INPUT","version":"0.0.1"},"value":{"key":{"name":"SALE_INPUT","version":"0.0.1"},"nameSpace":"com.hyperm","source":"POS","target":"APEX","parameter":{"entry":[{"key":"amount","value":{"key":"amount","fieldSchemaKey":{"name":"price_type","version":"0.0.1"},"optional":false}},{"key":"assistant_ID","value":{"key":"assistant_ID","fieldSchemaKey":{"name":"assistant_ID_type","version":"0.0.1"},"optional":false}},{"key":"branch_ID","value":{"key":"branch_ID","fieldSchemaKey":{"name":"branch_ID_type","version":"0.0.1"},"optional":false}},{"key":"item_ID","value":{"key":"item_ID","fieldSchemaKey":{"name":"item_ID_type","version":"0.0.1"},"optional":false}},{"key":"notes","value":{"key":"notes","fieldSchemaKey":{"name":"notes_type","version":"0.0.1"},"optional":true}},{"key":"quantity","value":{"key":"quantity","fieldSchemaKey":{"name":"quantity_type","version":"0.0.1"},"optional":false}},{"key":"sale_ID","value":{"key":"sale_ID","fieldSchemaKey":{"name":"sale_ID_type","version":"0.0.1"},"optional":false}},{"key":"time","value":{"key":"time","fieldSchemaKey":{"name":"timestamp_type","version":"0.0.1"},"optional":false}}]}}}]}},"schemas":{"key":{"name":"MyFirstPolicyModel_Schemas","version":"0.0.1"},"schemas":{"entry":[{"key":{"name":"assistant_ID_type","version":"0.0.1"},"value":{"key":{"name":"assistant_ID_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.Long"}},{"key":{"name":"authorised_type","version":"0.0.1"},"value":{"key":{"name":"authorised_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.Boolean"}},{"key":{"name":"branch_ID_type","version":"0.0.1"},"value":{"key":{"name":"branch_ID_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.Long"}},{"key":{"name":"item_ID_type","version":"0.0.1"},"value":{"key":{"name":"item_ID_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.Long"}},{"key":{"name":"message_type","version":"0.0.1"},"value":{"key":{"name":"message_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.String"}},{"key":{"name":"notes_type","version":"0.0.1"},"value":{"key":{"name":"notes_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.String"}},{"key":{"name":"price_type","version":"0.0.1"},"value":{"key":{"name":"price_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.Long"}},{"key":{"name":"quantity_type","version":"0.0.1"},"value":{"key":{"name":"quantity_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.Integer"}},{"key":{"name":"sale_ID_type","version":"0.0.1"},"value":{"key":{"name":"sale_ID_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.Long"}},{"key":{"name":"timestamp_type","version":"0.0.1"},"value":{"key":{"name":"timestamp_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.Long"}}]}}}}},"eventOutputParameters":{"FirstProducer":{"carrierTechnologyParameters":{"carrierTechnology":"FILE","parameters":{"standardIo":true}},"eventProtocolParameters":{"eventProtocol":"JSON"}}},"eventInputParameters":{"FirstConsumer":{"carrierTechnologyParameters":{"carrierTechnology":"FILE","parameters":{"standardIo":true}},"eventProtocolParameters":{"eventProtocol":"JSON"}}}}}}]}}
\ No newline at end of file +{"tosca_definitions_version":"tosca_simple_yaml_1_0_0","topology_template":{"policies":[{"operational.sampledomain":{"type":"onap.policies.controlloop.Operational","typeVersion":"1.0.0","name":"onap.policies.controlloop.Operational.apex.sampledomain","version":"1.0.0","properties":{"engineServiceParameters":{"name":"MyFirstPolicyApexEngine","version":"0.0.1","id":101,"instanceCount":4,"deploymentPort":12345,"engineParameters":{"executorParameters":{"MVEL":{"parameterClassName":"org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters"},"JAVASCRIPT":{"parameterClassName":"org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"}}},"policy_type_impl":{"apexPolicyModel":{"key":{"name":"MyFirstPolicyModel","version":"0.0.1"},"keyInformation":{"key":{"name":"MyFirstPolicyModel_KeyInfo","version":"0.0.1"},"keyInfoMap":{"entry":[{"key":{"name":"MorningBoozeCheck","version":"0.0.1"},"value":{"key":{"name":"MorningBoozeCheck","version":"0.0.1"},"UUID":"3351b0f4-cf06-4fa2-8823-edf67bd30223","description":"This task checks if the sales request is for an item that contains alcohol. \nIf the local time is between 00:00:00 and 11:30:00 then the sale is not authorised. Otherwise the sale is authorised. \nIn this implementation we assume that all items with item_ID values between 1000 and 2000 contain alcohol :-)"}},{"key":{"name":"MyFirstPolicy","version":"0.0.1"},"value":{"key":{"name":"MyFirstPolicy","version":"0.0.1"},"UUID":"6c5e410f-489a-46ff-964e-982ce6e8b6d0","description":"This is my first Apex policy. It checks if a sale should be authorised or not."}},{"key":{"name":"MyFirstPolicyModel","version":"0.0.1"},"value":{"key":{"name":"MyFirstPolicyModel","version":"0.0.1"},"UUID":"540226fb-55ee-4f0e-a444-983a0494818e","description":"This is my first Apex Policy Model."}},{"key":{"name":"MyFirstPolicyModel_Events","version":"0.0.1"},"value":{"key":{"name":"MyFirstPolicyModel_Events","version":"0.0.1"},"UUID":"ef281318-5ac9-3ef0-8db3-8f9c4e4a81e2","description":"Generated description for concept referred to by key \"MyFirstPolicyModel_Events:0.0.1\""}},{"key":{"name":"MyFirstPolicyModel_KeyInfo","version":"0.0.1"},"value":{"key":{"name":"MyFirstPolicyModel_KeyInfo","version":"0.0.1"},"UUID":"d9248c6f-7c00-38df-8251-611463ba4065","description":"Generated description for concept referred to by key \"MyFirstPolicyModel_KeyInfo:0.0.1\""}},{"key":{"name":"MyFirstPolicyModel_Policies","version":"0.0.1"},"value":{"key":{"name":"MyFirstPolicyModel_Policies","version":"0.0.1"},"UUID":"77c01a6b-510c-3aa9-b640-b4db356aa03b","description":"Generated description for concept referred to by key \"MyFirstPolicyModel_Policies:0.0.1\""}},{"key":{"name":"MyFirstPolicyModel_Schemas","version":"0.0.1"},"value":{"key":{"name":"MyFirstPolicyModel_Schemas","version":"0.0.1"},"UUID":"d0cc3aa0-ea69-3a43-80ff-a0dbb0ebd885","description":"Generated description for concept referred to by key \"MyFirstPolicyModel_Schemas:0.0.1\""}},{"key":{"name":"MyFirstPolicyModel_Tasks","version":"0.0.1"},"value":{"key":{"name":"MyFirstPolicyModel_Tasks","version":"0.0.1"},"UUID":"b02a7e02-2cd0-39e6-b3cb-946fa83a8f08","description":"Generated description for concept referred to by key \"MyFirstPolicyModel_Tasks:0.0.1\""}},{"key":{"name":"SALE_AUTH","version":"0.0.1"},"value":{"key":{"name":"SALE_AUTH","version":"0.0.1"},"UUID":"c4500941-3f98-4080-a9cc-5b9753ed050b","description":"An event emitted by the Policy to indicate whether the sale of an item has been authorised"}},{"key":{"name":"SALE_INPUT","version":"0.0.1"},"value":{"key":{"name":"SALE_INPUT","version":"0.0.1"},"UUID":"4f04aa98-e917-4f4a-882a-c75ba5a99374","description":"An event raised by the PoS system each time an item is scanned for purchase"}},{"key":{"name":"assistant_ID_type","version":"0.0.1"},"value":{"key":{"name":"assistant_ID_type","version":"0.0.1"},"UUID":"36df4c71-9616-4206-8b53-976a5cd4bd87","description":"A type for 'assistant_ID' values"}},{"key":{"name":"authorised_type","version":"0.0.1"},"value":{"key":{"name":"authorised_type","version":"0.0.1"},"UUID":"d48b619e-d00d-4008-b884-02d76ea4350b","description":"A type for 'authorised' values"}},{"key":{"name":"branch_ID_type","version":"0.0.1"},"value":{"key":{"name":"branch_ID_type","version":"0.0.1"},"UUID":"6468845f-4122-4128-8e49-0f52c26078b5","description":"A type for 'branch_ID' values"}},{"key":{"name":"item_ID_type","version":"0.0.1"},"value":{"key":{"name":"item_ID_type","version":"0.0.1"},"UUID":"4f227ff1-aee0-453a-b6b6-9a4b2e0da932","description":"A type for 'item_ID' values"}},{"key":{"name":"message_type","version":"0.0.1"},"value":{"key":{"name":"message_type","version":"0.0.1"},"UUID":"ad1431bb-3155-4e73-b5a3-b89bee498749","description":"A type for 'message' values"}},{"key":{"name":"notes_type","version":"0.0.1"},"value":{"key":{"name":"notes_type","version":"0.0.1"},"UUID":"eecfde90-896c-4343-8f9c-2603ced94e2d","description":"A type for 'notes' values"}},{"key":{"name":"price_type","version":"0.0.1"},"value":{"key":{"name":"price_type","version":"0.0.1"},"UUID":"52c2fc45-fd8c-463c-bd6f-d91b0554aea7","description":"A type for 'amount'/'price' values"}},{"key":{"name":"quantity_type","version":"0.0.1"},"value":{"key":{"name":"quantity_type","version":"0.0.1"},"UUID":"ac3d9842-80af-4a98-951c-bd79a431c613","description":"A type for 'quantity' values"}},{"key":{"name":"sale_ID_type","version":"0.0.1"},"value":{"key":{"name":"sale_ID_type","version":"0.0.1"},"UUID":"cca47d74-7754-4a61-b163-ca31f66b157b","description":"A type for 'sale_ID' values"}},{"key":{"name":"timestamp_type","version":"0.0.1"},"value":{"key":{"name":"timestamp_type","version":"0.0.1"},"UUID":"fd594e88-411d-4a94-b2be-697b3a0d7adf","description":"A type for 'time' values"}}]}},"policies":{"key":{"name":"MyFirstPolicyModel_Policies","version":"0.0.1"},"policyMap":{"entry":[{"key":{"name":"MyFirstPolicy","version":"0.0.1"},"value":{"policyKey":{"name":"MyFirstPolicy","version":"0.0.1"},"template":"FREEFORM","state":{"entry":[{"key":"BoozeAuthDecide","value":{"stateKey":{"parentKeyName":"MyFirstPolicy","parentKeyVersion":"0.0.1","parentLocalName":"NULL","localName":"BoozeAuthDecide"},"trigger":{"name":"SALE_INPUT","version":"0.0.1"},"stateOutputs":{"entry":[{"key":"MorningBoozeCheck_Output_Direct","value":{"key":{"parentKeyName":"MyFirstPolicy","parentKeyVersion":"0.0.1","parentLocalName":"BoozeAuthDecide","localName":"MorningBoozeCheck_Output_Direct"},"outgoingEvent":{"name":"SALE_AUTH","version":"0.0.1"},"nextState":{"parentKeyName":"NULL","parentKeyVersion":"0.0.0","parentLocalName":"NULL","localName":"NULL"}}}]},"contextAlbumReference":[],"taskSelectionLogic":{"key":"NULL","logicFlavour":"UNDEFINED","logic":""},"stateFinalizerLogicMap":{"entry":[]},"defaultTask":{"name":"MorningBoozeCheck","version":"0.0.1"},"taskReferences":{"entry":[{"key":{"name":"MorningBoozeCheck","version":"0.0.1"},"value":{"key":{"parentKeyName":"MyFirstPolicy","parentKeyVersion":"0.0.1","parentLocalName":"BoozeAuthDecide","localName":"MorningBoozeCheck"},"outputType":"DIRECT","output":{"parentKeyName":"MyFirstPolicy","parentKeyVersion":"0.0.1","parentLocalName":"BoozeAuthDecide","localName":"MorningBoozeCheck_Output_Direct"}}}]}}}]},"firstState":"BoozeAuthDecide"}}]}},"tasks":{"key":{"name":"MyFirstPolicyModel_Tasks","version":"0.0.1"},"taskMap":{"entry":[{"key":{"name":"MorningBoozeCheck","version":"0.0.1"},"value":{"key":{"name":"MorningBoozeCheck","version":"0.0.1"},"inputFields":{"entry":[{"key":"amount","value":{"key":"amount","fieldSchemaKey":{"name":"price_type","version":"0.0.1"},"optional":false}},{"key":"assistant_ID","value":{"key":"assistant_ID","fieldSchemaKey":{"name":"assistant_ID_type","version":"0.0.1"},"optional":false}},{"key":"branch_ID","value":{"key":"branch_ID","fieldSchemaKey":{"name":"branch_ID_type","version":"0.0.1"},"optional":false}},{"key":"item_ID","value":{"key":"item_ID","fieldSchemaKey":{"name":"item_ID_type","version":"0.0.1"},"optional":false}},{"key":"notes","value":{"key":"notes","fieldSchemaKey":{"name":"notes_type","version":"0.0.1"},"optional":true}},{"key":"quantity","value":{"key":"quantity","fieldSchemaKey":{"name":"quantity_type","version":"0.0.1"},"optional":false}},{"key":"sale_ID","value":{"key":"sale_ID","fieldSchemaKey":{"name":"sale_ID_type","version":"0.0.1"},"optional":false}},{"key":"time","value":{"key":"time","fieldSchemaKey":{"name":"timestamp_type","version":"0.0.1"},"optional":false}}]},"outputFields":{"entry":[{"key":"amount","value":{"key":"amount","fieldSchemaKey":{"name":"price_type","version":"0.0.1"},"optional":false}},{"key":"assistant_ID","value":{"key":"assistant_ID","fieldSchemaKey":{"name":"assistant_ID_type","version":"0.0.1"},"optional":false}},{"key":"authorised","value":{"key":"authorised","fieldSchemaKey":{"name":"authorised_type","version":"0.0.1"},"optional":false}},{"key":"branch_ID","value":{"key":"branch_ID","fieldSchemaKey":{"name":"branch_ID_type","version":"0.0.1"},"optional":false}},{"key":"item_ID","value":{"key":"item_ID","fieldSchemaKey":{"name":"item_ID_type","version":"0.0.1"},"optional":false}},{"key":"message","value":{"key":"message","fieldSchemaKey":{"name":"message_type","version":"0.0.1"},"optional":true}},{"key":"notes","value":{"key":"notes","fieldSchemaKey":{"name":"notes_type","version":"0.0.1"},"optional":true}},{"key":"quantity","value":{"key":"quantity","fieldSchemaKey":{"name":"quantity_type","version":"0.0.1"},"optional":false}},{"key":"sale_ID","value":{"key":"sale_ID","fieldSchemaKey":{"name":"sale_ID_type","version":"0.0.1"},"optional":false}},{"key":"time","value":{"key":"time","fieldSchemaKey":{"name":"timestamp_type","version":"0.0.1"},"optional":false}}]},"taskParameters":{"entry":[]},"contextAlbumReference":[],"taskLogic":{"key":"TaskLogic","logicFlavour":"MVEL","logic":"/*\n * ============LICENSE_START=======================================================\n * Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * Modifications Copyright (C) 2019 Nordix Foundation.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\nimport java.util.Date;\nimport java.util.Calendar;\nimport java.util.TimeZone;\nimport java.text.SimpleDateFormat;\n\nlogger.info(\"Task Execution: '\"+subject.id+\"'. Input Fields: '\"+inFields+\"'\");\n\noutFields.put(\"amount\" , inFields.get(\"amount\"));\noutFields.put(\"assistant_ID\", inFields.get(\"assistant_ID\"));\noutFields.put(\"notes\" , inFields.get(\"notes\"));\noutFields.put(\"quantity\" , inFields.get(\"quantity\"));\noutFields.put(\"branch_ID\" , inFields.get(\"branch_ID\"));\noutFields.put(\"item_ID\" , inFields.get(\"item_ID\"));\noutFields.put(\"time\" , inFields.get(\"time\"));\noutFields.put(\"sale_ID\" , inFields.get(\"sale_ID\"));\n\nitem_id = inFields.get(\"item_ID\");\n\n//The events used later to test this task use GMT timezone!\ngmt = TimeZone.getTimeZone(\"GMT\");\ntimenow = Calendar.getInstance(gmt);\ndf = new SimpleDateFormat(\"HH:mm:ss z\");\ndf.setTimeZone(gmt);\ntimenow.setTimeInMillis(inFields.get(\"time\"));\n\nmidnight = timenow.clone();\nmidnight.set(\n timenow.get(Calendar.YEAR),timenow.get(Calendar.MONTH),\n timenow.get(Calendar.DATE),0,0,0);\neleven30 = timenow.clone();\neleven30.set(\n timenow.get(Calendar.YEAR),timenow.get(Calendar.MONTH),\n timenow.get(Calendar.DATE),11,30,0);\n\nitemisalcohol = false;\nif(item_id != null && item_id >=1000 && item_id < 2000)\n itemisalcohol = true;\n\nif( itemisalcohol\n && timenow.after(midnight) && timenow.before(eleven30)){\n outFields.put(\"authorised\", false);\n outFields.put(\"message\", \"Sale not authorised by policy task \"+subject.taskName+\n \" for time \"+df.format(timenow.getTime())+\n \". Alcohol can not be sold between \"+df.format(midnight.getTime())+\n \" and \"+df.format(eleven30.getTime()));\n return true;\n}\nelse{\n outFields.put(\"authorised\", true);\n outFields.put(\"message\", \"Sale authorised by policy task \"+subject.taskName+\n \" for time \"+df.format(timenow.getTime()));\n return true;\n}\n\n/*\nThis task checks if a sale request is for an item that is an alcoholic drink.\nIf the local time is between 00:00:00 GMT and 11:30:00 GMT then the sale is not\nauthorised. Otherwise the sale is authorised.\nIn this implementation we assume that items with item_ID value between 1000 and\n2000 are all alcoholic drinks :-)\n*/"}}}]}},"events":{"key":{"name":"MyFirstPolicyModel_Events","version":"0.0.1"},"eventMap":{"entry":[{"key":{"name":"SALE_AUTH","version":"0.0.1"},"value":{"key":{"name":"SALE_AUTH","version":"0.0.1"},"nameSpace":"com.hyperm","source":"APEX","target":"POS","parameter":{"entry":[{"key":"amount","value":{"key":"amount","fieldSchemaKey":{"name":"price_type","version":"0.0.1"},"optional":false}},{"key":"assistant_ID","value":{"key":"assistant_ID","fieldSchemaKey":{"name":"assistant_ID_type","version":"0.0.1"},"optional":false}},{"key":"authorised","value":{"key":"authorised","fieldSchemaKey":{"name":"authorised_type","version":"0.0.1"},"optional":false}},{"key":"branch_ID","value":{"key":"branch_ID","fieldSchemaKey":{"name":"branch_ID_type","version":"0.0.1"},"optional":false}},{"key":"item_ID","value":{"key":"item_ID","fieldSchemaKey":{"name":"item_ID_type","version":"0.0.1"},"optional":false}},{"key":"message","value":{"key":"message","fieldSchemaKey":{"name":"message_type","version":"0.0.1"},"optional":true}},{"key":"notes","value":{"key":"notes","fieldSchemaKey":{"name":"notes_type","version":"0.0.1"},"optional":true}},{"key":"quantity","value":{"key":"quantity","fieldSchemaKey":{"name":"quantity_type","version":"0.0.1"},"optional":false}},{"key":"sale_ID","value":{"key":"sale_ID","fieldSchemaKey":{"name":"sale_ID_type","version":"0.0.1"},"optional":false}},{"key":"time","value":{"key":"time","fieldSchemaKey":{"name":"timestamp_type","version":"0.0.1"},"optional":false}}]}}},{"key":{"name":"SALE_INPUT","version":"0.0.1"},"value":{"key":{"name":"SALE_INPUT","version":"0.0.1"},"nameSpace":"com.hyperm","source":"POS","target":"APEX","parameter":{"entry":[{"key":"amount","value":{"key":"amount","fieldSchemaKey":{"name":"price_type","version":"0.0.1"},"optional":false}},{"key":"assistant_ID","value":{"key":"assistant_ID","fieldSchemaKey":{"name":"assistant_ID_type","version":"0.0.1"},"optional":false}},{"key":"branch_ID","value":{"key":"branch_ID","fieldSchemaKey":{"name":"branch_ID_type","version":"0.0.1"},"optional":false}},{"key":"item_ID","value":{"key":"item_ID","fieldSchemaKey":{"name":"item_ID_type","version":"0.0.1"},"optional":false}},{"key":"notes","value":{"key":"notes","fieldSchemaKey":{"name":"notes_type","version":"0.0.1"},"optional":true}},{"key":"quantity","value":{"key":"quantity","fieldSchemaKey":{"name":"quantity_type","version":"0.0.1"},"optional":false}},{"key":"sale_ID","value":{"key":"sale_ID","fieldSchemaKey":{"name":"sale_ID_type","version":"0.0.1"},"optional":false}},{"key":"time","value":{"key":"time","fieldSchemaKey":{"name":"timestamp_type","version":"0.0.1"},"optional":false}}]}}}]}},"schemas":{"key":{"name":"MyFirstPolicyModel_Schemas","version":"0.0.1"},"schemas":{"entry":[{"key":{"name":"assistant_ID_type","version":"0.0.1"},"value":{"key":{"name":"assistant_ID_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.Long"}},{"key":{"name":"authorised_type","version":"0.0.1"},"value":{"key":{"name":"authorised_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.Boolean"}},{"key":{"name":"branch_ID_type","version":"0.0.1"},"value":{"key":{"name":"branch_ID_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.Long"}},{"key":{"name":"item_ID_type","version":"0.0.1"},"value":{"key":{"name":"item_ID_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.Long"}},{"key":{"name":"message_type","version":"0.0.1"},"value":{"key":{"name":"message_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.String"}},{"key":{"name":"notes_type","version":"0.0.1"},"value":{"key":{"name":"notes_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.String"}},{"key":{"name":"price_type","version":"0.0.1"},"value":{"key":{"name":"price_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.Long"}},{"key":{"name":"quantity_type","version":"0.0.1"},"value":{"key":{"name":"quantity_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.Integer"}},{"key":{"name":"sale_ID_type","version":"0.0.1"},"value":{"key":{"name":"sale_ID_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.Long"}},{"key":{"name":"timestamp_type","version":"0.0.1"},"value":{"key":{"name":"timestamp_type","version":"0.0.1"},"schemaFlavour":"Java","schemaDefinition":"java.lang.Long"}}]}}}}},"eventOutputParameters":{"FirstProducer":{"carrierTechnologyParameters":{"carrierTechnology":"FILE","parameters":{"standardIo":true}},"eventProtocolParameters":{"eventProtocol":"JSON"}}},"eventInputParameters":{"FirstConsumer":{"carrierTechnologyParameters":{"carrierTechnology":"FILE","parameters":{"standardIo":true}},"eventProtocolParameters":{"eventProtocol":"JSON"}}}}}}]}}
\ No newline at end of file diff --git a/examples/examples-aadm/src/main/resources/examples/config/AADM/Stdin2StdoutJsonEvent.json b/examples/examples-aadm/src/main/resources/examples/config/AADM/Stdin2StdoutJsonEvent.json index e78824b8e..b1dc61cbc 100644 --- a/examples/examples-aadm/src/main/resources/examples/config/AADM/Stdin2StdoutJsonEvent.json +++ b/examples/examples-aadm/src/main/resources/examples/config/AADM/Stdin2StdoutJsonEvent.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12345, - "policyModelFileName": "examples/models/AADM/AADMPolicyModel.json", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/examples/examples-aadm/src/main/resources/examples/config/AADM/Stdin2StdoutXmlEvent.json b/examples/examples-aadm/src/main/resources/examples/config/AADM/Stdin2StdoutXmlEvent.json index 022f7c8a9..957c97728 100644 --- a/examples/examples-aadm/src/main/resources/examples/config/AADM/Stdin2StdoutXmlEvent.json +++ b/examples/examples-aadm/src/main/resources/examples/config/AADM/Stdin2StdoutXmlEvent.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12345, - "policyModelFileName": "examples/models/AADM/AADMPolicyModel.json", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/examples/examples-adaptive/src/main/resources/examples/config/Adaptive/Stdin2StdoutAnomalyDetectionJsonEvent.json b/examples/examples-adaptive/src/main/resources/examples/config/Adaptive/Stdin2StdoutAnomalyDetectionJsonEvent.json index 3e9bafc7c..b734d5561 100644 --- a/examples/examples-adaptive/src/main/resources/examples/config/Adaptive/Stdin2StdoutAnomalyDetectionJsonEvent.json +++ b/examples/examples-adaptive/src/main/resources/examples/config/Adaptive/Stdin2StdoutAnomalyDetectionJsonEvent.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12345, - "policyModelFileName": "examples/models/Adaptive/AnomalyDetectionPolicyModel.json", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/examples/examples-adaptive/src/main/resources/examples/config/Adaptive/Stdin2StdoutAutoLearnJsonEvent.json b/examples/examples-adaptive/src/main/resources/examples/config/Adaptive/Stdin2StdoutAutoLearnJsonEvent.json index dc3d7684c..b734d5561 100644 --- a/examples/examples-adaptive/src/main/resources/examples/config/Adaptive/Stdin2StdoutAutoLearnJsonEvent.json +++ b/examples/examples-adaptive/src/main/resources/examples/config/Adaptive/Stdin2StdoutAutoLearnJsonEvent.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12345, - "policyModelFileName": "examples/models/Adaptive/AutoLearnPolicyModel.json", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/examples/examples-decisionmaker/src/main/resources/examples/config/DecisionMaker/ApexConfigHealthCheckRESTClient.json b/examples/examples-decisionmaker/src/main/resources/examples/config/DecisionMaker/ApexConfigHealthCheckRESTClient.json index ed90282a1..27754a7a3 100644 --- a/examples/examples-decisionmaker/src/main/resources/examples/config/DecisionMaker/ApexConfigHealthCheckRESTClient.json +++ b/examples/examples-decisionmaker/src/main/resources/examples/config/DecisionMaker/ApexConfigHealthCheckRESTClient.json @@ -9,7 +9,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12345, - "policyModelFileName": "/home/liam/git/onap/policy/apex-pdp/examples/examples-decisionmaker/target/classes/HealthCheckPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/examples/examples-decisionmaker/src/main/resources/examples/config/DecisionMaker/ApexConfigRESTClient.json b/examples/examples-decisionmaker/src/main/resources/examples/config/DecisionMaker/ApexConfigRESTClient.json index a2cf2b950..4371ebe06 100644 --- a/examples/examples-decisionmaker/src/main/resources/examples/config/DecisionMaker/ApexConfigRESTClient.json +++ b/examples/examples-decisionmaker/src/main/resources/examples/config/DecisionMaker/ApexConfigRESTClient.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12345, - "policyModelFileName": "examples/models/DecisionMaker/DecisionMakerPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/examples/examples-decisionmaker/src/main/resources/examples/config/DecisionMaker/ApexConfigRESTServer.json b/examples/examples-decisionmaker/src/main/resources/examples/config/DecisionMaker/ApexConfigRESTServer.json index 5a8e6eaf2..c1693fd4e 100644 --- a/examples/examples-decisionmaker/src/main/resources/examples/config/DecisionMaker/ApexConfigRESTServer.json +++ b/examples/examples-decisionmaker/src/main/resources/examples/config/DecisionMaker/ApexConfigRESTServer.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12345, - "policyModelFileName": "examples/models/DecisionMaker/DecisionMakerPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigFile2StdoutJsonEvent.json b/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigFile2StdoutJsonEvent.json index 71b66be73..7476cc88f 100644 --- a/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigFile2StdoutJsonEvent.json +++ b/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigFile2StdoutJsonEvent.json @@ -5,7 +5,6 @@ "id": 103, "instanceCount": 4, "deploymentPort": 12345, - "policyModelFileName": "examples/models/MyFirstPolicy/1/MyFirstPolicyModel_0.0.1.json", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigStdin2StdoutJsonEvent.json b/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigStdin2StdoutJsonEvent.json index 21a159c0d..6a2c13465 100644 --- a/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigStdin2StdoutJsonEvent.json +++ b/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigStdin2StdoutJsonEvent.json @@ -5,7 +5,6 @@ "id": 101, "instanceCount": 4, "deploymentPort": 12345, - "policyModelFileName": "examples/models/MyFirstPolicy/1/MyFirstPolicyModel_0.0.1.json", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigWs2WsServerJsonEvent.json b/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigWs2WsServerJsonEvent.json index 9d438a4ec..255b79e7d 100644 --- a/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigWs2WsServerJsonEvent.json +++ b/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigWs2WsServerJsonEvent.json @@ -5,7 +5,6 @@ "id": 101, "instanceCount": 4, "deploymentPort": 12345, - "policyModelFileName": "examples/models/MyFirstPolicy/1/MyFirstPolicyModel_0.0.1.json", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigFile2StdoutJsonEvent.json b/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigFile2StdoutJsonEvent.json index 18de30a5e..bf5906f62 100644 --- a/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigFile2StdoutJsonEvent.json +++ b/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigFile2StdoutJsonEvent.json @@ -5,7 +5,6 @@ "id": 104, "instanceCount": 4, "deploymentPort": 12345, - "policyModelFileName": "examples/models/MyFirstPolicy/2/MyFirstPolicyModel_0.0.1.json", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigStdin2StdoutJsonEvent.json b/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigStdin2StdoutJsonEvent.json index 0553f6a2f..cac0d5f66 100644 --- a/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigStdin2StdoutJsonEvent.json +++ b/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigStdin2StdoutJsonEvent.json @@ -5,7 +5,6 @@ "id": 102, "instanceCount": 4, "deploymentPort": 12345, - "policyModelFileName": "examples/models/MyFirstPolicy/2/MyFirstPolicyModel_0.0.1.json", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigWs2WsServerJsonEvent.json b/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigWs2WsServerJsonEvent.json index cd621e694..04d3b717b 100644 --- a/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigWs2WsServerJsonEvent.json +++ b/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigWs2WsServerJsonEvent.json @@ -5,7 +5,6 @@ "id": 102, "instanceCount": 4, "deploymentPort": 12345, - "policyModelFileName": "examples/models/MyFirstPolicy/2/MyFirstPolicyModel_0.0.1.json", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/3/MyFirstPolicyConfigFile2StdoutJsonEvent.json b/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/3/MyFirstPolicyConfigFile2StdoutJsonEvent.json index 655945963..0a1731c54 100644 --- a/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/3/MyFirstPolicyConfigFile2StdoutJsonEvent.json +++ b/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/3/MyFirstPolicyConfigFile2StdoutJsonEvent.json @@ -5,7 +5,6 @@ "id": 103, "instanceCount": 4, "deploymentPort": 12345, - "policyModelFileName": "examples/models/MyFirstPolicy/3/MyFirstPolicyModelSFL_0.0.1.json", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/3/MyFirstPolicyConfigStdin2StdoutJsonEvent.json b/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/3/MyFirstPolicyConfigStdin2StdoutJsonEvent.json index 6084d8d34..1975238c6 100644 --- a/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/3/MyFirstPolicyConfigStdin2StdoutJsonEvent.json +++ b/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/3/MyFirstPolicyConfigStdin2StdoutJsonEvent.json @@ -5,7 +5,6 @@ "id": 101, "instanceCount": 4, "deploymentPort": 12345, - "policyModelFileName": "C:\\Users\\adityaputhuparambil\\onap\\apex\\examples\\examples-myfirstpolicy\\target\\examples\\models\\MyFirstPolicy\\3\\MyFirstPolicyModelSFL_0.0.1.json", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/3/MyFirstPolicyConfigWs2WsServerJsonEvent.json b/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/3/MyFirstPolicyConfigWs2WsServerJsonEvent.json index 14d6a43b0..f6c499406 100644 --- a/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/3/MyFirstPolicyConfigWs2WsServerJsonEvent.json +++ b/examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/3/MyFirstPolicyConfigWs2WsServerJsonEvent.json @@ -5,7 +5,6 @@ "id": 101, "instanceCount": 4, "deploymentPort": 12345, - "policyModelFileName": "examples/models/MyFirstPolicy/3/MyFirstPolicyModelSFL_0.0.1.json", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/examples/examples-myfirstpolicy/src/main/resources/org/onap/policy/apex/examples/myfirstpolicy/1/config/MyFirstPolicyConfigStdin2StdoutJsonEvent.json b/examples/examples-myfirstpolicy/src/main/resources/org/onap/policy/apex/examples/myfirstpolicy/1/config/MyFirstPolicyConfigStdin2StdoutJsonEvent.json index 06601e5d1..40328a57d 100644 --- a/examples/examples-myfirstpolicy/src/main/resources/org/onap/policy/apex/examples/myfirstpolicy/1/config/MyFirstPolicyConfigStdin2StdoutJsonEvent.json +++ b/examples/examples-myfirstpolicy/src/main/resources/org/onap/policy/apex/examples/myfirstpolicy/1/config/MyFirstPolicyConfigStdin2StdoutJsonEvent.json @@ -5,7 +5,6 @@ "id" : 101, "instanceCount" : 4, "deploymentPort" : 12345, - "policyModelFileName" : "examples/models/MyFirstPolicy/1/MyFirstPolicyModel_0.0.1.json", "engineParameters" : { "executorParameters" : { "MVEL" : { diff --git a/examples/examples-myfirstpolicy/src/main/resources/org/onap/policy/apex/examples/myfirstpolicy/1/config/MyFirstPolicyConfigWs2WsServerJsonEvent.json b/examples/examples-myfirstpolicy/src/main/resources/org/onap/policy/apex/examples/myfirstpolicy/1/config/MyFirstPolicyConfigWs2WsServerJsonEvent.json index 657371f3c..e3e1a6260 100644 --- a/examples/examples-myfirstpolicy/src/main/resources/org/onap/policy/apex/examples/myfirstpolicy/1/config/MyFirstPolicyConfigWs2WsServerJsonEvent.json +++ b/examples/examples-myfirstpolicy/src/main/resources/org/onap/policy/apex/examples/myfirstpolicy/1/config/MyFirstPolicyConfigWs2WsServerJsonEvent.json @@ -5,7 +5,6 @@ "id" : 101, "instanceCount" : 4, "deploymentPort" : 12345, - "policyModelFileName" : "examples/models/MyFirstPolicy/1/MyFirstPolicyModel_0.0.1.json", "engineParameters" : { "executorParameters" : { "MVEL" : { diff --git a/examples/examples-myfirstpolicy/src/main/resources/org/onap/policy/apex/examples/myfirstpolicy/2/config/MyFirstPolicyConfigStdin2StdoutJsonEvent.json b/examples/examples-myfirstpolicy/src/main/resources/org/onap/policy/apex/examples/myfirstpolicy/2/config/MyFirstPolicyConfigStdin2StdoutJsonEvent.json index c9c29cdd2..2d291448d 100644 --- a/examples/examples-myfirstpolicy/src/main/resources/org/onap/policy/apex/examples/myfirstpolicy/2/config/MyFirstPolicyConfigStdin2StdoutJsonEvent.json +++ b/examples/examples-myfirstpolicy/src/main/resources/org/onap/policy/apex/examples/myfirstpolicy/2/config/MyFirstPolicyConfigStdin2StdoutJsonEvent.json @@ -5,7 +5,6 @@ "id" : 102, "instanceCount" : 4, "deploymentPort" : 12345, - "policyModelFileName" : "examples/models/MyFirstPolicy/2/MyFirstPolicyModel_0.0.1.json", "engineParameters" : { "executorParameters" : { "MVEL" : { diff --git a/examples/examples-myfirstpolicy/src/main/resources/org/onap/policy/apex/examples/myfirstpolicy/2/config/MyFirstPolicyConfigWs2WsServerJsonEvent.json b/examples/examples-myfirstpolicy/src/main/resources/org/onap/policy/apex/examples/myfirstpolicy/2/config/MyFirstPolicyConfigWs2WsServerJsonEvent.json index 3faf4ca32..56ab0e7ab 100644 --- a/examples/examples-myfirstpolicy/src/main/resources/org/onap/policy/apex/examples/myfirstpolicy/2/config/MyFirstPolicyConfigWs2WsServerJsonEvent.json +++ b/examples/examples-myfirstpolicy/src/main/resources/org/onap/policy/apex/examples/myfirstpolicy/2/config/MyFirstPolicyConfigWs2WsServerJsonEvent.json @@ -5,7 +5,6 @@ "id" : 102, "instanceCount" : 4, "deploymentPort" : 12345, - "policyModelFileName" : "examples/models/MyFirstPolicy/2/MyFirstPolicyModel_0.0.1.json", "engineParameters" : { "executorParameters" : { "MVEL" : { diff --git a/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/NomadicONTPolicyModel_config.json b/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/NomadicONTPolicyModel_config.json index f38bb8cd2..1c84dc59e 100644 --- a/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/NomadicONTPolicyModel_config.json +++ b/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/NomadicONTPolicyModel_config.json @@ -5,7 +5,6 @@ "id": 101, "instanceCount": 4, "deploymentPort": 12345, - "policyModelFileName": "/home/apexuser/examples/models/ONAPBBS/NomadicONTPolicyModel.json", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig.json b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig.json index 01269c6ba..3b386b9b6 100644 --- a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig.json +++ b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "/home/apexuser/examples/models/ONAPvCPE/ONAPvCPEPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfigStdin.json b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfigStdin.json index cbd4d99a6..2a99d9afa 100644 --- a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfigStdin.json +++ b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfigStdin.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "/home/apexuser/examples/models/ONAPvCPE/ONAPvCPEPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim.json b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim.json index 80672ed01..c2193b11f 100644 --- a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim.json +++ b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 1, "deploymentPort": 12561, - "policyModelFileName": "examples/models/ONAPvCPE/ONAPvCPEPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim_StdIO.json b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim_StdIO.json index 806cf2d11..8380e8fc7 100644 --- a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim_StdIO.json +++ b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim_StdIO.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "examples/models/ONAPvCPE/ONAPvCPEPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig.json b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig.json index e82be89a8..665de0e15 100644 --- a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig.json +++ b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "examples/models/ONAPvCPE/ONAPvCPEPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig_Sim.json b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig_Sim.json index 081cc999f..39a1b2ddb 100644 --- a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig_Sim.json +++ b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig_Sim.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "examples/models/ONAPvCPE/ONAPvCPEPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig_Sim_StdIO.json b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig_Sim_StdIO.json index d6b6555ce..104b64129 100644 --- a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig_Sim_StdIO.json +++ b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig_Sim_StdIO.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "examples/models/ONAPvCPE/ONAPvCPEPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/examples/examples-pcvs/src/main/resources/examples/config/pcvs/vpnsla/kafka2kafka.json b/examples/examples-pcvs/src/main/resources/examples/config/pcvs/vpnsla/kafka2kafka.json index 39a96f2a1..8342b694b 100644 --- a/examples/examples-pcvs/src/main/resources/examples/config/pcvs/vpnsla/kafka2kafka.json +++ b/examples/examples-pcvs/src/main/resources/examples/config/pcvs/vpnsla/kafka2kafka.json @@ -5,7 +5,6 @@ "id" : 45, "instanceCount" : 1, "deploymentPort" : 12345, - "policyModelFileName" : 'examples/models/pcvs/vpnsla/PCVS-VpnSla.json', "engineParameters" : { "executorParameters" : { "JAVASCRIPT" : { diff --git a/examples/examples-pcvs/src/main/resources/examples/config/pcvs/vpnsla/stdin2stdout.json b/examples/examples-pcvs/src/main/resources/examples/config/pcvs/vpnsla/stdin2stdout.json index 009b7fb76..bbffde86e 100644 --- a/examples/examples-pcvs/src/main/resources/examples/config/pcvs/vpnsla/stdin2stdout.json +++ b/examples/examples-pcvs/src/main/resources/examples/config/pcvs/vpnsla/stdin2stdout.json @@ -5,7 +5,6 @@ "id" : 45, "instanceCount" : 1, "deploymentPort" : 12345, - "policyModelFileName" : "examples/models/pcvs/vpnsla/PCVS-VpnSla.json", "engineParameters" : { "executorParameters" : { "JAVASCRIPT" : { diff --git a/examples/examples-pcvs/src/test/resources/org/onap/policy/apex/examples/pcvs/vpnsla/config/stdin2stdout.json b/examples/examples-pcvs/src/test/resources/org/onap/policy/apex/examples/pcvs/vpnsla/config/stdin2stdout.json index 4c5e2760a..4bedb1bd2 100644 --- a/examples/examples-pcvs/src/test/resources/org/onap/policy/apex/examples/pcvs/vpnsla/config/stdin2stdout.json +++ b/examples/examples-pcvs/src/test/resources/org/onap/policy/apex/examples/pcvs/vpnsla/config/stdin2stdout.json @@ -5,7 +5,6 @@ "id" : 45, "instanceCount" : 1, "deploymentPort" : 12345, - "policyModelFileName" : "target/policy.json", "engineParameters" : { "executorParameters" : { "JAVASCRIPT" : { diff --git a/examples/examples-periodic/src/main/resources/examples/config/Periodic/ApexConfigPeriodic.json b/examples/examples-periodic/src/main/resources/examples/config/Periodic/ApexConfigPeriodic.json index a4c94779b..7cde380b6 100644 --- a/examples/examples-periodic/src/main/resources/examples/config/Periodic/ApexConfigPeriodic.json +++ b/examples/examples-periodic/src/main/resources/examples/config/Periodic/ApexConfigPeriodic.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "examples/models/Periodic/PeriodicPolicyModel.json", "periodicEventPeriod": 1000, "engineParameters": { "executorParameters": { diff --git a/examples/examples-servlet/src/main/resources/webapp/WEB-INF/classes/config/SampleDomain/RESTServerJsonEvent.json b/examples/examples-servlet/src/main/resources/webapp/WEB-INF/classes/config/SampleDomain/RESTServerJsonEvent.json index bb652e99b..b40dd9aa2 100644 --- a/examples/examples-servlet/src/main/resources/webapp/WEB-INF/classes/config/SampleDomain/RESTServerJsonEvent.json +++ b/examples/examples-servlet/src/main/resources/webapp/WEB-INF/classes/config/SampleDomain/RESTServerJsonEvent.json @@ -5,7 +5,6 @@ "id" : 45, "instanceCount" : 4, "deploymentPort" : 12561, - "policyModelFileName" : "models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters" : { "executorParameters" : { "JAVASCRIPT" : { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/resources/prodcons/RESTClientWithHTTPFilterInvalid.json b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/resources/prodcons/RESTClientWithHTTPFilterInvalid.json index bc1eeeebd..ff63b35ae 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/resources/prodcons/RESTClientWithHTTPFilterInvalid.json +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/resources/prodcons/RESTClientWithHTTPFilterInvalid.json @@ -15,7 +15,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/RequestorModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/resources/prodcons/RESTClientWithHTTPHeaderBadList.json b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/resources/prodcons/RESTClientWithHTTPHeaderBadList.json index 4ecc60cf4..b254c9a72 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/resources/prodcons/RESTClientWithHTTPHeaderBadList.json +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/resources/prodcons/RESTClientWithHTTPHeaderBadList.json @@ -15,7 +15,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/RequestorModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/resources/prodcons/RESTClientWithHTTPHeaderNotKvPairs.json b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/resources/prodcons/RESTClientWithHTTPHeaderNotKvPairs.json index d0421261a..5d232f125 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/resources/prodcons/RESTClientWithHTTPHeaderNotKvPairs.json +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/resources/prodcons/RESTClientWithHTTPHeaderNotKvPairs.json @@ -15,7 +15,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/RequestorModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/resources/prodcons/RESTClientWithHTTPHeaderNulls.json b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/resources/prodcons/RESTClientWithHTTPHeaderNulls.json index 3641adeae..29ebe549b 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/resources/prodcons/RESTClientWithHTTPHeaderNulls.json +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/resources/prodcons/RESTClientWithHTTPHeaderNulls.json @@ -15,7 +15,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/RequestorModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParameters.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParameters.java index d67c44ef5..afede627e 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParameters.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParameters.java @@ -51,7 +51,6 @@ import org.onap.policy.common.parameters.ValidationStatus; * <li>engineParameters: Parameters (a {@link EngineParameters} instance) that all of the engines in the engine service * will use. All engine threads use the same parameters and act as a pool of engines. Engine parameters specify the * executors and context management for the engines. - * <li>policyModelFileName: The full path to the policy model file name to deploy on the engine service. * <li>periodicEventPeriod: The period in milliseconds at which the periodic event PERIOIC_EVENT will be generated by * APEX, 0 means no periodic event generation, negative values are illegal. * </ol> @@ -161,7 +160,7 @@ public class EngineServiceParameters implements ParameterGroup { /** * Validate numeric parameters. - * + * * @param result the result of numeric parameter validation */ private void validateNumericParameters(final GroupValidationResult result) { diff --git a/services/services-engine/src/test/resources/main/prodConsBadCTParClass.json b/services/services-engine/src/test/resources/main/prodConsBadCTParClass.json index 48c2dc905..deb8725aa 100644 --- a/services/services-engine/src/test/resources/main/prodConsBadCTParClass.json +++ b/services/services-engine/src/test/resources/main/prodConsBadCTParClass.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 19, "deploymentPort": 65522, - "policyModelFileName": "src/test/resources/policymodels/SmallModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { 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 19ea5fab7..de78870e9 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 @@ -5,7 +5,6 @@ "id": 101, "instanceCount": 1, "deploymentPort": 12550, - "policyModelFileName": "/dev/null", "engineParameters": { "executorParameters": { "JAVASCRIPT": { 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 ea877bd97..c302307f7 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 @@ -5,7 +5,6 @@ "id": 101, "instanceCount": 1, "deploymentPort": 12550, - "policyModelFileName": "/dev/null", "engineParameters": { "executorParameters": { "JAVASCRIPT": { 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 1749e406e..6cbc321fd 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 @@ -15,7 +15,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { 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 6bc7707da..eaad860f8 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 @@ -15,7 +15,6 @@ "id": 102, "instanceCount": 1, "deploymentPort": 12549, - "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventBadHttpCodeFilter.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventBadHttpCodeFilter.json index 253008b43..c68a8fea4 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventBadHttpCodeFilter.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventBadHttpCodeFilter.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "target/ExecutionPropertiesRestTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventBadUrl.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventBadUrl.json index bec3f9214..b89646d59 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventBadUrl.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventBadUrl.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "target/ExecutionPropertiesRestTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventNoValueSetForTag.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventNoValueSetForTag.json index a765fb5b2..ddcb10ea0 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventNoValueSetForTag.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventNoValueSetForTag.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "target/ExecutionPropertiesRestTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTHttpCodeFilterSetToMultiTagUrlOK.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTHttpCodeFilterSetToMultiTagUrlOK.json index 556ca234d..1be1a2d41 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTHttpCodeFilterSetToMultiTagUrlOK.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTHttpCodeFilterSetToMultiTagUrlOK.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "target/ExecutionPropertiesRestTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { 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 index 455d6f54e..22ab9e3bb 100644 --- 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 @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "target/ExecutionPropertiesRestTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/addProperty_conf.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/addProperty_conf.json index 22d1c5b27..5aa955e2f 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/addProperty_conf.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/addProperty_conf.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "ExecutionPropertiesTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/definedToEmpty_conf.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/definedToEmpty_conf.json index ec96b5cc4..6c1a9cad9 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/definedToEmpty_conf.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/definedToEmpty_conf.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "ExecutionPropertiesTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/emptyToDefined_conf.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/emptyToDefined_conf.json index a2ad6037a..ff8dabc6e 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/emptyToDefined_conf.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/emptyToDefined_conf.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "ExecutionPropertiesTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/emptyToEmpty_conf.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/emptyToEmpty_conf.json index e5d6d8373..ff8e06212 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/emptyToEmpty_conf.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/emptyToEmpty_conf.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "ExecutionPropertiesTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/readOnly_conf.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/readOnly_conf.json index 723d04450..a1fa088be 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/readOnly_conf.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/readOnly_conf.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "ExecutionPropertiesTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/removeProperty_conf.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/removeProperty_conf.json index fb4db38fc..e26307971 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/removeProperty_conf.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/removeProperty_conf.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "ExecutionPropertiesTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_invalidTaskIds.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_invalidTaskIds.json index 0714f4b37..e0de87ff3 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_invalidTaskIds.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_invalidTaskIds.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 1, "deploymentPort": 12561, - "policyModelFileName": "target/TaskParametersTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_noTaskIds.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_noTaskIds.json index 217d6bda2..8458c32f9 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_noTaskIds.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_noTaskIds.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 1, "deploymentPort": 12561, - "policyModelFileName": "target/TaskParametersTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_validTaskIds.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_validTaskIds.json index 0029374f9..f80b0113b 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_validTaskIds.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_validTaskIds.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 1, "deploymentPort": 12561, - "policyModelFileName": "target/TaskParametersTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby01.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby01.json index 117d3fbc5..2c2b9f549 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby01.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby01.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 1, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJRUBY.xml", "engineParameters": { "executorParameters": { "JRUBY": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby02.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby02.json index 0e154ddf7..2509ed456 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby02.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby02.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 2, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJRUBY.xml", "engineParameters": { "executorParameters": { "JRUBY": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby04.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby04.json index 9d1c891b7..94b85de52 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby04.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby04.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJRUBY.xml", "engineParameters": { "executorParameters": { "JRUBY": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby08.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby08.json index d4fd87af7..79f63efc6 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby08.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby08.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 8, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJRUBY.xml", "engineParameters": { "executorParameters": { "JRUBY": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby16.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby16.json index 24c26644c..64ee86366 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby16.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby16.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 16, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJRUBY.xml", "engineParameters": { "executorParameters": { "JRUBY": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby32.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby32.json index 88293b899..16f1d8c62 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby32.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby32.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 32, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJRUBY.xml", "engineParameters": { "executorParameters": { "JRUBY": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby64.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby64.json index 99a8b3f0f..6248eac77 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby64.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/JRuby64.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 64, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJRUBY.xml", "engineParameters": { "executorParameters": { "JRUBY": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java01.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java01.json index 674e3005e..91ac637c2 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java01.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java01.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 1, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVA.xml", "engineParameters": { "executorParameters": { "JAVA": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java02.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java02.json index 8c1702026..86b22c446 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java02.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java02.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 2, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVA.xml", "engineParameters": { "executorParameters": { "JAVA": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java04.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java04.json index 2602390ae..777e2dc1a 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java04.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java04.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVA.xml", "engineParameters": { "executorParameters": { "JAVA": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java08.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java08.json index a9d990292..5c49f3e3e 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java08.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java08.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 8, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVA.xml", "engineParameters": { "executorParameters": { "JAVA": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java16.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java16.json index dc1d9f699..3a73ae26b 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java16.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java16.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 16, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVA.xml", "engineParameters": { "executorParameters": { "JAVA": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java32.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java32.json index 0bc52e336..603f11dbc 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java32.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java32.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 32, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVA.xml", "engineParameters": { "executorParameters": { "JAVA": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java64.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java64.json index 52d074089..2e2372322 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java64.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Java64.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 64, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVA.xml", "engineParameters": { "executorParameters": { "JAVA": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript01.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript01.json index afea5fe45..d6bba7eca 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript01.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript01.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 1, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript02.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript02.json index f28dc18b1..11d22240d 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript02.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript02.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 2, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript04.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript04.json index 110996e6a..585f5198f 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript04.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript04.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript08.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript08.json index 67bca6b8a..0d9fd54e4 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript08.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript08.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 8, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript16.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript16.json index ceff6370c..f05cd525d 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript16.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript16.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 16, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript32.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript32.json index eeb371e29..2161e907f 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript32.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript32.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 32, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript64.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript64.json index a724f668c..e1943faea 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript64.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Javascript64.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 64, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython01.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython01.json index 25c4e426c..9f4351063 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython01.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython01.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 1, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJYTHON.xml", "engineParameters": { "executorParameters": { "JYTHON": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython02.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython02.json index 9f010775a..9240bfdc5 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython02.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython02.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 2, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJYTHON.xml", "engineParameters": { "executorParameters": { "JYTHON": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython04.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython04.json index 0bd8c35dd..d55fa5d54 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython04.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython04.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJYTHON.xml", "engineParameters": { "executorParameters": { "JYTHON": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython08.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython08.json index 8e7fd3f23..e0ec9719a 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython08.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython08.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 8, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJYTHON.xml", "engineParameters": { "executorParameters": { "JYTHON": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython16.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython16.json index 899a6b8ef..024b73f90 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython16.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython16.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 16, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJYTHON.xml", "engineParameters": { "executorParameters": { "JYTHON": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython32.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython32.json index 9919970d7..c20d05c25 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython32.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython32.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 32, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJYTHON.xml", "engineParameters": { "executorParameters": { "JYTHON": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython64.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython64.json index 8952f45c7..758ae2eae 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython64.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Jython64.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 64, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJYTHON.xml", "engineParameters": { "executorParameters": { "JYTHON": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel01.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel01.json index 3bf7749bd..a83097b8c 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel01.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel01.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 1, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelMVEL.xml", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel02.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel02.json index eb203c872..af01e84fd 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel02.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel02.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 2, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelMVEL.xml", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel04.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel04.json index b62b93e06..c9fd24791 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel04.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel04.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelMVEL.xml", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel08.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel08.json index d81cf67fe..4878d41e7 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel08.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel08.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 8, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelMVEL.xml", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel16.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel16.json index a211ac7f1..883a0ac52 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel16.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel16.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 16, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelMVEL.xml", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel32.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel32.json index 2ca767555..412f86d42 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel32.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel32.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 32, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelMVEL.xml", "engineParameters": { "executorParameters": { "MVEL": { diff --git a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel64.json b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel64.json index 488f845b3..dfcc8c11f 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel64.json +++ b/testsuites/performance/performance-benchmark-test/src/main/resources/examples/benchmark/Mvel64.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 64, "deploymentPort": 12561, - "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelMVEL.xml", "engineParameters": { "executorParameters": { "MVEL": { |