X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fpolicy%2Fcharts%2Fpolicy-distribution%2Fresources%2Fconfig%2Fconfig.json;h=9b9a7a5a93f8d35943113c9e3af4a9c05ce2fe8f;hb=b58b9d8f84befa7086381d79f43c8d1a83a890a6;hp=5591e58e3292cfb8119452c75c1f1fce01fa124c;hpb=d9a8c9ed9247bd82a23d413882a08f63c63dda70;p=oom.git

diff --git a/kubernetes/policy/charts/policy-distribution/resources/config/config.json b/kubernetes/policy/charts/policy-distribution/resources/config/config.json
index 5591e58e32..9b9a7a5a93 100644
--- a/kubernetes/policy/charts/policy-distribution/resources/config/config.json
+++ b/kubernetes/policy/charts/policy-distribution/resources/config/config.json
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
+#   Modifications Copyright (C) 2020 AT&T Intellectual Property.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -20,8 +21,8 @@
     "restServerParameters":{
         "host":"0.0.0.0",
         "port":6969,
-        "userName":"healthcheck",
-        "password":"zb!XztG34",
+        "userName":"${RESTSERVER_USER}",
+        "password":"${RESTSERVER_PASSWORD}",
         "https":true
     },
     "receptionHandlerParameters":{
@@ -31,27 +32,17 @@
             "receptionHandlerConfigurationName":"sdcConfiguration",
             "pluginHandlerParameters":{
                 "policyDecoders":{
-                    "CsarDecoder":{
-                        "decoderType":"CsarDecoder",
-                        "decoderClassName":"org.onap.policy.distribution.reception.decoding.pdpx.PolicyDecoderCsarPdpx",
-                        "decoderConfigurationName": "csarToOptimizationPolicyConfiguration"
-                    },
-                    "ApexDecoder":{
-                        "decoderType":"ApexDecoder",
+                    "ToscaPolicyDecoder":{
+                        "decoderType":"ToscaPolicyDecoder",
                         "decoderClassName":"org.onap.policy.distribution.reception.decoding.policy.file.PolicyDecoderFileInCsarToPolicy",
-                        "decoderConfigurationName": "apexDecoderConfiguration"
+                        "decoderConfigurationName": "toscaPolicyDecoderConfiguration"
                     }
                 },
                 "policyForwarders":{
-                    "PAPEngineForwarder":{
-                        "forwarderType":"PAPEngine",
-                        "forwarderClassName":"org.onap.policy.distribution.forwarding.xacml.pdp.XacmlPdpPolicyForwarder",
-                        "forwarderConfigurationName": "xacmlPdpConfiguration"
-                    },
-                    "ApexForwarder":{
-                        "forwarderType":"ApexForwarder",
-                        "forwarderClassName":"org.onap.policy.distribution.forwarding.apex.pdp.ApexPdpPolicyForwarder",
-                        "forwarderConfigurationName": "apexForwarderConfiguration"
+                    "LifeCycleApiForwarder":{
+                        "forwarderType":"LifeCycleAPI",
+                        "forwarderClassName":"org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiPolicyForwarder",
+                        "forwarderConfigurationName": "lifecycleApiConfiguration"
                     }
                 }
             }
@@ -65,8 +56,8 @@
                 "messageBusAddress": [
                     "message-router"
                  ],
-                "user": "policy",
-                "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U",
+                "user": "${SDCBE_USER}",
+                "password": "${SDCBE_PASSWORD}",
                 "pollingInterval":20,
                 "pollingTimeout":30,
                 "consumerId": "policy-id",
@@ -80,52 +71,38 @@
                 "keystorePassword": "null",
                 "activeserverTlsAuth": false,
                 "isFilterinEmptyResources": true,
-                "isUseHttpsWithDmaap": false
+                "isUseHttpsWithDmaap": true
             }
         }
     },
     "policyDecoderConfigurationParameters":{
-        "csarToOptimizationPolicyConfiguration":{
-            "parameterClassName":"org.onap.policy.distribution.reception.decoding.pdpx.PolicyDecoderCsarPdpxConfigurationParameterGroup",
-            "parameters":{
-                "policyNamePrefix": "oofCasablanca",
-                "onapName": "OOF",
-                "version": "1.0",
-                "priority": "3",
-                "riskType": "Test",
-                "riskLevel": "2"
-            }
-        },
-        "apexDecoderConfiguration":{
+        "toscaPolicyDecoderConfiguration":{
             "parameterClassName":"org.onap.policy.distribution.reception.decoding.policy.file.PolicyDecoderFileInCsarToPolicyParameterGroup",
             "parameters":{
-                "policyFileName": "SamplePolicyModelJAVASCRIPT",
-                "policyType": "APEX"
+                "policyFileName": "tosca_policy",
+                "policyTypeFileName": "tosca_policy_type"
             }
         }
     },
     "policyForwarderConfigurationParameters":{
-        "xacmlPdpConfiguration":{
-            "parameterClassName":"org.onap.policy.distribution.forwarding.xacml.pdp.XacmlPdpPolicyForwarderParameterGroup",
-            "parameters":{
-                "useHttps": true,
-                "hostname": "pdp",
-                "port": 8081,
-                "userName": "testpdp",
-                "password": "alpha123",
-                "clientAuth": "cHl0aG9uOnRlc3Q=",
-                "isManaged": true,
-                "pdpGroup": "default"
-            }
-        },
-        "apexForwarderConfiguration":{
-            "parameterClassName":"org.onap.policy.distribution.forwarding.apex.pdp.ApexPdpPolicyForwarderParameterGroup",
+        "lifecycleApiConfiguration":{
+            "parameterClassName":"org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiForwarderParameters",
             "parameters":{
-                "hostname":"policy-apex-pdp",
-                "port":"12345",
-                "ignoreConflicts": true,
-                "forceUpdate": true
-            }
+                "apiParameters": {
+                "hostName": "policy-api",
+                "port": 6969,
+                  "userName": "${API_USER}",
+                  "password": "${API_PASSWORD}"
+                 },
+                "papParameters": {
+                  "hostName": "policy-pap",
+                  "port": 6969,
+                 "userName": "${PAP_USER}",
+                "password": "${PAP_PASSWORD}"
+                },
+                "isHttps": true,
+                "deployPolicies": true
+             }
         }
     }
 }