Merge "[UUI] Fix for MSB registration entries"

diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml b/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
index 2a31c73..1c15a2d 100644 (file)
--- a/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
@@ -54,7 +54,6 @@ spring.kafka.security.protocol: SASL_PLAINTEXT
 spring.kafka.properties.sasl.mechanism: SCRAM-SHA-512
 spring.kafka.properties.sasl.jaas.config: ${SASL_JAAS_CONFIG}
 
-
 {{- if .Values.config.additional }}
 {{ toYaml .Values.config.additional | nindent 2 }}
 {{- end }}

diff --git a/kubernetes/cps/templates/cps-kafka-topic.yaml b/kubernetes/cps/templates/cps-kafka-topic.yaml
index c3592bc..8807647 100644 (file)
--- a/kubernetes/cps/templates/cps-kafka-topic.yaml
+++ b/kubernetes/cps/templates/cps-kafka-topic.yaml
@@ -43,4 +43,44 @@ metadata:
 spec:
   config:
     retention.ms: {{ .Values.config.dmiCmEventsTopic.retentionMs }}
+---
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: {{ .Values.config.ncmpCmAvcSubscriptionTopic.name }}
+  labels:
+    strimzi.io/cluster: {{ include "common.release" . }}-strimzi
+spec:
+  config:
+    retention.ms: {{ .Values.config.ncmpCmAvcSubscriptionTopic.retentionMs }}
+---
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: {{ .Values.config.ncmpCmEventsTopic.name }}
+  labels:
+    strimzi.io/cluster: {{ include "common.release" . }}-strimzi
+spec:
+  config:
+    retention.ms: {{ .Values.config.ncmpCmEventsTopic.retentionMs }}
+---
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: {{ .Values.config.dmiCmAvcSubscriptionTopic.name }}
+  labels:
+    strimzi.io/cluster: {{ include "common.release" . }}-strimzi
+spec:
+  config:
+    retention.ms: {{ .Values.config.dmiCmAvcSubscriptionTopic.retentionMs }}
+---
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: {{ .Values.config.dmiCmAvcSubscriptionResponseTopic.name }}
+  labels:
+    strimzi.io/cluster: {{ include "common.release" . }}-strimzi
+spec:
+  config:
+    retention.ms: {{ .Values.config.dmiCmAvcSubscriptionResponseTopic.retentionMs }}
 {{- end }}
\ No newline at end of file

diff --git a/kubernetes/cps/templates/cps-kafka-user.yaml b/kubernetes/cps/templates/cps-kafka-user.yaml
index 469ddda..154c116 100644 (file)
--- a/kubernetes/cps/templates/cps-kafka-user.yaml
+++ b/kubernetes/cps/templates/cps-kafka-user.yaml
@@ -50,4 +50,36 @@ spec:
         type: topic
         name: {{ .Values.config.dmiCmEventsTopic.name }}
       operation: All
+    - resource:
+        type: group
+        name: {{ .Values.config.ncmpCmAvcSubscriptionTopic.consumer.groupId }}
+      operation: All
+    - resource:
+        type: topic
+        name: {{ .Values.config.ncmpCmAvcSubscriptionTopic.name }}
+      operation: All
+    - resource:
+        type: group
+        name: {{ .Values.config.ncmpCmEventsTopic.consumer.groupId }}
+      operation: All
+    - resource:
+        type: topic
+        name: {{ .Values.config.ncmpCmEventsTopic.name }}
+      operation: All
+    - resource:
+        type: group
+        name: {{ .Values.config.dmiCmAvcSubscriptionTopic.consumer.groupId }}
+      operation: All
+    - resource:
+        type: topic
+        name: {{ .Values.config.dmiCmAvcSubscriptionTopic.name }}
+      operation: All
+    - resource:
+        type: group
+        name: {{ .Values.config.dmiCmAvcSubscriptionResponseTopic.consumer.groupId }}
+      operation: All
+    - resource:
+        type: topic
+        name: {{ .Values.config.dmiCmAvcSubscriptionResponseTopic.name }}
+      operation: All
 {{- end }}
\ No newline at end of file

diff --git a/kubernetes/cps/values.yaml b/kubernetes/cps/values.yaml
index dccc4d0..a08690e 100755 (executable)
--- a/kubernetes/cps/values.yaml
+++ b/kubernetes/cps/values.yaml
@@ -63,6 +63,26 @@ config:
     retentionMs: 7200000
     consumer:
       groupId: ncmp-group
+  ncmpCmAvcSubscriptionTopic:
+    name: cm-avc-subscription
+    retentionMs: 7200000
+    consumer:
+      groupId: ncmp-group
+  ncmpCmEventsTopic:
+    name: cm-events
+    retentionMs: 7200000
+    consumer:
+      groupId: ncmp-group
+  dmiCmAvcSubscriptionTopic:
+    name: ncmp-dmi-cm-avc-subscription-ncmp-dmi-plugin
+    retentionMs: 7200000
+    consumer:
+      groupId: ncmp-group
+  dmiCmAvcSubscriptionResponseTopic:
+    name: dmi-ncmp-cm-avc-subscription
+    retentionMs: 7200000
+    consumer:
+      groupId: ncmp-group
 
 # Enable all CPS components by default
 cps-core:

diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
index 543b7aa..d91bb1e 100644 (file)
--- a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
@@ -94,7 +94,7 @@ ingress:
       path: "/api/holmes-rule-mgmt/v1"
       plain_port: 9101
     - baseaddr: "holmes-rule-mgmt-ui"
-      name: "holmes-rule-mgmt-ui"
+      name: "holmes-rule-mgmt"
       path: "/iui/holmes"
       plain_port: 9104
   config:

diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
index e87a76d..1f084a6 100644 (file)
--- a/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@ -22,7 +22,7 @@ global: # global defaults
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/testsuite:1.11.1
+image: onap/testsuite:1.12.1
 pullPolicy: Always
 
 ubuntuInitImage: oomk8s/ubuntu-init:2.0.0

diff --git a/tox.ini b/tox.ini
index d90f545..ca5c71b 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -39,7 +39,7 @@ commands = sphinx-build -q -W -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxi
 
 [testenv:spelling]
 basepython = python3.8
-whitelist_externals = wget
+allowlist_externals = wget
 deps =
     -r{toxinidir}/requirements.txt
     -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
@@ -60,7 +60,7 @@ commands =
 
 [testenv:checkbashisms]
 deps =
-whitelist_externals =
+allowlist_externals =
     {toxinidir}/.ci/check-bashisms.sh
 commands =
     {toxinidir}/.ci/check-bashisms.sh
@@ -68,7 +68,7 @@ commands =
 [testenv:shellcheck]
 basepython = python3
 deps = shellcheck-py
-whitelist_externals = find
+allowlist_externals = find
 commands =
     find . -not -path '*/\.*' -name *.sh -exec shellcheck \{\} +
 
@@ -87,7 +87,7 @@ deps =
     -r{toxinidir}/requirements.txt
     -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
     -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
-whitelist_externals = find
+allowlist_externals = find
 commands =
     find kubernetes/ TOSCA/ docs/ -name *.py -exec pylint --max-line-length=120 --disable=missing-docstring --method-rgx="(([a-z_][a-zA-Z0-9_]{2,})|(_[a-z0-9_]*)|(__[a-zA-Z][a-zA-Z0-9_]+__))$" --variable-rgx="[a-zA-Z_][a-zA-Z0-9_]{1,30}$" --reports=y --score=y  --output-format=colorized  \{\} +