Merge "Create Base and Sample Performance Integration Tests"

diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index f7fe46e..1d3f501 100644 (file)
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -102,6 +102,9 @@ app:
     lcm:\r
         events:\r
             topic: ${LCM_EVENTS_TOPIC:ncmp-events}\r
+    dmi:\r
+        cm-events:\r
+            topic: ${DMI_CM_EVENTS_TOPIC:dmi-cm-events}\r
 \r
 \r
 notification:\r

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/notifications/avc/AvcEventConsumer.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/notifications/avc/AvcEventConsumer.java
index 79a36bf..58290a7 100644 (file)
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/notifications/avc/AvcEventConsumer.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/notifications/avc/AvcEventConsumer.java
@@ -44,7 +44,7 @@ public class AvcEventConsumer {
      * @param avcEvent the event to be consumed and produced.
      */
     @KafkaListener(
-            topics = "dmi-cm-events",
+            topics = "${app.dmi.cm-events.topic}",
             properties = {"spring.json.value.default.type=org.onap.cps.ncmp.event.model.AvcEvent"})
     public void consumeAndForward(final AvcEvent avcEvent) {
         log.debug("Consuming AVC event {} ...", avcEvent);

diff --git a/cps-ri/src/main/resources/changelog/changelog-master.yaml b/cps-ri/src/main/resources/changelog/changelog-master.yaml
index cb5392b..43a54ca 100644 (file)
--- a/cps-ri/src/main/resources/changelog/changelog-master.yaml
+++ b/cps-ri/src/main/resources/changelog/changelog-master.yaml
@@ -1,6 +1,6 @@
 # ============LICENSE_START=======================================================
 # Copyright (c) 2021 Bell Canada.
-# Modifications Copyright (C) 2022 Nordix Foundation.
+# Modifications Copyright (C) 2022-2023 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -47,4 +47,6 @@ databaseChangeLog:
   - include:
       file: changelog/db/changes/15-rename-column-yang-resource-table.yaml
   - include:
-      file: changelog/db/changes/16-insert-cm-handle-state.yaml
\ No newline at end of file
+      file: changelog/db/changes/16-insert-cm-handle-state.yaml
+  - include:
+      file: changelog/db/changes/17-add-index-to-schema-set-yang-resources.yaml

diff --git a/cps-ri/src/main/resources/changelog/db/changes/17-add-index-to-schema-set-yang-resources.yaml b/cps-ri/src/main/resources/changelog/db/changes/17-add-index-to-schema-set-yang-resources.yaml
new file mode 100644 (file)
index 0000000..bc16725
--- /dev/null
+++ b/cps-ri/src/main/resources/changelog/db/changes/17-add-index-to-schema-set-yang-resources.yaml
@@ -0,0 +1,15 @@
+databaseChangeLog:
+  - changeSet:
+      author: cps
+      id: 17
+      changes:
+        - createIndex:
+            columns:
+              - column:
+                  name: schema_set_id
+            indexName: FKI_SCHEMA_SET_YANG_RESOURCES_SCHEMA_SET_ID_FK
+            tableName: schema_set_yang_resources
+      rollback:
+        - dropIndex:
+            indexName: FKI_SCHEMA_SET_YANG_RESOURCES_SCHEMA_SET_ID_FK
+            tableName: schema_set_yang_resources

diff --git a/docs/architecture.rst b/docs/architecture.rst
index acde1b1..8dde47a 100644 (file)
--- a/docs/architecture.rst
+++ b/docs/architecture.rst
@@ -21,7 +21,7 @@ In this release CPS is no longer a stand alone component and is released along w
 Project page describing eventual scope and ambition is here:
 `Configuration Persistence Service Project <https://wiki.onap.org/display/DW/Configuration+Persistence+Service+Project>`_
 
-This page reflects the state for Istanbul-R9 release.
+This page reflects the state for the latest release.
 
 .. image:: _static/star.png
     :class: float-left