Merge "VES chart updates"

diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
index 9692919..c7748c6 100644 (file)
--- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
@@ -33,7 +33,7 @@ a1controller:
     image:
       registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
       name: nonrtric-a1-controller
-      tag: 1.7.5
+      tag: 2.0.0
     replicaCount: 1
     service:
       allowHttp: true
@@ -57,7 +57,7 @@ a1simulator:
     image:
       registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
       name: a1-simulator
-      tag: 1.0.1
+      tag: 2.0.0
     service:
       allowHttp: true
       httpName: http
@@ -87,7 +87,7 @@ controlpanel:
     image:
       registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
       name: nonrtric-controlpanel
-      tag: 1.0.0
+      tag: 2.0.0
     replicaCount: 1
     service:
       allowHttp: true
@@ -113,7 +113,7 @@ policymanagementservice:
     image:
       registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
       name: nonrtric-policy-agent
-      tag: 1.0.0
+      tag: 2.0.0
     service:
       allowHttp: true
       httpName: http
@@ -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/a1controller/Chart.yaml b/nonrtric/helm/a1controller/Chart.yaml
index 80a230d..99ced47 100644 (file)
--- a/nonrtric/helm/a1controller/Chart.yaml
+++ b/nonrtric/helm/a1controller/Chart.yaml
@@ -15,7 +15,7 @@
 ################################################################################
 
 apiVersion: v1
-appVersion: "1.0"
+appVersion: "2.0.0"
 description: A Helm chart for nonrtric a1controller
 name: a1controller
-version: 1.0.0
+version: 2.0.0

diff --git a/nonrtric/helm/a1controller/requirements.yaml b/nonrtric/helm/a1controller/requirements.yaml
index ba44395..f3b3ecd 100644 (file)
--- a/nonrtric/helm/a1controller/requirements.yaml
+++ b/nonrtric/helm/a1controller/requirements.yaml
@@ -16,5 +16,5 @@
 
 dependencies:
   - name: nonrtric-common
-    version: ^1.0.0
+    version: ^2.0.0
     repository: "@local"

diff --git a/nonrtric/helm/a1controller/values.yaml b/nonrtric/helm/a1controller/values.yaml
index 80af1f0..a3bf0a6 100644 (file)
--- a/nonrtric/helm/a1controller/values.yaml
+++ b/nonrtric/helm/a1controller/values.yaml
@@ -22,7 +22,7 @@ a1controller:
   image:
     registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
     name: nonrtric-a1-controller
-    tag: 1.7.5
+    tag: 2.0.0
   replicaCount: 1
   service:
     allowHttp: true

diff --git a/nonrtric/helm/a1simulator/Chart.yaml b/nonrtric/helm/a1simulator/Chart.yaml
index cc35590..60d0cbf 100644 (file)
--- a/nonrtric/helm/a1simulator/Chart.yaml
+++ b/nonrtric/helm/a1simulator/Chart.yaml
@@ -15,6 +15,7 @@
 ################################################################################
 
 apiVersion: v1
+appVersion: "2.0.0"
 description: A Helm chart for A1 simulator
 name: a1simulator
-version: 1.0.1
+version: 2.0.0

diff --git a/nonrtric/helm/a1simulator/requirements.yaml b/nonrtric/helm/a1simulator/requirements.yaml
index ba44395..f3b3ecd 100644 (file)
--- a/nonrtric/helm/a1simulator/requirements.yaml
+++ b/nonrtric/helm/a1simulator/requirements.yaml
@@ -16,5 +16,5 @@
 
 dependencies:
   - name: nonrtric-common
-    version: ^1.0.0
+    version: ^2.0.0
     repository: "@local"

diff --git a/nonrtric/helm/a1simulator/values.yaml b/nonrtric/helm/a1simulator/values.yaml
index c059c38..d98fd43 100644 (file)
--- a/nonrtric/helm/a1simulator/values.yaml
+++ b/nonrtric/helm/a1simulator/values.yaml
@@ -22,9 +22,9 @@ a1simulator:
   name: a1-sim
   imagePullPolicy: IfNotPresent
   image:
-    registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
+    registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
     name: a1-simulator
-    tag: 1.0.1
+    tag: 2.0.0
   service:
     allowHttp: true
     httpName: http

diff --git a/nonrtric/helm/controlpanel/Chart.yaml b/nonrtric/helm/controlpanel/Chart.yaml
index cf00a1f..585ada4 100644 (file)
--- a/nonrtric/helm/controlpanel/Chart.yaml
+++ b/nonrtric/helm/controlpanel/Chart.yaml
@@ -15,6 +15,7 @@
 ################################################################################
 
 apiVersion: v1
+appVersion: "2.0.0"
 description: A Helm chart for nonrtric controlpanel
 name: controlpanel
-version: 1.0.0
+version: 2.0.0

