summaryrefslogtreecommitdiffstats
path: root/packages/policy-distribution-tarball/src
diff options
context:
space:
mode:
authorRam Krishna Verma <ram_krishna.verma@bell.ca>2020-07-21 15:19:48 -0400
committerRam Krishna Verma <ram_krishna.verma@bell.ca>2020-07-21 15:21:04 -0400
commit3e19dab2db3230de597030a28969b5b41135ec92 (patch)
treef2b2992774db3bb8d488a17d4023c0447e76ba1a /packages/policy-distribution-tarball/src
parent61cd4b9bfd4f110b7da6cface918d724c86577cb (diff)
Remove hpa decoder from policy/distribution
Issue-ID: POLICY-2477 Change-Id: Iff4158e2322724265007d5a90459c3ebf62d3fc2 Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
Diffstat (limited to 'packages/policy-distribution-tarball/src')
-rw-r--r--packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json20
-rw-r--r--packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json20
2 files changed, 16 insertions, 24 deletions
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",
}
}
},