From: RehanRaza <muhammad.rehan.raza@est.tech>
Date: Tue, 9 Feb 2021 13:16:44 +0000 (+0100)
Subject: Fix formatting of configmap in nonrtric-policymanagementservice
X-Git-Tag: f-release~62
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=it%2Fdep.git;a=commitdiff_plain;h=07123460d813193fb0fdcc6d69230397b4467f56

Fix formatting of configmap in nonrtric-policymanagementservice

Change-Id: Ibe5a9abb1dc3cfb3ddb47610a15bc3793cb677d5
Issue-ID: NONRTRIC-435
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
---

diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
index 4e5ec4ab..fc81dfa0 100644
--- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
@@ -129,81 +129,6 @@ policymanagementservice:
     readiness:
       initialDelaySeconds: 20
       periodSeconds: 10
-    ric: |
-      [
-        {
-             "name":"ric1",
-             "baseUrl":"https://a1-sim-osc-0.a1-sim:8185",
-             "controller": "controller1",
-             "managedElementIds":[
-                "kista_1",
-                "kista_2"
-             ]
-          },
-          {
-            "name":"ric2",
-            "baseUrl":"https://a1-sim-osc-1.a1-sim:8185",
-            "controller": "controller1",
-            "managedElementIds":[
-               "kista_1",
-               "kista_2"
-            ]
-          },
-          {
-            "name":"ric3",
-            "baseUrl":"https://a1-sim-std-0.a1-sim:8185",
-            "controller": "controller1",
-            "managedElementIds":[
-               "kista_1",
-               "kista_2"
-            ]
-          },
-          {
-            "name":"ric4",
-            "baseUrl":"https://a1-sim-std-1.a1-sim:8185",
-            "controller": "controller1",
-            "managedElementIds":[
-               "kista_1",
-               "kista_2"
-            ]
-          },
-          {
-            "name":"ric5",
-            "baseUrl":"https://a1-sim-std2-0.a1-sim:8185",
-            "controller": "controller1",
-            "managedElementIds":[
-               "kista_1",
-               "kista_2"
-            ]
-          },
-          {
-            "name":"ric6",
-            "baseUrl":"https://a1-sim-std2-1.a1-sim:8185",
-            "controller": "controller1",
-            "managedElementIds":[
-               "kista_1",
-               "kista_2"
-            ]
-          }
-      ]
-    streams_publishes: |
-      {
-        "dmaap_publisher": {
-          "type":"message_router",
-          "dmaap_info":{
-            "topic_url":"http://message-router.onap:3904/events/A1-POLICY-AGENT-WRITE"
-          }
-        }
-      }
-    streams_subscribes: |
-      {
-        "dmaap_subscriber":{
-          "type":"message_router",
-          "dmaap_info":{
-            "topic_url":"http://message-router.onap:3904/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100"
-          }
-        }
-      }
 
 enrichmentservice:
   enrichmentservice:
