[CPS] Fix and Upgrade cps and ncmp-dmi-plugin

- upgrade cps to 3.7.0 version
- upgrade ncmp-dmi-plugin to 1.7.0 version
- added kafka topics and groups and fixed the acls for cps and
  ncmp-dmi-plugin
- corrected a topic in cps-temporal ( although it is retired )

Issue-ID: CPS-2931
Change-Id: I0fc6c5a3929c426d64750b3c538afa0c9c3f0867
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>

diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index 7ef5c71..79fd3eb 100644 (file)
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -78,7 +78,7 @@ global:
     sampling:
       probability: 1.0
 
-image: onap/cps-and-ncmp:3.5.4
+image: onap/cps-and-ncmp:3.7.0
 
 service:
   type: ClusterIP
@@ -204,18 +204,14 @@ config:
 
 # Strimzi KafkaUser and Topic config
 kafkaTopic:
-  - name: &dmiCmEventsTopic dmi-cm-events
-    retentionMs: 7200000
-    segmentBytes: 1073741824
-  - name: &dataUpdatedTopic cps-data-updated-events
-    retentionMs: 7200000
-    segmentBytes: 1073741824
-  - name: &ncmpCmSubscriptionIn subscription
-    retentionMs: 7200000
-    segmentBytes: 1073741824
+  - name: &cmSubscriptionNcmpIn subscription
+  - name: &cmSubscriptionDmiIn ncmp-dmi-cm-avc-subscription
+  - name: &cmSubscriptionNcmpOut subscription-response
+  - name: &ncmpCmEventsTopic cm-events
+  - name: &ncmpInventoryEventsTopic ncmp-inventory-events
+  - name: &lcmEventsTopic ncmp-events
   - name: &dmiDeviceHeartbeatTopic dmi-device-heartbeat
-    retentionMs: 7200000
-    segmentBytes: 1073741824
+  - name: &dataUpdatedTopic cps-data-updated-events
 
 kafkaUser:
   authenticationType: scram-sha-512
@@ -226,48 +222,52 @@ kafkaUser:
     - name: ncmp-data-operation-event-group
       type: group
       operations: [Read]
-    - name: *dataUpdatedTopic
-      type: topic
-      operations: [Write]
-    - name: *dmiCmEventsTopic
-      type: topic
+    - name: ncmp-async-rest-request-event-group
+      type: group
       operations: [Read]
     - name: &ncmpAsyncM2MTopic ncmp-async-m2m
       type: topic
       operations: [Read]
-    - name: &cmAvcSubscriptionTopic cm-avc-subscription
+    - name: *cmSubscriptionNcmpIn
       type: topic
-      operations: [Read]
-    - name: *ncmpCmSubscriptionIn
+      operations: [All]
+    - name: *cmSubscriptionDmiIn
       type: topic
-      operations: [Read]
-    - name: &ncmpCmSubscriptionDmiIn ncmp-dmi-cm-avc-subscription
+      operations: [Write]
+    - name: &cmSubscriptionDmiOut dmi-ncmp-cm-avc-subscription
       type: topic
       operations: [Read]
-    - name: &ncmpCmSubscriptionDmiOut dmi-ncmp-cm-avc-subscription
+    - name: *cmSubscriptionNcmpOut
       type: topic
-      operations: [Read]
-    - name: &ncmpCmSubscriptionOut subscription-response
+      operations: [Write]
+    - name: *ncmpCmEventsTopic
       type: topic
-      operations: [Read]
-    - name: &ncmpCmEventsTopic cm-events
+      operations: [Write]
+    - name: *ncmpInventoryEventsTopic
+      type: topic
+      operations: [Write]
+    - name: *lcmEventsTopic
+      type: topic
+      operations: [Write]
+    - name: &dmiCmEventsTopic dmi-cm-events
       type: topic
       operations: [Read]
     - name: *dmiDeviceHeartbeatTopic
       type: topic
-      operations: [Read]
-    - name: &lcmEventsTopic ncmp-events
+      operations: [All]
+    - name: *dataUpdatedTopic
       type: topic
-      operations: [Read]
+      operations: [Write]
 
 topics:
   config:
     app.ncmp.async-m2m.topic: *ncmpAsyncM2MTopic
-    app.ncmp.avc.cm-subscription-ncmp-in: *ncmpCmSubscriptionIn
-    app.ncmp.avc.cm-subscription-dmi-in:  *ncmpCmSubscriptionDmiIn
-    app.ncmp.avc.cm-subscription-dmi-out: *ncmpCmSubscriptionDmiOut
-    app.ncmp.avc.cm-subscription-ncmp-out: *ncmpCmSubscriptionOut
+    app.ncmp.avc.cm-subscription-ncmp-in: *cmSubscriptionNcmpIn
+    app.ncmp.avc.cm-subscription-dmi-in:  *cmSubscriptionDmiIn
+    app.ncmp.avc.cm-subscription-dmi-out: *cmSubscriptionDmiOut
+    app.ncmp.avc.cm-subscription-ncmp-out: *cmSubscriptionNcmpOut
     app.ncmp.avc.cm-events-topic: *ncmpCmEventsTopic