diff --git a/nonrtric/helm/controlpanel/requirements.yaml b/nonrtric/helm/controlpanel/requirements.yaml
index ba44395..f3b3ecd 100644 (file)
--- a/nonrtric/helm/controlpanel/requirements.yaml
+++ b/nonrtric/helm/controlpanel/requirements.yaml
@@ -16,5 +16,5 @@
 
 dependencies:
   - name: nonrtric-common
-    version: ^1.0.0
+    version: ^2.0.0
     repository: "@local"

diff --git a/nonrtric/helm/controlpanel/values.yaml b/nonrtric/helm/controlpanel/values.yaml
index d7a6285..1a64c15 100644 (file)
--- a/nonrtric/helm/controlpanel/values.yaml
+++ b/nonrtric/helm/controlpanel/values.yaml
@@ -21,9 +21,9 @@
 controlpanel:
   imagePullPolicy: IfNotPresent
   image:
-    registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
+    registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
     name: nonrtric-controlpanel
-    tag: 1.0.0
+    tag: 2.0.0
   replicaCount: 1
   service:
     allowHttp: true

diff --git a/nonrtric/helm/nonrtric/Chart.yaml b/nonrtric/helm/nonrtric/Chart.yaml
index af05856..7b92e5c 100644 (file)
--- a/nonrtric/helm/nonrtric/Chart.yaml
+++ b/nonrtric/helm/nonrtric/Chart.yaml
@@ -17,4 +17,4 @@
 apiVersion: v1
 description: NonRealTime RAN Intelligent Controller
 name: nonrtric
-version: 1.0.0
+version: 2.0.0

diff --git a/nonrtric/helm/nonrtric/requirements.yaml b/nonrtric/helm/nonrtric/requirements.yaml
index f2d67e4..40bea6f 100644 (file)
--- a/nonrtric/helm/nonrtric/requirements.yaml
+++ b/nonrtric/helm/nonrtric/requirements.yaml
@@ -16,17 +16,17 @@
 
 dependencies:
   - name: a1controller
-    version: ~1.0.0
+    version: ~2.0.0
     repository: "@local"
   - name: a1simulator
-    version: ~1.0.1
+    version: ~2.0.0
     repository: "@local"
   - name: controlpanel
-    version: ~1.0.0
+    version: ~2.0.0
     repository: "@local"
   - name: policymanagementservice
-    version: ~1.0.0
+    version: ~2.0.0
     repository: "@local"
   - name: nonrtric-common
-    version: ^1.0.0
+    version: ^2.0.0
     repository: "@local"

diff --git a/nonrtric/helm/policymanagementservice/Chart.yaml b/nonrtric/helm/policymanagementservice/Chart.yaml
index 9387bcd..256af34 100644 (file)
--- a/nonrtric/helm/policymanagementservice/Chart.yaml
+++ b/nonrtric/helm/policymanagementservice/Chart.yaml
@@ -15,6 +15,7 @@
 ################################################################################
 
 apiVersion: v1
+appVersion: "2.0.0"
 description: A Helm chart for Policy Management Service
 name: policymanagementservice
-version: 1.0.0
+version: 2.0.0

diff --git a/nonrtric/helm/policymanagementservice/requirements.yaml b/nonrtric/helm/policymanagementservice/requirements.yaml
index ba44395..f3b3ecd 100644 (file)
--- a/nonrtric/helm/policymanagementservice/requirements.yaml
+++ b/nonrtric/helm/policymanagementservice/requirements.yaml
@@ -16,5 +16,5 @@
 
 dependencies:
   - name: nonrtric-common
-    version: ^1.0.0
+    version: ^2.0.0
     repository: "@local"

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 45593cd..697ef1a 100644 (file)
--- a/nonrtric/helm/policymanagementservice/values.yaml
+++ b/nonrtric/helm/policymanagementservice/values.yaml
@@ -21,9 +21,9 @@
 policymanagementservice:
   imagePullPolicy: IfNotPresent
   image:
-    registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
+    registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
     name: nonrtric-policy-agent
-    tag: 1.0.0
+    tag: 2.0.0
   service:
     allowHttp: true
     httpName: http
@@ -40,5 +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"
+             }
+          }
+    }
 
-    

diff --git a/ric-common/Common-Template/helm/nonrtric-common/Chart.yaml b/ric-common/Common-Template/helm/nonrtric-common/Chart.yaml
index 1aec95b..693b6df 100644 (file)
--- a/ric-common/Common-Template/helm/nonrtric-common/Chart.yaml
+++ b/ric-common/Common-Template/helm/nonrtric-common/Chart.yaml
@@ -17,4 +17,4 @@
 apiVersion: v1
 description: NONRTRIC Common templates for inclusion in other charts
 name: nonrtric-common
-version: 1.0.0
\ No newline at end of file
+version: 2.0.0
\ No newline at end of file