Merge "Modify OOM Apex config for SSL" into casablanca

1 files changed, 45 insertions, 59 deletions

diff --git a/kubernetes/policy/charts/policy-apex-pdp/resources/config/config.json b/kubernetes/policy/charts/policy-apex-pdp/resources/config/config.json
index c8908c7b91..57542c3510 100644
--- a/kubernetes/policy/charts/policy-apex-pdp/resources/config/config.json
+++ b/kubernetes/policy/charts/policy-apex-pdp/resources/config/config.json
@@ -5,7 +5,7 @@
 #  you may not use this file except in compliance with the License.
 #  You may obtain a copy of the License at
 #
-#       http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,63 +16,49 @@
 #  SPDX-License-Identifier: Apache-2.0
 #  ============LICENSE_END=========================================================
 {
-        "engineServiceParameters": {
-                "name": "PolicyApexPDPEngine",
-                "version": "0.0.1",
-                "id": 45,
-                "instanceCount": 4,
-                "deploymentPort": 12345,
-                "engineParameters": {
-                        "executorParameters": {
-                                "JAVASCRIPT": {
-                                        "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
-                                }
-                        },
-                        "contextParameters": {
-                                "parameterClassName": "org.onap.policy.apex.context.parameters.ContextParameters",
-                                "schemaParameters": {
-                                        "Avro": {
-                                                "parameterClassName": "org.onap.policy.apex.plugins.context.schema.avro.AvroSchemaHelperParameters"
-                                        }
-                                }
-                        }
-                }
-        },
-        "eventInputParameters": {
-          "ApexConsumer": {
-            "carrierTechnologyParameters" : {
-              "carrierTechnology" : "RESTSERVER",
-              "parameterClassName" :
-                "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters",
-              "parameters" : {
-                "standalone" : true,
-                "host" : "localhost",
-                "port" : 12346
-              }
-            },
-            "eventProtocolParameters":{
-              "eventProtocol" : "JSON"
-            },
-            "synchronousMode"    : true,
-            "synchronousPeer"    : "ApexProducer",
-            "synchronousTimeout" : 500
-          }
-        },
-        "eventOutputParameters": {
-          "ApexProducer": {
-            "carrierTechnologyParameters":{
-              "carrierTechnology" : "RESTSERVER",
-              "parameterClassName" :
-                "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters"
-            },
-            "eventProtocolParameters":{
-              "eventProtocol" : "JSON"
-            },
-            "synchronousMode"    : true,
-            "synchronousPeer"    : "ApexConsumer",
-            "synchronousTimeout" : 500
-          }
+  "javaProperties" : [
+    ["javax.net.ssl.trustStore", "/opt/app/policy/apex-pdp/etc/ssl/policy-truststore"],
+    ["javax.net.ssl.trustStorePassword", "UG9sMWN5XzBuYXA="]
+  ],
+  "engineServiceParameters": {
+    "name": "MyApexEngine",
+    "version": "0.0.1",
+    "id": 45,
+    "instanceCount": 4,
+    "deploymentPort": 12345,
+    "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json",
+    "engineParameters": {
+      "executorParameters": {
+        "JAVASCRIPT": {
+          "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
         }
+      }
+    }
+  },
+  "eventOutputParameters": {
+    "FirstProducer": {
+      "carrierTechnologyParameters": {
+        "carrierTechnology": "FILE",
+        "parameters": {
+          "standardIo": true
+        }
+      },
+      "eventProtocolParameters": {
+        "eventProtocol": "JSON"
+      }
+    }
+  },
+  "eventInputParameters": {
+    "FirstConsumer": {
+      "carrierTechnologyParameters": {
+        "carrierTechnology": "FILE",
+        "parameters": {
+          "standardIo": true
+        }
+      },
+      "eventProtocolParameters": {
+        "eventProtocol": "JSON"
+      }
+    }
+  }
 }
-
-