+    app.ncmp.avc.inventory-events-topic: *ncmpInventoryEventsTopic
     app.lcm.events.topic: *lcmEventsTopic
     app.dmi.cm-events.topic: *dmiCmEventsTopic
     app.dmi.device-heartbeat.topic: *dmiDeviceHeartbeatTopic

diff --git a/kubernetes/cps/components/cps-temporal/values.yaml b/kubernetes/cps/components/cps-temporal/values.yaml
index 97ffb33..696d9bf 100644 (file)
--- a/kubernetes/cps/components/cps-temporal/values.yaml
+++ b/kubernetes/cps/components/cps-temporal/values.yaml
@@ -141,7 +141,7 @@ config:
   #appUserPassword:
   app:
     listener:
-      dataUpdatedTopic: &dataUpdatedTopic cps.data-updated-events
+      dataUpdatedTopic: &dataUpdatedTopic cps-data-updated-events
 
 # Any new property can be added in the env by setting in overrides in the format mentioned below
 # All the added properties must be in "key: value" format instead of yaml.

diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
index 439fdb9..dd08b07 100644 (file)
--- a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
@@ -47,7 +47,7 @@ global:
     virtualhost:
       baseurl: "simpledemo.onap.org"
 
-image: onap/ncmp-dmi-plugin:1.5.0
+image: onap/ncmp-dmi-plugin:1.7.0
 containerPort: &svc_port 8080
 
 prometheus:
@@ -142,7 +142,7 @@ config:
   spring:
     profile: helm
 
-  dmiServiceUrl: http://*svc_name:*svc_port
+  dmiServiceUrl: http://ncmp-dmi-plugin:8080
   sdnc:
     url: http://sdnc:8181
     username: admin
@@ -177,15 +177,10 @@ updateStrategy:
 
 # Strimzi KafkaUser and Topic config
 kafkaTopic:
-  - name: &ncmpDmiCmAvcSubscriptionNcmpDmiPluginTopic ncmp-dmi-cm-avc-subscription-ncmp-dmi-plugin
-    retentionMs: 7200000
-    segmentBytes: 1073741824
-  - name: &dmiNcmpCmAvcSubscriptionTopic dmi-ncmp-cm-avc-subscription
-    retentionMs: 7200000
-    segmentBytes: 1073741824
   - name: &ncmpAsyncM2MTopic ncmp-async-m2m
-    retentionMs: 7200000
-    segmentBytes: 1073741824
+  - name: &ncmpSubscriptionDmiOut dmi-ncmp-cm-avc-subscription
+  - name: &dmiCmEventsTopic dmi-cm-events
+  - name: &vesPnfNotifyRegistrationTopic unauthenticated.VES_O1_NOTIFY_PNF_REGISTRATION_OUTPUT
 
 kafkaUser:
   authenticationType: scram-sha-512
@@ -193,18 +188,33 @@ kafkaUser:
     - name: ncmp-dmi-plugin-group
       type: group
       operations: [Read]
-    - name: *ncmpDmiCmAvcSubscriptionNcmpDmiPluginTopic
+    - name: *ncmpAsyncM2MTopic
+      type: topic
+      operations: [Write]
+    - name: &lcmEventsTopic ncmp-events
+      type: topic
+      operations: [All]
+    - name: &ncmpSubscriptionDmiIn ncmp-dmi-cm-avc-subscription
       type: topic
       operations: [Read]
-    - name: *dmiNcmpCmAvcSubscriptionTopic
+    - name: *ncmpSubscriptionDmiOut
       type: topic
       operations: [Write]
-    - name: *ncmpAsyncM2MTopic
+    - name: *dmiCmEventsTopic
       type: topic
       operations: [Write]
+    - name: unauthenticated.VES_PNFREG_OUTPUT
+      type: topic
+      operations: [Read]
+    - name: *vesPnfNotifyRegistrationTopic
+      type: topic
+      operations: [All]
+
 
 topics:
   config:
     app.ncmp.async.topic: *ncmpAsyncM2MTopic
-    app.dmi.avc.subscription-topic: *ncmpDmiCmAvcSubscriptionNcmpDmiPluginTopic
-    app.dmi.avc.subscription-response-topic: *dmiNcmpCmAvcSubscriptionTopic
+    app.ncmp.lcm.topic: *lcmEventsTopic
+    app.dmi.avc.cm-subscription-dmi-in: *ncmpSubscriptionDmiIn
+    app.dmi.avc.cm-subscription-dmi-out: *ncmpSubscriptionDmiOut
+    app.dmi.avc.cm-avc-events-topic: *dmiCmEventsTopic