From dbc13c78875a3d5493054a7252a7804daae8cf1f Mon Sep 17 00:00:00 2001
From: FrancescoFioraEst <francesco.fiora@est.tech>
Date: Tue, 15 Jun 2021 16:01:31 +0100
Subject: Move parameters from config Json file to application.yaml

Issue-ID: POLICY-3343
Change-Id: Id78c00a5a241337f684a70feeee543f3a88fc01c
Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>
---
 .../config/KubernetesParticipantConfig.json        | 56 ----------------------
 .../src/main/resources/config/application.yaml     | 27 ++++++++++-
 2 files changed, 26 insertions(+), 57 deletions(-)
 delete mode 100644 participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/KubernetesParticipantConfig.json

(limited to 'participant/participant-impl/participant-impl-kubernetes/src/main/resources')

diff --git a/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/KubernetesParticipantConfig.json b/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/KubernetesParticipantConfig.json
deleted file mode 100644
index e854a9375..000000000
--- a/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/KubernetesParticipantConfig.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "name": "ControlLoopParticipantK8s",
-    "localChartDirectory": "/var/helm-manager/local-charts",
-    "infoFileName": "CHART_INFO.json",
-
-    "intermediaryParameters":{
-        "name":"Participant parameters",
-        "reportingTimeInterval":120000,
-        "description":"Participant Description",
-        "participantId":{
-            "name":"K8sParticipant0",
-            "version":"1.0.0"
-        },
-        "participantType":{
-            "name":"org.onap.k8s.controlloop.K8SControlLoopParticipant",
-            "version":"2.3.4"
-        },
-        "clampControlLoopTopics":{
-            "topicSources":[
-                {
-                    "topic":"POLICY-CLRUNTIME-PARTICIPANT",
-                    "servers":[
-                        "localhost"
-                    ],
-                    "topicCommInfrastructure":"dmaap",
-                    "fetchTimeout":15000
-                }
-            ],
-            "topicSinks":[
-                {
-                    "topic":"POLICY-CLRUNTIME-PARTICIPANT",
-                    "servers":[
-                        "localhost"
-                    ],
-                    "topicCommInfrastructure":"dmaap"
-                },
-                {
-                    "topic":"POLICY-NOTIFICATION",
-                    "servers":[
-                        "localhost"
-                    ],
-                    "topicCommInfrastructure":"dmaap"
-                }
-            ]
-        }
-    },
-    "databaseProviderParameters":{
-        "name":"PolicyProviderParameterGroup",
-        "implementation":"org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl",
-        "databaseDriver":"org.mariadb.jdbc.Driver",
-        "databaseUrl":"jdbc:mariadb://localhost:3306/controlloop",
-        "databaseUser":"policy",
-        "databasePassword":"P01icY",
-        "persistenceUnit":"ToscaConceptTest"
-    }
-}
diff --git a/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml
index b4240036b..63ec8a295 100644
--- a/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml
+++ b/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml
@@ -3,7 +3,32 @@ spring:
     active: prod
 
 participant:
-  file: src/main/resources/config/KubernetesParticipantConfig.json
+  localChartDirectory: /var/helm-manager/local-charts
+  infoFileName: CHART_INFO.json
+  intermediaryParameters:
+    reportingTimeInterval: 120000
+    description: Participant Description
+    participantId:
+      name: K8sParticipant0
+      version: 1.0.0
+    participantType:
+      name: org.onap.k8s.controlloop.K8SControlLoopParticipant
+      version: 2.3.4
+    clampControlLoopTopics:
+      topicSources[0]:
+        topic: POLICY-CLRUNTIME-PARTICIPANT
+        servers[0]: ${topicServer:message-router}
+        topicCommInfrastructure: dmaap
+        fetchTimeout: 15000
+      topicSinks[0]:
+        topic: POLICY-CLRUNTIME-PARTICIPANT
+        servers[0]: ${topicServer:message-router}
+        topicCommInfrastructure: dmaap
+      topicSinks[1]:
+        topic: POLICY-NOTIFICATION
+        servers[0]: ${topicServer:message-router}
+        topicCommInfrastructure: dmaap
+
 management:
   endpoints:
     web:
-- 
cgit 1.2.3-korg