Make RIC parameters configurable in recipe

Change-Id: I2514bad3a08d4b052402b5c9244f1696b071655a
Signed-off-by: Lusheng Ji <lji@research.att.com>

diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
index 8f70642..c7748c6 100644 (file)
--- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
@@ -130,3 +130,35 @@ policymanagementservice:
     readiness:
       initialDelaySeconds: 20
       periodSeconds: 10
+    ric: |
+      [
+        {
+          "name":"ric1",
+          "baseUrl":"http://192.168.130.80:32080/a1mediator",
+          "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"
+          }
+        }
+      }
+

diff --git a/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json b/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json
index ab42552..41b9300 100644 (file)
--- a/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json
+++ b/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json
@@ -1,66 +1,8 @@
 {
     "config":{
-      "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"
-            ]
-          }
-       ],
-       "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"
-             }
-          }
-       }
+      "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 }}
     }
- }
\ No newline at end of file
+}

diff --git a/nonrtric/helm/policymanagementservice/values.yaml b/nonrtric/helm/policymanagementservice/values.yaml
index c3f2a2c..697ef1a 100644 (file)
--- a/nonrtric/helm/policymanagementservice/values.yaml
+++ b/nonrtric/helm/policymanagementservice/values.yaml
@@ -40,3 +40,70 @@ policymanagementservice:
   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"
+             }
+          }
+    }
+