diff --git a/nonrtric/helm/policymanagementservice/resources/data/application_configuration.json b/nonrtric/helm/policymanagementservice/resources/data/application_configuration.json
index 41b93004..8c446fab 100644
--- a/nonrtric/helm/policymanagementservice/resources/data/application_configuration.json
+++ b/nonrtric/helm/policymanagementservice/resources/data/application_configuration.json
@@ -1,8 +1,84 @@
 {
     "config":{
-      "controller": {{ .Values.policymanagementservice.controllers  | indent 12 }},
-      "ric": {{ .Values.policymanagementservice.ric  | indent 12 }},
-      "streams_publishes": {{ .Values.policymanagementservice.streams_publishes  | indent 12 }},
-      "streams_subscribes": {{ .Values.policymanagementservice.streams_subscribes  | indent 12 }}
+      "controller": [
+         {
+            "name": "controller1",
+            "baseUrl": "https://a1controller:8383",
+            "userName": "admin",
+            "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+         }
+      ],
+      "ric": [
+        {
+             "name":"ric1",
+             "baseUrl":"https://a1-sim-osc-0.a1-sim:8185",
+             "controller": "controller1",
+             "managedElementIds":[
+                "kista_1",
+                "kista_2"
+             ]
+          },
+          {
+            "name":"ric2",
+            "baseUrl":"https://a1-sim-osc-1.a1-sim:8185",
+            "controller": "controller1",
+            "managedElementIds":[
+               "kista_1",
+               "kista_2"
+            ]
+          },
+          {
+            "name":"ric3",
+            "baseUrl":"https://a1-sim-std-0.a1-sim:8185",
+            "controller": "controller1",
+            "managedElementIds":[
+               "kista_1",
+               "kista_2"
+            ]
+          },
+          {
+            "name":"ric4",
+            "baseUrl":"https://a1-sim-std-1.a1-sim:8185",
+            "controller": "controller1",
+            "managedElementIds":[
+               "kista_1",
+               "kista_2"
+            ]
+          },
+          {
+            "name":"ric5",
+            "baseUrl":"https://a1-sim-std2-0.a1-sim:8185",
+            "controller": "controller1",
+            "managedElementIds":[
+               "kista_1",
+               "kista_2"
+            ]
+          },
+          {
+            "name":"ric6",
+            "baseUrl":"https://a1-sim-std2-1.a1-sim:8185",
+            "controller": "controller1",
+            "managedElementIds":[
+               "kista_1",
+               "kista_2"
+            ]
+          }
+      ],
+      "streams_publishes": {
+        "dmaap_publisher": {
+          "type":"message_router",
+          "dmaap_info":{
+            "topic_url":"http://message-router.onap:3904/events/A1-POLICY-AGENT-WRITE"
+          }
+        }
+      },
+      "streams_subscribes": {
+        "dmaap_subscriber":{
+          "type":"message_router",
+          "dmaap_info":{
+            "topic_url":"http://message-router.onap:3904/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100"
+          }
+        }
+      }
     }
 }
diff --git a/nonrtric/helm/policymanagementservice/values.yaml b/nonrtric/helm/policymanagementservice/values.yaml
index ae26644f..f10aabdb 100644
--- a/nonrtric/helm/policymanagementservice/values.yaml
+++ b/nonrtric/helm/policymanagementservice/values.yaml
@@ -37,71 +37,4 @@ policymanagementservice:
     periodSeconds: 10
   readiness:
     initialDelaySeconds: 20
-    periodSeconds: 10
-  controllers: |
-    [
-         {
-            "name": "controller1",
-            "baseUrl": "https://a1controller:8383",
-            "userName": "admin",
-            "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
-         }
-    ]
-  ric: |
-    [
-          {
-             "name":"ric1",
-             "baseUrl":"https://a1-sim-osc-0.a1-sim:8185",
-             "controller": "controller1",
-             "managedElementIds":[
-                "kista_1",
-                "kista_2"
-             ]
-          },
-          {
-            "name":"ric2",
-            "baseUrl":"https://a1-sim-osc-1.a1-sim:8185",
-            "controller": "controller1",
-            "managedElementIds":[
-               "kista_1",
-               "kista_2"
-            ]
-          },
-          {
-            "name":"ric3",
-            "baseUrl":"https://a1-sim-std-0.a1-sim:8185",
-            "controller": "controller1",
-            "managedElementIds":[
-               "kista_1",
-               "kista_2"
-            ]
-          },
-          {
-            "name":"ric4",
-            "baseUrl":"https://a1-sim-std-1.a1-sim:8185",
-            "controller": "controller1",
-            "managedElementIds":[
-               "kista_1",
-               "kista_2"
-            ]
-          }
-    ]
-  streams_publishes: |
-    {
-          "dmaap_publisher":{
-             "type":"message_router",
-             "dmaap_info":{
-                "topic_url":"http://message-router:3904/events/A1-POLICY-AGENT-WRITE"
-             }
-          }
-    }
-  streams_subscribes: |
-    {
-          "dmaap_subscriber":{
-             "type":"message_router",
-             "dmaap_info":{
-                "topic_url":"http://message-router:3904/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100"
-             }
-          }
-    }
-
+    periodSeconds: 10
\ No newline at end of file