From 3e19dab2db3230de597030a28969b5b41135ec92 Mon Sep 17 00:00:00 2001
From: Ram Krishna Verma <ram_krishna.verma@bell.ca>
Date: Tue, 21 Jul 2020 15:19:48 -0400
Subject: Remove hpa decoder from policy/distribution

Issue-ID: POLICY-2477
Change-Id: Iff4158e2322724265007d5a90459c3ebf62d3fc2
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
---
 .../src/main/resources/etc/defaultConfig.json        | 20 ++++++++------------
 .../src/main/resources/etc/s3pConfig.json            | 20 ++++++++------------
 2 files changed, 16 insertions(+), 24 deletions(-)

(limited to 'packages/policy-distribution-tarball/src')

diff --git a/packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json b/packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json
index 3c955783..f5fe30d5 100644
--- a/packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json
+++ b/packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json
@@ -14,10 +14,10 @@
             "receptionHandlerConfigurationName": "sdcConfiguration",
             "pluginHandlerParameters": {
                 "policyDecoders": {
-                    "LifecycleApiDecoder": {
-                        "decoderType": "CsarDecoder",
-                        "decoderClassName": "org.onap.policy.distribution.reception.decoding.hpa.PolicyDecoderCsarHpa",
-                        "decoderConfigurationName": "csarToToscaServiceTemplateConfiguration"
+                    "ToscaPolicyDecoder": {
+                        "decoderType": "ToscaPolicyDecoder",
+                        "decoderClassName": "org.onap.policy.distribution.reception.decoding.policy.file.PolicyDecoderFileInCsarToPolicy",
+                        "decoderConfigurationName": "toscaPolicyDecoderConfiguration"
                     }
                 },
                 "policyForwarders": {
@@ -58,15 +58,11 @@
         }
     },
     "policyDecoderConfigurationParameters": {
-        "csarToToscaServiceTemplateConfiguration": {
-            "parameterClassName": "org.onap.policy.distribution.reception.decoding.hpa.PolicyDecoderCsarHpaParameters",
+        "toscaPolicyDecoderConfiguration": {
+            "parameterClassName": "org.onap.policy.distribution.reception.decoding.policy.file.PolicyDecoderFileInCsarToPolicyParameterGroup",
             "parameters": {
-                "policyNamePrefix": "oofCasablanca",
-                "onapName": "OOF",
-                "version": "1.0",
-                "priority": "3",
-                "riskType": "Test",
-                "riskLevel": "2"
+                "policyFileName": "tosca_policy",
+                "policyTypeFileName": "tosca_policy_type",
             }
         }
     },
diff --git a/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json b/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json
index 07c1a8a2..4589fddc 100644
--- a/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json
+++ b/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json
@@ -13,10 +13,10 @@
             "receptionHandlerConfigurationName": "fileConfiguration",
             "pluginHandlerParameters": {
                 "policyDecoders": {
-                    "CsarDecoder": {
-                        "decoderType": "CsarDecoder",
-                        "decoderClassName": "org.onap.policy.distribution.reception.decoding.hpa.PolicyDecoderCsarHpa",
-                        "decoderConfigurationName": "csarToOptimizationPolicyConfiguration"
+                    "ToscaPolicyDecoder": {
+                        "decoderType": "ToscaPolicyDecoder",
+                        "decoderClassName": "org.onap.policy.distribution.reception.decoding.policy.file.PolicyDecoderFileInCsarToPolicy",
+                        "decoderConfigurationName": "toscaPolicyDecoderConfiguration"
                     }
                 },
                 "policyForwarders": {
@@ -38,15 +38,11 @@
         }
     },
     "policyDecoderConfigurationParameters": {
-        "csarToToscaServiceTemplateConfiguration": {
-            "parameterClassName": "org.onap.policy.distribution.reception.decoding.hpa.PolicyDecoderCsarHpaParameters",
+        "toscaPolicyDecoderConfiguration": {
+            "parameterClassName": "org.onap.policy.distribution.reception.decoding.policy.file.PolicyDecoderFileInCsarToPolicyParameterGroup",
             "parameters": {
-                "policyNamePrefix": "oofCasablanca",
-                "onapName": "OOF",
-                "version": "1.0",
-                "priority": "3",
-                "riskType": "Test",
-                "riskLevel": "2"
+                "policyFileName": "tosca_policy",
+                "policyTypeFileName": "tosca_policy_type",
             }
         }
     },
-- 
cgit 1.2.3-korg